You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/01/16 13:17:04 UTC

svn commit: r1724964 [5/19] - in /qpid/site/input/releases/qpid-java-trunk: java-broker/ java-broker/book/ java-broker/book/css/ java-broker/book/images/ jms-client-0-8/ jms-client-0-8/book/ jms-client-0-8/book/images/

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Download.html.in Sat Jan 16 12:17:02 2016
@@ -1,3 +1,3 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.3.&#160;Download</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-Prerequistes.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationWindows.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Installation-Download"></a>2.3.&#160;Download</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Download-Release"></a>2.3.1.&#160;Broker Release</h3></div></div></div><p>You can download the latest Java broker package from the <a class="ulink" href="http://qpid.apache.org/download.html" target="_top">Download Page</a>. </p><p> It is reco
 mmended that you confirm the integrity of the download by verifying the PGP
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.3.&#160;Download</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-Prerequistes.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationWindows.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Installation-Download"></a>2.3.&#160;Download</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Download-Release"></a>2.3.1.&#160;Broker Release</h3></div></div></div><p>You can download the latest Java broker package from the <a class="link" href="http://qpid.apache.org/download.html" target="_top">Download Page</a>.
  </p><p> It is recommended that you confirm the integrity of the download by verifying the PGP
         signature matches that available on the site. Instructions are given on the download page.
-      </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-Prerequistes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationWindows.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.2.&#160;Prerequisites&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.4.&#160;Installation on Windows</td></tr></table></div></div>
\ No newline at end of file
+      </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-Prerequistes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationWindows.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.2.&#160;Prerequisites&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.4.&#160;Installation on Windows</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationUnix.html.in Sat Jan 16 12:17:02 2016
@@ -1,25 +1,25 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.5.&#160;Installation on UNIX platforms</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-InstallationWindows.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-OptionalDependencies.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Installation-InstallationUnix"></a>2.5.&#160;Installation on UNIX platforms</h2></div></div></div><p> Firstly, verify that your JVM is installed properly by following <a class="link" href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification-Unix" title="E.1.2.&#160;Verify JVM on Unix">these instructions.</a>
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.5.&#160;Installation on UNIX platforms</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-InstallationWindows.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-OptionalDependencies.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Installation-InstallationUnix"></a>2.5.&#160;Installation on UNIX platforms</h2></div></div></div><p> Firstly, verify that your JVM is installed properly by following <a class="link" href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification-Unix" title="E.1.2.&#160;Verify JVM on Unix">these instructions.</a>
     </p><p>Now chose a directory for Qpid broker installation. This directory will be used for the
       Qpid JARs and configuration files. It need not be the same location as the work directory used
       for the persistent message store or the log file (you will choose this location later). For
       the remainder this example we will assume that location /usr/local/qpid has been
-      chosen.</p><p>Next extract the qpid-java-broker-0.32-SNAPSHOT.tar.gz package into the directory.</p><pre class="programlisting">mkdir /usr/local/qpid
+      chosen.</p><p>Next extract the qpid-broker-6.1.0-SNAPSHOT-bin.tgz package into the directory.</p><pre class="programlisting">mkdir /usr/local/qpid
 cd /usr/local/qpid
-tar xvzf qpid-java-broker-0.32-SNAPSHOT.tar.gz</pre><p>The extraction of the broker package will have created a directory
-      qpid-broker-0.32-SNAPSHOT within /usr/local/qpid</p><pre class="screen">ls -la qpid-broker-0.32-SNAPSHOT/
-total 152
-drwxr-xr-x   8 qpid  qpid    272 25 Jul 23:22 .
-drwxr-xr-x  45 qpid  qpid   1530 30 Sep 10:51 ..
--rw-r--r--@  1 qpid  qpid  65925 20 Jul 20:10 LICENSE
--rw-r--r--@  1 qpid  qpid   3858 20 Jul 20:10 NOTICE
--rw-r--r--@  1 qpid  qpid   1346 20 Jul 20:10 README.txt
-drwxr-xr-x  10 qpid  qpid    340 30 Sep 00:24 bin
-drwxr-xr-x   9 qpid  qpid    306 21 Aug 23:17 etc
-drwxr-xr-x  34 qpid  qpid   1156 25 Jul 23:22 lib
+tar xvzf qpid-broker-6.1.0-SNAPSHOT-bin.tgz</pre><p>The extraction of the broker package will have created a directory
+      qpid-broker/6.1.0-SNAPSHOT within /usr/local/qpid</p><pre class="screen">ls -la qpid-broker/6.1.0-SNAPSHOT/
+total 56
+drwxrwxr-x. 5 alex alex  4096 Nov 25 11:43 .
+drwxrwxr-x. 3 alex alex  4096 Nov 25 11:43 ..
+drwxr-xr-x. 2 alex alex  4096 Nov 24 23:38 bin
+drwxr-xr-x. 2 alex alex  4096 Nov 24 23:38 etc
+drwxrwxr-x. 2 alex alex  4096 Nov 25 11:43 lib
+-rw-r--r--. 1 alex alex 28143 Nov 24 23:38 LICENSE
+-rw-r--r--. 1 alex alex  3409 Nov 24 23:38 NOTICE
+-rw-r--r--. 1 alex alex   116 Nov 24 23:38 README.txt
     </pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-InstallationUnix-SettingQPIDWORK"></a>2.5.1.&#160;Setting the working directory</h3></div></div></div><p>Qpid requires a work directory. This directory is used for the default location of the
         Qpid log file and is used for the storage of persistent messages. The work directory can be
         set on the command-line (for the lifetime of the current shell), but you will normally want
         to set the environment variable permanently the user's shell profile file (~/.bash_profile
         for Bash etc).</p><pre class="screen">export QPID_WORK=/var/qpidwork
       </pre><p>If the directory referred to by <a class="link" href="Java-Broker-Appendix-Environment-Variables.html#Java-Broker-Appendix-Environment-Variables-Qpid-Work">QPID_WORK</a> does not
-        exist, the Java Broker will attempt to create it on start-up. </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-InstallationWindows.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-OptionalDependencies.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.4.&#160;Installation on Windows&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.6.&#160;Optional Dependencies</td></tr></table></div></div>
\ No newline at end of file
+        exist, the Java Broker will attempt to create it on start-up. </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-InstallationWindows.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-OptionalDependencies.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.4.&#160;Installation on Windows&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.6.&#160;Optional Dependencies</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-InstallationWindows.html.in Sat Jan 16 12:17:02 2016
@@ -1,24 +1,26 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.4.&#160;Installation on Windows</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-Download.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationUnix.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Installation-InstallationWindows"></a>2.4.&#160;Installation on Windows</h2></div></div></div><p> Firstly, verify that your JVM is installed properly by following <a class="link" href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification-Windows" title="E.1.1.&#160;Verify JVM on Windows">these instructions.</a>
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.4.&#160;Installation on Windows</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-Download.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationUnix.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Installation-InstallationWindows"></a>2.4.&#160;Installation on Windows</h2></div></div></div><p> Firstly, verify that your JVM is installed properly by following <a class="link" href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification-Windows" title="E.1.1.&#160;Verify JVM on Windows">these instructions.</a>
     </p><p>Now chose a directory for Qpid broker installation. This directory will be used for the
       Qpid JARs and configuration files. It need not be the same location as the work directory used
       for the persistent message store or the log file (you will choose this location later). For
-      the remainder this example we will assume that location c:\qpid has been chosen.</p><p>Next extract the qpid-java-broker-0.32-SNAPSHOT.zip package into the directory, using either
+      the remainder this example we will assume that location c:\qpid has been chosen.</p><p>Next extract the qpid-broker-6.1.0-SNAPSHOT-bin.zip package into the directory, using either
       the zip file handling offered by Windows (right click the file and select 'Extract All') or a
       third party tool of your choice.</p><p>The extraction of the broker package will have created a directory
-      qpid-broker-0.32-SNAPSHOT within c:\qpid</p><pre class="screen">
- Directory of c:\qpid\qpid-broker-0.32-SNAPSHOT
+      qpid-broker\\6.1.0-SNAPSHOT within c:\qpid</p><pre class="screen">
+ Directory of c:\qpid\qpid-broker\\6.1.0-SNAPSHOT
 
-07/25/2012  11:22 PM                   .
-09/30/2012  10:51 AM                   ..
-09/30/2012  12:24 AM                   bin
-08/21/2012  11:17 PM                   etc
-07/25/2012  11:22 PM                   lib
-07/20/2012  08:10 PM            65,925 LICENSE
-07/20/2012  08:10 PM             3,858 NOTICE
-07/20/2012  08:10 PM             1,346 README.txt
+25/11/2015  11:29    &lt;DIR&gt;          .
+25/11/2015  11:29    &lt;DIR&gt;          ..
+25/11/2015  10:56    &lt;DIR&gt;          bin
+03/07/2015  08:06    &lt;DIR&gt;          etc
+25/11/2015  11:25    &lt;DIR&gt;          lib
+25/11/2015  10:56            28,143 LICENSE
+25/11/2015  10:56             3,409 NOTICE
+29/04/2015  09:13               116 README.txt
+3 File(s)         31,668 bytes
+5 Dir(s)  25,981,767,680 bytes free
 </pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-InstallationWindows-SettingQPIDWORK"></a>2.4.1.&#160;Setting the working directory</h3></div></div></div><p>Qpid requires a work directory. This directory is used for the default location of the
         Qpid log file and is used for the storage of persistent messages. The work directory can be
         set on the command-line (for the lifetime of the command interpreter), but you will normally
         want to set the environment variable permanently via the Advanced System Settings in the
         Control Panel.</p><pre class="screen">set QPID_WORK=C:\qpidwork</pre><p>If the directory referred to by <a class="link" href="Java-Broker-Appendix-Environment-Variables.html#Java-Broker-Appendix-Environment-Variables-Qpid-Work">QPID_WORK</a> does not
-        exist, the Java Broker will attempt to create it on start-up.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-Download.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationUnix.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.3.&#160;Download&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.5.&#160;Installation on UNIX platforms</td></tr></table></div></div>
\ No newline at end of file
+        exist, the Java Broker will attempt to create it on start-up.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-Download.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-InstallationUnix.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.3.&#160;Download&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.5.&#160;Installation on UNIX platforms</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-OptionalDependencies.html.in Sat Jan 16 12:17:02 2016
@@ -1,3 +1,3 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.6.&#160;Optional Dependencies</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-InstallationUnix.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Installation-OptionalDependencies"></a>2.6.&#160;Optional Dependencies</h2></div></div></div><p>If you wish to utilise storage options using Oracle BDB JE or an External Database, see
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.6.&#160;Optional Dependencies</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation-InstallationUnix.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Installation-OptionalDependencies"></a>2.6.&#160;Optional Dependencies</h2></div></div></div><p>If you wish to utilise storage options using Oracle BDB JE or an External Database, see
       <a class="xref" href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html" title="E.3.&#160;Installing Oracle BDB JE">Section&#160;E.3, &#8220;Installing Oracle BDB JE&#8221;</a> and <a class="xref" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html" title="E.2.&#160;Installing External JDBC Driver">Section&#160;E.2, &#8220;Installing External JDBC Driver&#8221;</a> for details of
-      installing their dependencies.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-InstallationUnix.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.5.&#160;Installation on UNIX platforms&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;3.&#160;Getting Started</td></tr></table></div></div>
\ No newline at end of file
+      installing their dependencies.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation-InstallationUnix.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Getting-Started.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">2.5.&#160;Installation on UNIX platforms&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;3.&#160;Getting Started</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation-Prerequistes.html.in Sat Jan 16 12:17:02 2016
@@ -1,20 +1,21 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.2.&#160;Prerequisites</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-Download.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Installation-Prerequistes"></a>2.2.&#160;Prerequisites</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Java"></a>2.2.1.&#160;Java Platform</h3></div></div></div><p> The Java Broker is an 100% Java implementation and as such it can be used on any
-        operating system supporting Java 1.7  or higher<a class="footnote" href="#ftn.idm140601093867328" id="idm140601093867328"><sup class="footnote">[4]</sup></a>. This includes Linux, Solaris, Mac OS X, and
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">2.2.&#160;Prerequisites</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Installation.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;2.&#160;Installation</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-Download.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Installation-Prerequistes"></a>2.2.&#160;Prerequisites</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Java"></a>2.2.1.&#160;Java Platform</h3></div></div></div><p> The Java Broker is an 100% Java implementation and as such it can be used on any
+        operating system supporting Java 1.7  or higher<a class="footnote" href="#ftn.d0e103" id="d0e103"><sup class="footnote">[4]</sup></a>. This includes Linux, Solaris, Mac OS X, and
         Windows XP/Vista/7/8.</p><p> The broker has been tested with Java implementations from both Oracle and IBM. Whatever
         platform you chose, it is recommended that you ensure it is patched with any critical
         updates made available from the vendor. </p><p> Verify that your JVM is installed properly by following <a class="link" href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification" title="E.1.&#160;JVM Installation verification">these instructions.</a>
       </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Disk"></a>2.2.2.&#160;Disk</h3></div></div></div><p>The Java Broker installation requires approximately 20MB of free disk space.</p><p>The Java Broker also requires a working directory. The working directory is used for the
-        message store, that is, the area of the file-system used to record persistent messages
+        message store, that is, the area of the file-system used to record messages
         whilst they are passing through the Broker. The working directory is also used for the
         default location of the log file. The size of the working directory will depend on the how
         the Broker is used.</p><p>The performance of the file system hosting the work directory is key to the performance
         of Broker as a whole. For best performance, choose a device that has low latency and one
         that is uncontended by other applications.</p><p>Be aware that there are additional considerations if you are considering hosting the
-        working directory on NFS.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Memory"></a>2.2.3.&#160;Memory</h3></div></div></div><p>Qpid caches messages on the heap for performance reasons, so in general, the Broker will
-        benefit from as much heap as possible. However, on a 32bit JVM, the maximum addressable
+        working directory on NFS.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-Memory"></a>2.2.3.&#160;Memory</h3></div></div></div><p>Qpid caches messages in memory for performance reasons, so in general, the Broker will
+        benefit from as much memory as possible. However, on a 32bit JVM, the maximum addressable
         memory range for a process is 4GB, after leaving space for the JVM's own use this will give
-        a maximum heap size of approximately ~3.7GB.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-OperatingSystemAccount"></a>2.2.4.&#160;Operating System Account</h3></div></div></div><p>Installation or operation of Qpid does <span class="emphasis"><em>not</em></span> require a privileged
+        a maximum usable size of approximately ~3.7GB.</p><p>See <a class="xref" href="Java-Broker-Runtime-Memory.html" title="9.10.&#160;Memory">Section&#160;9.10, &#8220;Memory&#8221;</a> for a full description of how memory is
+        used.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Installation-Prerequistes-OperatingSystemAccount"></a>2.2.4.&#160;Operating System Account</h3></div></div></div><p>Installation or operation of Qpid does <span class="emphasis"><em>not</em></span> require a privileged
         account (i.e. root on UNIX platforms or Administrator on Windows). However it is suggested
         that you use an dedicated account (e.g. qpid) for the installation and operation of the Java
-        Broker.</p></div><div class="footnotes"><br /><hr align="left" width="100" /><div class="footnote" id="ftn.idm140601093867328"><p><a class="para" href="#idm140601093867328"><sup class="para">[4] </sup></a>Java Cryptography Extension (JCE)
-          Unlimited Strength required for some features</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-Download.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Chapter&#160;2.&#160;Installation&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.3.&#160;Download</td></tr></table></div></div>
\ No newline at end of file
+        Broker.</p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e103"><p><a class="para" href="#d0e103"><sup class="para">[4] </sup></a>Java Cryptography Extension (JCE)
+          Unlimited Strength policy file are required for some features</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Installation.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Installation.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-Download.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Chapter&#160;2.&#160;Installation&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.3.&#160;Download</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Installation.html.in Sat Jan 16 12:17:02 2016
@@ -1,2 +1,2 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;2.&#160;Installation</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Introduction.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-Prerequistes.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Installation"></a>Chapter&#160;2.&#160;Installation</h1></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="section"><a href="Java-Broker-Installation.html#Java-Broker-Installation-Introduction">2.1. Introduction</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html">2.2. Prerequisites</a></span></dt><dd><dl><dt><span class="section"><a href="Java-B
 roker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-Java">2.2.1. Java Platform</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-Disk">2.2.2. Disk</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-Memory">2.2.3. Memory</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-OperatingSystemAccount">2.2.4. Operating System Account</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-Download.html">2.3. Download</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Installation-Download.html#Java-Broker-Installation-Download-Release">2.3.1. Broker Release</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-InstallationWindows.html">2.4. Installation o
 n Windows</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Installation-InstallationWindows.html#Java-Broker-Installation-InstallationWindows-SettingQPIDWORK">2.4.1. Setting the working directory</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-InstallationUnix.html">2.5. Installation on UNIX platforms</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Installation-InstallationUnix.html#Java-Broker-Installation-InstallationUnix-SettingQPIDWORK">2.5.1. Setting the working directory</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-OptionalDependencies.html">2.6. Optional Dependencies</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Installation-Introduction"></a>2.1.&#160;Introduction</h2></div></div></div><p>This document describes how to install the Java Broker on both Windows and UNIX
-      platforms.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Introduction.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-Prerequistes.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Chapter&#160;1.&#160;Introduction&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.2.&#160;Prerequisites</td></tr></table></div></div>
\ No newline at end of file
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;2.&#160;Installation</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Introduction.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation-Prerequistes.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Installation"></a>Chapter&#160;2.&#160;Installation</h1></div></div></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="section"><a href="Java-Broker-Installation.html#Java-Broker-Installation-Introduction">2.1. Introduction</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html">2.2. Prerequisites</a></span></dt><dd><dl><dt><span class="section"><a href="Java-B
 roker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-Java">2.2.1. Java Platform</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-Disk">2.2.2. Disk</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-Memory">2.2.3. Memory</a></span></dt><dt><span class="section"><a href="Java-Broker-Installation-Prerequistes.html#Java-Broker-Installation-Prerequistes-OperatingSystemAccount">2.2.4. Operating System Account</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-Download.html">2.3. Download</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Installation-Download.html#Java-Broker-Installation-Download-Release">2.3.1. Broker Release</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-InstallationWindows.html">2.4. Installation o
 n Windows</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Installation-InstallationWindows.html#Java-Broker-Installation-InstallationWindows-SettingQPIDWORK">2.4.1. Setting the working directory</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-InstallationUnix.html">2.5. Installation on UNIX platforms</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Installation-InstallationUnix.html#Java-Broker-Installation-InstallationUnix-SettingQPIDWORK">2.5.1. Setting the working directory</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Installation-OptionalDependencies.html">2.6. Optional Dependencies</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Installation-Introduction"></a>2.1.&#160;Introduction</h2></div></div></div><p>This document describes how to install the Java Broker on both Windows and UNIX
+      platforms.</p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Introduction.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation-Prerequistes.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Chapter&#160;1.&#160;Introduction&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;2.2.&#160;Prerequisites</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Introduction.html.in Sat Jan 16 12:17:02 2016
@@ -1,8 +1,7 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="index.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
-      <a class="ulink" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
-    Broker is actually one of two message brokers provided by the <a class="ulink" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
-    Broker.</p><p>This document relates to the Java Broker. The <a class="ulink" href="../../AMQP-Messaging-Broker-CPP-Book/html/" target="_top">C++ Broker is
-    described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
-        etc).</p></li><li class="listitem"><p>Transaction support including XA<a class="footnote" href="#ftn.idm140601093874688" id="idm140601093874688"><sup class="footnote">[1]</sup></a></p></li><li class="listitem"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
-        External, and file-based authentication mechanisms.</p></li><li class="listitem"><p>Pluggable storage architecture with implementations including <a class="ulink" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="ulink" href="http://www.oracle.com/technetwork/products/berkeleydb/overview/index-093405.html" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.idm140601093972544" id="idm140601093972544"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem"><p>Web based management interface and programmatic management interfaces  via REST and JMX
-        APIs.</p></li><li class="listitem"><p>SSL support</p></li><li class="listitem"><p>High availability (HA) support.<a class="footnote" href="#ftn.idm140601093969248" id="idm140601093969248"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr align="left" width="100" /><div class="footnote" id="ftn.idm140601093874688"><p><a class="para" href="#idm140601093874688"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.idm140601093972544"><p><a class="para" href="#idm140601093972544"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.idm140601093969248"><p><a class="para" href="#idm140601093969248"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" wid
 th="40%"><a accesskey="p" href="index.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">AMQP Messaging Broker (Java)&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>
\ No newline at end of file
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Chapter&#160;1.&#160;Introduction</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Installation.html">Next</a></td></tr></table><hr /></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Introduction"></a>Chapter&#160;1.&#160;Introduction</h1></div></div></div><p>The Java Broker is a powerful open-source message broker that implements all versions of the
+      <a class="link" href="http://www.amqp.org" target="_top"> Advanced Message Queuing Protocol (AMQP)</a>. The Java
+    Broker is actually one of two message brokers provided by the <a class="link" href="http://qpid.apache.org" target="_top">Apache Qpid project</a>: the Java Broker and the C++
+    Broker.</p><p>This document relates to the Java Broker. The <a class="link" href="/releases/qpid-cpp-{{current_cpp_release}}/cpp-broker/book/" target="_top">C++ Broker is
+    described separately</a>.</p><p><span class="emphasis"><em>Headline features</em></span></p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem" style="list-style-type: circle"><p>100% Java implementation - runs on any platform supporting Java 1.7 or higher</p></li><li class="listitem" style="list-style-type: circle"><p>Messaging clients support in Java, C++, Python.</p></li><li class="listitem" style="list-style-type: circle"><p>JMS 1.1 compliance (Java client).</p></li><li class="listitem" style="list-style-type: circle"><p>Persistent and non-persistent (transient) message support</p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all common messaging patterns (point-to-point, publish/subscribe, fan-out
+        etc).</p></li><li class="listitem" style="list-style-type: circle"><p>Transaction support including XA<a class="footnote" href="#ftn.d0e44" id="d0e44"><sup class="footnote">[1]</sup></a></p></li><li class="listitem" style="list-style-type: circle"><p>Supports for all versions of the AMQP protocol</p></li><li class="listitem" style="list-style-type: circle"><p>Automatic message translation, allowing clients using different AMQP versions to communicate with each other.</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable authentication architecture with out-of-the-box support for Kerberos, LDAP,
+        External, and file-based authentication mechanisms.</p></li><li class="listitem" style="list-style-type: circle"><p>Support for message compression</p></li><li class="listitem" style="list-style-type: circle"><p>Client support for end to end message encryption</p></li><li class="listitem" style="list-style-type: circle"><p>Pluggable storage architecture with implementations including <a class="link" href="http://db.apache.org/derby/" target="_top">Apache Derby</a>, <a class="link" href="${oracleBdbProductOverviewUrl}" target="_top">Oracle BDB JE</a><a class="footnote" href="#ftn.d0e70" id="d0e70"><sup class="footnote">[2]</sup></a>, and External Database</p></li><li class="listitem" style="list-style-type: circle"><p>Web based management interface and programmatic management interfaces via REST.</p></li><li class="listitem" style="list-style-type: circle"><p>SSL support</p></li><li class="listitem" style="list-style-type: circle"><p>High availability (HA) support.<a class="f
 ootnote" href="#ftn.d0e83" id="d0e83"><sup class="footnote">[3]</sup></a></p></li></ul></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e44"><p><a class="para" href="#d0e44"><sup class="para">[1] </sup></a>XA provided when using AMQP 0-10</p></div><div class="footnote" id="ftn.d0e70"><p><a class="para" href="#d0e70"><sup class="para">[2] </sup></a>Oracle BDB JE must be downloaded separately.</p></div><div class="footnote" id="ftn.d0e83"><p><a class="para" href="#d0e83"><sup class="para">[3] </sup></a>HA currently only available to users of the optional BDB JE HA based message store.</p></div></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="AMQP-Messaging-Broker-Java-Book.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Installat
 ion.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">AMQP Messaging Broker (Java)&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;2.&#160;Installation</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-AMQP-Intrinstic.html.in Sat Jan 16 12:17:02 2016
@@ -1,3 +1,3 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.5.&#160;AMQP Intrinstic Management</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-JMX.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-QMF.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Management-Channel-AMQP-Intrinstic"></a>6.5.&#160;AMQP Intrinstic Management</h2></div></div></div><p>The AMQP protocols 0-8..0-10 allow for creation, deletion and query of Exchanges, Queue
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.4.&#160;AMQP Intrinstic Management</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-REST-API.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-QMF.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Management-Channel-AMQP-Intrinstic"></a>6.4.&#160;AMQP Intrinstic Management</h2></div></div></div><p>The AMQP protocols 0-8..0-10 allow for creation, deletion and query of Exchanges, Queue
         and Bindings.</p><p>The exact details of how to utilise this commands depends of the client. See the
-        documentation accompanying the client for details.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Channel-JMX.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Channel.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-QMF.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">6.4.&#160;JMX Management&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;6.6.&#160;QMF</td></tr></table></div></div>
\ No newline at end of file
+        documentation accompanying the client for details.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Channel-REST-API.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Channel.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Channel-QMF.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">6.3.&#160;REST API&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;6.5.&#160;QMF</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Channel-QMF.html.in Sat Jan 16 12:17:02 2016
@@ -1 +1 @@
-<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.6.&#160;QMF</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Entities.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title"><a id="Java-Broker-Management-Channel-QMF"></a>6.6.&#160;QMF</h2></div></div></div><p>QMF is provided by an optional plugin.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Channel.htm
 l">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Entities.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">6.5.&#160;AMQP Intrinstic Management&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;7.&#160;Managing Entities</td></tr></table></div></div>
\ No newline at end of file
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">6.5.&#160;QMF</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;6.&#160;Management Channels</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Entities.html">Next</a></td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Management-Channel-QMF"></a>6.5.&#160;QMF</h2></div></div></div><p>QMF is provided by an optional plugin.</p></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Channel-AMQP-Intrinstic.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Ma
 nagement-Channel.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Entities.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">6.4.&#160;AMQP Intrinstic Management&#160;</td><td align="center" width="20%"><a accesskey="h" href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td align="right" valign="top" width="40%">&#160;Chapter&#160;7.&#160;Managing Entities</td></tr></table></div></div>
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org