http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
index 04364a2..4cf94ba 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-CommandLine.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,10 +111,10 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>3.5.&#160;Using the command line</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>3.5.&#160;Using the command line</li></ul>
 
         <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">3.5.&#160;Using the command line</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-Getting-Started-Logging.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Concepts.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-Getting-Started-CommandLine"></a>3.5.&#160;Using the command 
line</h2></div></div></div><p>The Java Broker understands a number of command 
line options which may be used to customise the configuration.</p><p>
+          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">3.5.&#160;Using the command line</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-Getting-Started-Logging.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Concepts.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-Getting-Started-CommandLine"></a>3.5.&#160;Using the command 
line</h2></div></div></div><p>The Broker understands a number of command line 
options which may be used to customise the configuration.</p><p>
       For additional details about the broker configuration and related 
command line arguments see
       <a class="xref" href="Java-Broker-Initial-Configuration.html" 
title="Chapter&#160;5.&#160;Initial Configuration">Chapter&#160;5, <em>Initial 
Configuration</em></a>.
       The broker is fully configurable via its Web Management Console, for 
details of this see

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
index 10fc829..e615f45 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Logging.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,10 +111,10 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>3.4.&#160;Log file</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>3.4.&#160;Log file</li></ul>
 
         <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">3.4.&#160;Log file</th></tr><tr><td align="left" width="20%"><a 
accesskey="p" 
href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">Prev</a>&#160;</td><th
 align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Getting-Started-CommandLine.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-Getting-Started-Logging"></a>3.4.&#160;Log 
file</h2></div></div></div><p>The Java Broker writes a log file to record both 
details of its normal operation and any exceptional
+          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">3.4.&#160;Log file</th></tr><tr><td align="left" width="20%"><a 
accesskey="p" 
href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">Prev</a>&#160;</td><th
 align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Getting-Started-CommandLine.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-Getting-Started-Logging"></a>3.4.&#160;Log 
file</h2></div></div></div><p>The Broker writes a log file to record both 
details of its normal operation and any exceptional
       conditions.  By default the log file is written within the log 
subdirectory beneath the work directory
       - <code class="computeroutput">$QPID_WORK/log/qpid.log</code> (UNIX) and
       <code class="computeroutput">%QPID_WORK%\log\qpid.log</code> 
(Windows).</p><p>For details of how to control the logging, see <a class="xref" 
href="Java-Broker-Runtime.html#Java-Broker-Runtime-Logging" 
title="9.1.&#160;Logging">Section&#160;9.1, 
&#8220;Logging&#8221;</a></p></div><div class="navfooter"><hr /><table 
summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a 
accesskey="p" 
href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">Prev</a>&#160;</td><td
 align="center" width="20%"><a accesskey="u" 
href="Java-Broker-Getting-Started.html">Up</a></td><td align="right" 
width="40%">&#160;<a accesskey="n" 
href="Java-Broker-Getting-Started-CommandLine.html">Next</a></td></tr><tr><td 
align="left" valign="top" width="40%">3.3.&#160;Starting/Stopping the broker on 
Unix&#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;3.5.&#160;Using the com
 mand line</td></tr></table></div></div>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
index fca8eb0..905d10d 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Unix.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>3.3.&#160;Starting/Stopping the broker on 
Unix</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>3.3.&#160;Starting/Stopping the broker on Unix</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">3.3.&#160;Starting/Stopping the broker on Unix</th></tr><tr><td 
align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">Prev</a>&#160;</td><th
 align="center" width="60%">Chapter&#160;3.&#160;Getting Started</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Getting-Started-Logging.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-Getting-Started-Starting-Stopping-Unix"></a>3.3.&#160;Starting/Stopping
 the broker on Unix</h2></div></div></div><p>Firstly change to the installation 
directory used during the <a class="link" 
href="Java-Broker-Installation-InstallationUnix.html" 
title="2.5.&#160;Installation on UNIX platforms">installation</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
index d683e57..d0d5868 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started-Starting-Stopping-Windows.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>3.2.&#160;Starting/Stopping the broker on 
Windows</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>3.2.&#160;Starting/Stopping the broker on Windows</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">3.2.&#160;Starting/Stopping the broker on Windows</th></tr><tr><td 
align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Getting-Started.html">Prev</a>&#160;</td><th align="center" 
width="60%">Chapter&#160;3.&#160;Getting Started</th><td align="right" 
width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Getting-Started-Starting-Stopping-Unix.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-Getting-Started-Starting-Stopping-Windows"></a>3.2.&#160;Starting/Stopping
 the broker on Windows</h2></div></div></div><p>Firstly change to the 
installation directory used during the <a class="link" 
href="Java-Broker-Installation-InstallationWindows.html" 
title="2.4.&#160;Installation on Windows">installation</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
index 910891d..cb4a985 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Getting-Started.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,11 +111,11 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>Chapter&#160;3.&#160;Getting Started</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>Chapter&#160;3.&#160;Getting Started</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">Chapter&#160;3.&#160;Getting Started</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-Installation-OptionalDependencies.html">Prev</a>&#160;</td><th
 align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a 
accesskey="n" 
href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">Next</a></td></tr></table><hr
 /></div><div class="chapter"><div class="titlepage"><div><div><h1 
class="title"><a 
id="Java-Broker-Getting-Started"></a>Chapter&#160;3.&#160;Getting 
Started</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-Getting-Started.html#Java-Broker-Getting-Started-Introduction">3.1.
 Introduction</a></span></dt><dt><span class="section"><a 
href="Java-Broker-Getting-Started-Starting-Stopping-Windows.html">3.2. 
 Starting/Stopping the broker on Windows</a></span></dt><dt><span 
class="section"><a 
href="Java-Broker-Getting-Started-Starting-Stopping-Unix.html">3.3. 
Starting/Stopping the broker on Unix</a></span></dt><dt><span 
class="section"><a href="Java-Broker-Getting-Started-Logging.html">3.4. Log 
file</a></span></dt><dt><span class="section"><a 
href="Java-Broker-Getting-Started-CommandLine.html">3.5. Using the command 
line</a></span></dt></dl></div><div class="section"><div 
class="titlepage"><div><div><h2 class="title" style="clear: both"><a 
id="Java-Broker-Getting-Started-Introduction"></a>3.1.&#160;Introduction</h2></div></div></div><p>
-      This section describes how to start and stop the Java Broker, and 
outlines the various command line options.
+      This section describes how to start and stop the Broker, and outlines 
the various command line options.
     </p><p>
       For additional details about the broker configuration store and related 
command line arguments see
       <a class="xref" href="Java-Broker-Initial-Configuration.html" 
title="Chapter&#160;5.&#160;Initial Configuration">Chapter&#160;5, <em>Initial 
Configuration</em></a>.

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
index 19661d4..e1bef09 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Backup.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.10.&#160;Backups</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.10.&#160;Backups</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.10.&#160;Backups</th></tr><tr><td align="left" width="20%"><a 
accesskey="p" 
href="Java-Broker-High-Availability-Security.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Reset-Group-Infomational.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-High-Availability-Backup"></a>10.10.&#160;Backups</h2></div></div></div><p>It
 is recommend to use the hot backup script to periodically backup every node in 
the

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
index 21982de..ff732e0 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Behaviour.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.4.&#160;Behaviour of the Group</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.4.&#160;Behaviour of the Group</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.4.&#160;Behaviour of the Group</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-CreatingGroup.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-NodeOperations.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-High-Availability-Behaviour"></a>10.4.&#160;Behaviour of the 
Group</h2></div></div></div><p>This section first describes the behaviour of 
the group in its default configuration. It

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
index de80154..9a2630d 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-ClientFailover.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.6.&#160;Client failover</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.6.&#160;Client failover</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.6.&#160;Client failover</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-NodeOperations.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-DiskSpace.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-High-Availability-ClientFailover"></a>10.6.&#160;Client 
failover</h2></div></div></div><p>As mentioned above, the clients need to be 
able to find the location of the active

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
index 2adad80..0596f3f 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-CreatingGroup.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.3.&#160;Creating a group</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.3.&#160;Creating a group</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.3.&#160;Creating a group</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Behaviour.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-High-Availability-CreatingGroup"></a>10.3.&#160;Creating a 
group</h2></div></div></div><p>This section describes how to create a group. At 
a high level, creating a group involves
@@ -140,7 +140,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                     <code class="literal">chaac:5000</code> and <code 
class="literal">indra:5000</code>.</p></li><li class="listitem"><p>Click Add to 
create the node. The virtualhost node will be created with the
                   virtualhost. As there is only one node at this stage, the 
role will be
                   master.</p></li></ol></div><p>
-            </p><div class="figure"><a id="d0e6168"></a><p 
class="title"><strong>Figure&#160;10.2.&#160;Creating 1st node in a 
group</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="Creating 1st node in a group" src="images/HA-Create-1.png" 
/></div></div></div><p><br class="figure-break" />
+            </p><div class="figure"><a id="d0e6314"></a><p 
class="title"><strong>Figure&#160;10.2.&#160;Creating 1st node in a 
group</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="Creating 1st node in a group" src="images/HA-Create-1.png" 
/></div></div></div><p><br class="figure-break" />
           </p></li><li class="listitem"><p>Now move to the second Broker to be 
the group. Click the <code class="literal">Add</code>
             button on the Virtualhost Panel on the Broker tab of the second 
Broker.</p><p>
             </p><div class="orderedlist"><ol class="orderedlist" type="a"><li 
class="listitem"><p>Give the Virtualhost node a unique name e.g.
@@ -150,9 +150,9 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                     <code class="literal">thor:5000</code></p></li><li 
class="listitem"><p>Give the address of this node.</p></li><li 
class="listitem"><p>Click Add to create the node. The node will use the 
existing details to
                   contact it and introduce itself into the group. At this 
stage, the group will have
                   two nodes, with the second node in the replica 
role.</p></li><li class="listitem"><p>Repeat these steps until you have added 
all the nodes to the group.</p></li></ol></div><p>
-            </p><div class="figure"><a id="d0e6226"></a><p 
class="title"><strong>Figure&#160;10.3.&#160;Adding subsequent nodes to the 
group</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="Adding subsequent nodes to the group" src="images/HA-Create-2.png" 
/></div></div></div><p><br class="figure-break" />
+            </p><div class="figure"><a id="d0e6372"></a><p 
class="title"><strong>Figure&#160;10.3.&#160;Adding subsequent nodes to the 
group</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="Adding subsequent nodes to the group" src="images/HA-Create-2.png" 
/></div></div></div><p><br class="figure-break" />
           </p></li></ol></div><p>The group is now formed and is ready for us. 
Looking at the virtualhost node of any of the
-      nodes shows a complete view of the whole group. </p><div 
class="figure"><a id="d0e6238"></a><p 
class="title"><strong>Figure&#160;10.4.&#160;View of group from one 
node</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="View of group from one node" src="images/HA-Create-3.png" 
/></div></div></div><p><br class="figure-break" /></p></div><div 
class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td 
align="left" width="40%"><a accesskey="p" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Prev</a>&#160;</td><td 
align="center" width="20%"><a accesskey="u" 
href="Java-Broker-High-Availability.html">Up</a></td><td align="right" 
width="40%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Behaviour.html">Next</a></td></tr><tr><td 
align="left" valign="top" width="40%">10.2.&#160;Overview of HA within the Java 
Broker&#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;10.4.&#160;Behaviour of 
 >the Group</td></tr></table></div></div>
+      nodes shows a complete view of the whole group. </p><div 
class="figure"><a id="d0e6384"></a><p 
class="title"><strong>Figure&#160;10.4.&#160;View of group from one 
node</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="View of group from one node" src="images/HA-Create-3.png" 
/></div></div></div><p><br class="figure-break" /></p></div><div 
class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td 
align="left" width="40%"><a accesskey="p" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Prev</a>&#160;</td><td 
align="center" width="20%"><a accesskey="u" 
href="Java-Broker-High-Availability.html">Up</a></td><td align="right" 
width="40%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Behaviour.html">Next</a></td></tr><tr><td 
align="left" valign="top" width="40%">10.2.&#160;High Availability 
Overview&#160;</td><td align="center" width="20%"><a accesskey="h" 
href="AMQP-Messaging-Broker-Java-Book.html">Home</a></td><td a
 lign="right" valign="top" width="40%">&#160;10.4.&#160;Behaviour of the 
Group</td></tr></table></div></div>
 
           <hr/>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
index 1a507e5..2d3cebe 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-DiskSpace.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.7.&#160;Disk space requirements</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.7.&#160;Disk space requirements</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.7.&#160;Disk space requirements</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-ClientFailover.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Network-Requirements.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-High-Availability-DiskSpace"></a>10.7.&#160;Disk space 
requirements</h2></div></div></div><p>In the case where node in a group are 
down, the master must keep the data they are missing

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
index 26b75bf..a0458a4 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Network-Requirements.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.8.&#160;Network Requirements</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.8.&#160;Network Requirements</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.8.&#160;Network Requirements</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-DiskSpace.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Security.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-High-Availability-Network-Requirements"></a>10.8.&#160;Network 
Requirements</h2></div></div></div><p>The HA Cluster performance depends on the 
network bandwidth, its use by existing traffic,

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
index 2b0b873..c6d7e63 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-NodeOperations.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.5.&#160;Node Operations</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.5.&#160;Node Operations</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.5.&#160;Node Operations</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-Behaviour.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-ClientFailover.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-High-Availability-NodeOperations"></a>10.5.&#160;Node 
Operations</h2></div></div></div><div class="section"><div 
class="titlepage"><div><div><h3 class="title"><a 
id="Java-Broker-High-Availability-NodeOperations-Lifecycle"></a>10.5.1.&#160;Lifecycle</h3></div></div></div><p>Virtualhost
 nodes can be stopped, started and deleted.</p><div class="itemizedlist"><ul 
class="
 itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span 
class="emphasis"><em>Stop</em></span></p><p>Stopping a master node will cause 
the node to temporarily leave the group. Any

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
index 766ac94..e330be9 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-OverviewOfHA.html
@@ -21,7 +21,7 @@
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
   <head>
-    <title>10.2.&#160;Overview of HA within the Java Broker - Apache 
Qpid&#8482;</title>
+    <title>10.2.&#160;High Availability Overview - Apache Qpid&#8482;</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,17 +111,17 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.2.&#160;Overview of HA within the Java 
Broker</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.2.&#160;High Availability Overview</li></ul>
 
         <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.2.&#160;Overview of HA within the Java Broker</th></tr><tr><td 
align="left" width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability.html">Prev</a>&#160;</td><th align="center" 
width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" 
width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-CreatingGroup.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-High-Availability-OverviewOfHA"></a>10.2.&#160;Overview of HA 
within the Java Broker</h2></div></div></div><p>The Java Broker provides a HA 
implementation offering an <span 
class="bold"><strong>Active/Passive</strong></span> mode of operation. When 
using HA, many instances of the Java
-      Broker work together to form an high availability group of two or more 
nodes.</p><p>The remainder of this section now talks about the specifics of how 
HA is achieved in terms
+          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.2.&#160;High Availability Overview</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability.html">Prev</a>&#160;</td><th align="center" 
width="60%">Chapter&#160;10.&#160;High Availability</th><td align="right" 
width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-CreatingGroup.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-High-Availability-OverviewOfHA"></a>10.2.&#160;High 
Availability Overview</h2></div></div></div><p>The Broker provides a HA 
implementation offering an <span 
class="bold"><strong>Active/Passive</strong></span> mode of operation.
+      When using HA, many instances of the Broker work together to form an 
high availability group of two or more nodes.</p><p>The remainder of this 
section now talks about the specifics of how HA is achieved in terms
       of the <a class="link" href="Java-Broker-Concepts.html" 
title="Chapter&#160;4.&#160;Concepts">concepts</a> introduced earlier in this
       book.</p><p>The <a class="link" 
href="Java-Broker-Concepts-Virtualhosts.html" 
title="4.5.&#160;Virtualhosts">Virtualhost</a> is the unit of
       replication. This means that any <span 
class="emphasis"><em>durable</em></span> queues, exchanges, and bindings
       belonging to that virtualhost, any <span 
class="emphasis"><em>persistent</em></span> messages contained within
       the queues and any attribute settings applied to the virtualhost itself 
are automatically
-      replicated to all nodes within the group.<a class="footnote" 
href="#ftn.d0e6052" id="d0e6052"><sup class="footnote">[14]</sup></a></p><p>It 
is the <a class="link" href="Java-Broker-Concepts-Virtualhost-Nodes.html" 
title="4.3.&#160;Virtualhost Nodes">Virtualhost Nodes</a>
+      replicated to all nodes within the group.<a class="footnote" 
href="#ftn.d0e6198" id="d0e6198"><sup class="footnote">[14]</sup></a></p><p>It 
is the <a class="link" href="Java-Broker-Concepts-Virtualhost-Nodes.html" 
title="4.3.&#160;Virtualhost Nodes">Virtualhost Nodes</a>
       (from different Broker instances) that join together to form a group. 
The virtualhost nodes
       collectively to coordinate the group: they organise replication between 
the master and
       replicas and conduct elections to determine who becomes the new master 
in the event of the old
@@ -132,14 +132,14 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       in this state are automatically turned away, allowing a messaging client 
to discover where the
       master currently resides. When in replica role, the node sole 
responsibility is to consume a
       replication stream in order that it remains up to date with the 
master.</p><p>Messaging clients discover the active virtualhost.This can be 
achieved using a static
-      technique (for instance, a failover url (a feature of a Qpid Java 
Client)), or a dynamic one
+      technique (for instance, a failover url (a feature of a Apache Qpid JMS 
Client for AMQP 0-9-1/0-10)), or a dynamic one
       utilising some kind of proxy or virtual IP (VIP).</p><p>The figure that 
follows illustrates a group formed of three virtualhost nodes from three
       separate Broker instances. A client is connected to the virtualhost node 
that is in the master
       role. The two virtualhost nodes <code class="literal">weather1</code> 
and <code class="literal">weather3</code>
       are replicas and are receiving a stream of updates.</p><div 
class="figure"><a id="Java-Broker-High-Availability-OverviewOfHA-Figure"></a><p 
class="title"><strong>Figure&#160;10.1.&#160;3-node group deployed across three 
Brokers.</strong></p><div class="figure-contents"><div class="mediaobject"><img 
alt="Diagram showing a 3 node group deployed across three Brokers" 
src="images/HA-Overview.png" /></div></div></div><br class="figure-break" 
/><p>Currently, the only virtualhost/virtualhost node type offering HA is BDB 
HA. Internally,
       this leverages the HA capabilities of the Berkeley DB JE edition. BDB JE 
is an <a class="link" 
href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html" 
title="E.3.&#160;Installing Oracle BDB JE">optional dependency</a> of
-      the Broker.</p><div class="note" style="margin-left: 0.5in; 
margin-right: 0.5in;"><h3 class="title">Note</h3><p>The Java Broker HA solution 
is incompatible with the HA solution offered by the CPP
-        Broker. It is not possible to co-locate Java and CPP Brokers within 
the same group.</p></div><div class="footnotes"><br /><hr style="width:100; 
text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e6052"><p><a 
class="para" href="#d0e6052"><sup class="para">[14] </sup></a>Transient 
messages and messages on non-durable queues are not 
replicated.</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-High-Availability.html">Prev</a>&#160;</td><td 
align="center" width="20%"><a accesskey="u" 
href="Java-Broker-High-Availability.html">Up</a></td><td align="right" 
width="40%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-CreatingGroup.html">Next</a></td></tr><tr><td
 align="left" valign="top" width="40%">Chapter&#160;10.&#160;High 
Availability&#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;10.3.&#160;Creating a 
group</td></tr></table></div></div>
+      the Broker.</p><div class="note" style="margin-left: 0.5in; 
margin-right: 0.5in;"><h3 class="title">Note</h3><p>The HA solution from the 
Apache Qpid Broker for Java is incompatible with the HA solution offered by the 
CPP
+        Broker. It is not possible to co-locate Broker for Java and CPP 
Brokers within the same group.</p></div><div class="footnotes"><br /><hr 
style="width:100; text-align:left;margin-left: 0" /><div class="footnote" 
id="ftn.d0e6198"><p><a class="para" href="#d0e6198"><sup class="para">[14] 
</sup></a>Transient messages and messages on non-durable queues are not 
replicated.</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-High-Availability.html">Prev</a>&#160;</td><td 
align="center" width="20%"><a accesskey="u" 
href="Java-Broker-High-Availability.html">Up</a></td><td align="right" 
width="40%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-CreatingGroup.html">Next</a></td></tr><tr><td
 align="left" valign="top" width="40%">Chapter&#160;10.&#160;High 
Availability&#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;10.3.&#160;Creating a group</td></tr></table></div></div>
 
           <hr/>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
index 0fbe8a7..19d4d0a 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Reset-Group-Infomational.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,13 +111,13 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.11.&#160;Reset Group Information</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.11.&#160;Reset Group Information</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.11.&#160;Reset Group Information</th></tr><tr><td align="left" 
width="20%"><a accesskey="p" 
href="Java-Broker-High-Availability-Backup.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Backup-And-Recovery.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-High-Availability-Reset-Group-Infomational"></a>10.11.&#160;Reset
 Group Information</h2></div></div></div><p>BDB JE internally stores details of 
the group within its database. There are some
       circumstances when resetting this information is useful.</p><div 
class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; 
"><li class="listitem"><p>Copying data between environments (e.g. production to 
UAT)</p></li><li class="listitem"><p>Some disaster recovery situations where a 
group must be recreated on new
             hardware</p></li></ul></div><p>This is not an normal operation and 
is not usually required</p><p>The following command replaces the group table 
contained within the JE logs files with the
-      provided information. </p><div class="example"><a id="d0e6562"></a><p 
class="title"><strong>Example&#160;10.1.&#160;Resetting of replication group 
with <code class="classname">DbResetRepGroup</code></strong></p><div 
class="example-contents"><div class="cmdsynopsis"><p><code 
class="command">java</code>   -cp je-5.0.104.jar   
com.sleepycat.je.rep.util.DbResetRepGroup   -h <em 
class="replaceable"><code>path/to/jelogfiles</code></em> <br />  -groupName <em 
class="replaceable"><code>newgroupname</code></em>   -nodeName <em 
class="replaceable"><code>newnodename</code></em>   -nodeHostPort <em 
class="replaceable"><code>newhostname:5000</code></em> 
</p></div></div></div><br class="example-break" /><p>The modified log files can 
then by copied into
+      provided information. </p><div class="example"><a id="d0e6708"></a><p 
class="title"><strong>Example&#160;10.1.&#160;Resetting of replication group 
with <code class="classname">DbResetRepGroup</code></strong></p><div 
class="example-contents"><div class="cmdsynopsis"><p><code 
class="command">java</code>   -cp je-5.0.104.jar   
com.sleepycat.je.rep.util.DbResetRepGroup   -h <em 
class="replaceable"><code>path/to/jelogfiles</code></em> <br />  -groupName <em 
class="replaceable"><code>newgroupname</code></em>   -nodeName <em 
class="replaceable"><code>newnodename</code></em>   -nodeHostPort <em 
class="replaceable"><code>newhostname:5000</code></em> 
</p></div></div></div><br class="example-break" /><p>The modified log files can 
then by copied into
         <code class="literal">${QPID_WORK}/&lt;nodename&gt;/config</code> 
directory of a target Broker. Then
       start the Broker, and add a BDB HA Virtualhost node specify the same 
group name, node name and
       node address. You will then have a group with a single node, ready to 
start re-adding

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
index e6f4828..6696fae 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability-Security.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>10.9.&#160;Security</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>10.9.&#160;Security</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">10.9.&#160;Security</th></tr><tr><td align="left" width="20%"><a 
accesskey="p" 
href="Java-Broker-High-Availability-Network-Requirements.html">Prev</a>&#160;</td><th
 align="center" width="60%">Chapter&#160;10.&#160;High Availability</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-Backup.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-High-Availability-Security"></a>10.9.&#160;Security</h2></div></div></div><p>The
 replication stream between the master and the replicas is insecure and can be

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
index 5958084..5f7d0dd 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-High-Availability.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,10 +111,10 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>Chapter&#160;10.&#160;High Availability</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>Chapter&#160;10.&#160;High Availability</li></ul>
 
         <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">Chapter&#160;10.&#160;High Availability</th></tr><tr><td 
align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Runtime-Memory.html">Prev</a>&#160;</td><th align="center" 
width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Next</a></td></tr></table><hr
 /></div><div class="chapter"><div class="titlepage"><div><div><h1 
class="title"><a 
id="Java-Broker-High-Availability"></a>Chapter&#160;10.&#160;High 
Availability</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-High-Availability.html#Java-Broker-High-Availability-GeneralIntroduction">10.1.
 General Introduction</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-OverviewOfHA.html">10.2. Overview of 
 HA within the Java Broker</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-CreatingGroup.html">10.3. Creating a 
group</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html">10.4. Behaviour of the 
Group</a></span></dt><dd><dl><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-Default-Behaviour">10.4.1.
 Default Behaviour</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-SynchronizationPolicy">10.4.2.
 Synchronization Policy</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-NodePriority">10.4.3.
 Node Priority</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes">10.4.4.
 Required M
 inimum Number Of Nodes</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-DesignatedPrimary">10.4.5.
 Designated Primary</a></span></dt></dl></dd><dt><span class="section"><a 
href="Java-Broker-High-Availability-NodeOperations.html">10.5. Node 
Operations</a></span></dt><dd><dl><dt><span class="section"><a 
href="Java-Broker-High-Availability-NodeOperations.html#Java-Broker-High-Availability-NodeOperations-Lifecycle">10.5.1.
 Lifecycle</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-NodeOperations.html#Java-Broker-High-Availability-NodeOperations-TransferMaster">10.5.2.
 Transfer Master</a></span></dt></dl></dd><dt><span class="section"><a 
href="Java-Broker-High-Availability-ClientFailover.html">10.6. Client 
failover</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-DiskSpace.html">10.7. Disk space 
requirements</a></span></dt><dt><span class="se
 ction"><a href="Java-Broker-High-Availability-Network-Requirements.html">10.8. 
Network Requirements</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Security.html">10.9. 
Security</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Backup.html">10.10. 
Backups</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Reset-Group-Infomational.html">10.11. Reset 
Group Information</a></span></dt></dl></div><div class="section"><div 
class="titlepage"><div><div><h2 class="title" style="clear: both"><a 
id="Java-Broker-High-Availability-GeneralIntroduction"></a>10.1.&#160;General 
Introduction</h2></div></div></div><p>The term High Availability (HA) usually 
refers to having a number of instances of a
+          <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">Chapter&#160;10.&#160;High Availability</th></tr><tr><td 
align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Runtime-Memory.html">Prev</a>&#160;</td><th align="center" 
width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Next</a></td></tr></table><hr
 /></div><div class="chapter"><div class="titlepage"><div><div><h1 
class="title"><a 
id="Java-Broker-High-Availability"></a>Chapter&#160;10.&#160;High 
Availability</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-High-Availability.html#Java-Broker-High-Availability-GeneralIntroduction">10.1.
 General Introduction</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-OverviewOfHA.html">10.2. High Availab
 ility Overview</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-CreatingGroup.html">10.3. Creating a 
group</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html">10.4. Behaviour of the 
Group</a></span></dt><dd><dl><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-Default-Behaviour">10.4.1.
 Default Behaviour</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-SynchronizationPolicy">10.4.2.
 Synchronization Policy</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-NodePriority">10.4.3.
 Node Priority</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes">10.4.4.
 Required Minimum Numb
 er Of Nodes</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-DesignatedPrimary">10.4.5.
 Designated Primary</a></span></dt></dl></dd><dt><span class="section"><a 
href="Java-Broker-High-Availability-NodeOperations.html">10.5. Node 
Operations</a></span></dt><dd><dl><dt><span class="section"><a 
href="Java-Broker-High-Availability-NodeOperations.html#Java-Broker-High-Availability-NodeOperations-Lifecycle">10.5.1.
 Lifecycle</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-NodeOperations.html#Java-Broker-High-Availability-NodeOperations-TransferMaster">10.5.2.
 Transfer Master</a></span></dt></dl></dd><dt><span class="section"><a 
href="Java-Broker-High-Availability-ClientFailover.html">10.6. Client 
failover</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-DiskSpace.html">10.7. Disk space 
requirements</a></span></dt><dt><span class="section"><a h
 ref="Java-Broker-High-Availability-Network-Requirements.html">10.8. Network 
Requirements</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Security.html">10.9. 
Security</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Backup.html">10.10. 
Backups</a></span></dt><dt><span class="section"><a 
href="Java-Broker-High-Availability-Reset-Group-Infomational.html">10.11. Reset 
Group Information</a></span></dt></dl></div><div class="section"><div 
class="titlepage"><div><div><h2 class="title" style="clear: both"><a 
id="Java-Broker-High-Availability-GeneralIntroduction"></a>10.1.&#160;General 
Introduction</h2></div></div></div><p>The term High Availability (HA) usually 
refers to having a number of instances of a
       service such as a Message Broker available so that should a service 
unexpectedly fail, or
       requires to be shutdown for maintenance, users may quickly connect to 
another instance and
       continue their work with minimal interruption. HA is one way to make a 
overall system more
@@ -123,7 +123,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       nodes within the group are usually available for use by clients all of 
the time. In an
       Active/Passive system, one only node within the group is available for 
use by clients at any
       one time, whilst the others are in some kind of standby state, awaiting 
to quickly step-in in
-      the event the active node becomes unavailable. </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-Runtime-Memory.html">Prev</a>&#160;</td><td align="center" 
width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Next</a></td></tr><tr><td
 align="left" valign="top" width="40%">9.10.&#160;Memory&#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;10.2.&#160;Overview of HA within the Java 
Broker</td></tr></table></div></div>
+      the event the active node becomes unavailable. </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-Runtime-Memory.html">Prev</a>&#160;</td><td align="center" 
width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" 
href="Java-Broker-High-Availability-OverviewOfHA.html">Next</a></td></tr><tr><td
 align="left" valign="top" width="40%">9.10.&#160;Memory&#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;10.2.&#160;High Availability 
Overview</td></tr></table></div></div>
 
           <hr/>
 

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
index fcc6dbf..76d5335 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Configuration-Properties.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>5.7.&#160;Customising Configuration using 
Configuration Properties</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>5.7.&#160;Customising Configuration using Configuration 
Properties</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">5.7.&#160;Customising Configuration using Configuration 
Properties</th></tr><tr><td align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Initial-Configuration-Type.html">Prev</a>&#160;</td><th 
align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Initial-Configuration-Example.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-Initial-Configuration-Configuration-Properties"></a>5.7.&#160;Customising
 Configuration using Configuration Properties</h2></div></div></div><p> It is 
possible for 'Initial Configuration' (and Configuration Store) files to contain
@@ -119,7 +119,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             customisation using a fixed file. Configuration Property values 
can be set either via
             Java System Properties, or by specifying ConfigurationProperties 
on the broker command
             line. If both are defined, System Property values take precedence. 
</p><p> The broker has the following set of core configuration properties, with 
the indicated
-            default values if not otherwise configured by the user: </p><div 
class="table"><a id="d0e1597"></a><p 
class="title"><strong>Table&#160;5.1.&#160;Base Configuration 
Properties</strong></p><div class="table-contents"><table border="1" 
summary="Base Configuration Properties"><colgroup><col /><col /><col 
/></colgroup><thead><tr><th> Name </th><th> Description </th><th> Value 
</th></tr></thead><tbody><tr><td> qpid.amqp_port </td><td> Port number used for 
the brokers default AMQP messaging port </td><td> "5672" </td></tr><tr><td> 
qpid.http_port </td><td> Port number used for the brokers default HTTP 
management port </td><td> "8080" </td></tr><tr><td> qpid.home_dir </td><td> 
Location of the broker installation directory, which contains
+            default values if not otherwise configured by the user: </p><div 
class="table"><a id="d0e1625"></a><p 
class="title"><strong>Table&#160;5.1.&#160;Base Configuration 
Properties</strong></p><div class="table-contents"><table border="1" 
summary="Base Configuration Properties"><colgroup><col /><col /><col 
/></colgroup><thead><tr><th> Name </th><th> Description </th><th> Value 
</th></tr></thead><tbody><tr><td> qpid.amqp_port </td><td> Port number used for 
the brokers default AMQP messaging port </td><td> "5672" </td></tr><tr><td> 
qpid.http_port </td><td> Port number used for the brokers default HTTP 
management port </td><td> "8080" </td></tr><tr><td> qpid.home_dir </td><td> 
Location of the broker installation directory, which contains
                                 the 'lib' directory and the 'etc' directory 
often used to store
                                 files such as group and ACL files. </td><td> 
Defaults to the value set into the QPID_HOME system property if
                                 it is set, or remains unset otherwise unless 
configured by the user.

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
index 49e671e..2fe9bfb 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Create-Initial-Config.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,7 +111,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>5.4.&#160;Creating an 'Initial Configuration' JSON 
File</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>5.4.&#160;Creating an 'Initial Configuration' JSON 
File</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">5.4.&#160;Creating an 'Initial Configuration' JSON 
File</th></tr><tr><td align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Initial-Configuration-Initial-Config-Location.html">Prev</a>&#160;</td><th
 align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Initial-Configuration-Overwrite-Config-Store.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-Initial-Configuration-Create-Initial-Config"></a>5.4.&#160;Creating
 an 'Initial Configuration' JSON File</h2></div></div></div><p> It is possible 
to have the broker output its default internal 'Initial Configuration'

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
----------------------------------------------------------------------
diff --git 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
index 1fe144e..b255e3f 100644
--- 
a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
+++ 
b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Initial-Configuration-Example.html
@@ -83,7 +83,7 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             <h3>Servers and tools</h3>
 
             <ul>
-              <li><a href="/components/java-broker/index.html">Java 
broker</a></li>
+              <li><a href="/components/java-broker/index.html">Broker for 
Java</a></li>
               <li><a href="/components/cpp-broker/index.html">C++ 
broker</a></li>
               <li><a href="/components/dispatch-router/index.html">Dispatch 
router</a></li>
             </ul>
@@ -111,23 +111,18 @@ 
https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
       </div>
 
       <div id="-middle" class="panel">
-        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">AMQP Messaging 
Broker (Java)</a></li><li>5.8.&#160;Example of JSON 'Initial 
Configuration'</li></ul>
+        <ul id="-path-navigation"><li><a 
href="/index.html">Home</a></li><li><a 
href="/releases/index.html">Releases</a></li><li><a 
href="/releases/qpid-java-trunk/index.html">Qpid for Java Trunk</a></li><li><a 
href="/releases/qpid-java-trunk/java-broker/book/index.html">Apache Qpid Broker 
for Java</a></li><li>5.8.&#160;Example of JSON 'Initial Configuration'</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table 
summary="Navigation header" width="100%"><tr><th align="center" 
colspan="3">5.8.&#160;Example of JSON 'Initial Configuration'</th></tr><tr><td 
align="left" width="20%"><a accesskey="p" 
href="Java-Broker-Initial-Configuration-Configuration-Properties.html">Prev</a>&#160;</td><th
 align="center" width="60%">Chapter&#160;5.&#160;Initial Configuration</th><td 
align="right" width="20%">&#160;<a accesskey="n" 
href="Java-Broker-Management-Channel.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-Initial-Configuration-Example"></a>5.8.&#160;Example of JSON 
'Initial Configuration'</h2></div></div></div><p> An example of the default 
'Initial Configuration' JSON file the broker uses is
-            provided below:</p><div class="example"><a id="d0e1666"></a><p 
class="title"><strong>Example&#160;5.1.&#160;JSON 'Initial configuration' 
File</strong></p><div class="example-contents"><pre class="programlisting">
+            provided below:</p><div class="example"><a id="d0e1694"></a><p 
class="title"><strong>Example&#160;5.1.&#160;JSON 'Initial configuration' 
File</strong></p><div class="example-contents"><pre class="programlisting">
 {
   "name": "${broker.name}",
-  "modelVersion": "6.0",
+  "modelVersion": "6.1",
   "authenticationproviders" : [ {
     "name" : "passwordFile",
     "type" : "PlainPasswordFile",
-    "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd",
-    "preferencesproviders" : [{
-        "name": "fileSystemPreferences",
-        "type": "FileSystemPreferences",
-        "path" : "${qpid.work_dir}${file.separator}user.preferences.json"
-    }]
+    "path" : "${qpid.home_dir}${file.separator}etc${file.separator}passwd"
   } ],
     "brokerloggers" : [ {
     "name" : "logfile",


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to