You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/08/01 14:01:53 UTC

[22/51] [partial] qpid-site git commit: QPID-7341: Update Qpid web site and trunk documentation for Qpid for Java to refer Qpid Java-based components using names respecting Oracle Java trademark

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Keystores.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Keystores.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Keystores.html
index 90aab57..1b4f40d 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Keystores.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Keystores.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>7.12.&#160;Keystores</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>7.12.&#160;Keystores</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.12.&#160;Keystores</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Authentication-Providers.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Truststores.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-Managing-Keystores"></a>7.12.&#160;Keystores</h2></div></div></div><p>A <a class="link" href="Java-Broker-Concepts-Other-Services.html#Java-Broker-Concepts-Keystores" title="4.10.3.&#160;Keystores">Keystore</a> is required by a Port in
@@ -127,7 +127,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                         certificate and optionally a file containing intermediate
                         certificates.</p></li><li class="listitem"><p><span class="emphasis"><em>Auto Generated Self Signed</em></span> has the ability to
                         generate a self signed certificate and produce a truststore
-                        suitable for use by an application using the Qpid JMS client.</p><p>The use of self signed certficates is not recommended for production
+                        suitable for use by an application using the Apache Qpid JMS client for AMQP 0-9-1/0-10.</p><p>The use of self signed certficates is not recommended for production
                         use.</p></li></ul></div><p>
         </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Keystores-Attributes"></a>7.12.2.&#160;Attributes</h3></div></div></div><p>
             </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Name the keystore</em></span>. Used to identify the
@@ -135,7 +135,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
         </p><p>The following attributes apply to <span class="emphasis"><em>File Key Stores</em></span> only.</p><p>
             </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Keystore path</em></span>. File Key Stores only. Path to keystore
                         file</p></li><li class="listitem"><p><span class="emphasis"><em>Keystore password</em></span>. Password used to secure the keystore</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p> The password of the certificate used by the Broker <span class="bold"><strong>must</strong></span> match the password of the keystore
-                                itself. This is a restriction of the Qpid Broker implementation. If
+                                itself. This is a restriction of the Broker implementation. If
                                 using the <a class="link" href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/keytool.html" target="_top">keytool</a> utility, note
                                 that this means the argument to the <code class="option">-keypass</code> option
                                 must match the <code class="option">-storepass</code> option. </p></div></li><li class="listitem"><p><span class="emphasis"><em>Certificate Alias</em></span>. An optional way of specifying

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
index c46f050..2e90e39 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Plugin-HTTP.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>7.16.&#160;HTTP Plugin</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>7.16.&#160;HTTP Plugin</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.16.&#160;HTTP Plugin</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Access-Control-Providers.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-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-Management-Managing-Plugin-HTTP"></a>7.16.&#160;HTTP Plugin</h2></div></div></div><p>The HTTP Plugin provides the <a class="link" href="Java-Broker-Management-Channel.html#Java-Broker-Management-Channel-HTTP" title="6.1.&#160;HTTP Management">HTTP management channel</a> comprising of the <a class="link" href="Java-Broker-Management-Channel-Web-Console.html" title="6.2.&#160;Web 
 Management Console">Web
@@ -121,7 +121,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                         (enabled) by default.</p></li><li class="listitem"><p><span class="emphasis"><em>SASL Authentication for HTTP</em></span>. It is set to true
                         (enabled) by default.</p></li><li class="listitem"><p><span class="emphasis"><em>SASL Authentication for HTTPS</em></span>. It is set to true
                         (enabled) by default.</p></li><li class="listitem"><p><span class="emphasis"><em>Session timeout</em></span> is the timeout in seconds to close
-                        the HTTP session. It is set to 10 minutes by default.</p></li></ul></div><p>
+                        the HTTP session. It is set to 10 minutes by default.</p></li><li class="listitem"><p><span class="emphasis"><em>CORS Allow Origins</em></span> is a comma separated list of origins that are allowed to access the REST API. Set to '*' to allow all origins. Default is empty, meaning CORS is disabled.</p></li><li class="listitem"><p><span class="emphasis"><em>CORS Allow Methods</em></span> is a comma separated list of HTTP methods that are allowed to be used when doing CORS requests. Default value is "HEAD,GET,POST".</p></li><li class="listitem"><p><span class="emphasis"><em>CORS Allow Headers</em></span> is a comma separated list of HTTP headers that are allowed to be specified when doing CORS requests. Default value is "Content-Type,Accept,Origin,X-Requested-With".</p></li><li class="listitem"><p><span class="emphasis"><em>CORS Allow Credentials</em></span> is a boolean indicating if the resource allows requests with credentials. Default value is true.</p></li>
 </ul></div><p>
         </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Plugin-HTTP-Children"></a>7.16.2.&#160;Children</h3></div></div></div><p>None</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Plugin-HTTP-Lifecycle"></a>7.16.3.&#160;Lifecycle</h3></div></div></div><p>Not supported</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p>NOTE: Changes to the Session Timeout attribute only take
                     effect at broker restart. </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-Management-Managing-Access-Control-Providers.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Managing-Entities.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Security.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.15.&#160;Access Control Providers&#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;8.&#160;Security</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-Management-Managing-Ports.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html
index a4bc898..1048fd7 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.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>7.10.&#160;Ports</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>7.10.&#160;Ports</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.10.&#160;Ports</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Consumers.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Authentication-Providers.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-Managing-Ports"></a>7.10.&#160;Ports</h2></div></div></div><p>Ports provide TCP/IP connectivity for messaging and management. A port is defined to use a
@@ -123,7 +123,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                         number of pending connections that may be queued by the AMQP port. Once the queue
                         is full, further connections will be refused. This is a request to the operating system
                         which may or may not be respected. The operating system itself may impose a ceiling.
-                        <a class="footnote" href="#ftn.d0e3297" id="d0e3297"><sup class="footnote">[11]</sup></a></p></li></ul></div><p>
+                        <a class="footnote" href="#ftn.d0e3332" id="d0e3332"><sup class="footnote">[11]</sup></a></p></li></ul></div><p>
         </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Ports-Attributes"></a>7.10.2.&#160;Attributes</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Name the port</em></span>.</p></li><li class="listitem"><p><span class="emphasis"><em>Port number</em></span>.</p></li><li class="listitem"><p><span class="emphasis"><em>Binding address</em></span>. Used to limit port binding to a
                         single network interface.</p></li><li class="listitem"><p><span class="emphasis"><em>Authentication Provider</em></span>. The <a class="link" href="Java-Broker-Concepts-Authentication-Providers.html" title="4.9.&#160;Authentication Providers">authentication
                             provider</a> used to authenticate incoming connections.</p></li><li class="listitem"><p><span class="emphasis"><em>Protocol(s)</em></span>. A list of protocols to be supported by
@@ -136,7 +136,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                         containing the Broker's private key. Required if SSL is in use.</p></li><li class="listitem"><p><span class="emphasis"><em>Want/Need Client Auth</em></span>. Client authentication can be
                         either accepted if offered (want), or demanded (need). When Client
                         Certificate Authentication is in use a Truststore must be configured. When
-                        using Client Certificate Authentication it may be desirable to use the <a class="link" href="Java-Broker-Security.html#Java-Broker-Security-External-Provider" title="8.1.3.&#160;External (SSL Client Certificates)">External Authentication
+                        using Client Certificate Authentication it may be desirable to use the <a class="link" href="Java-Broker-Security.html#Java-Broker-Security-External-Provider" title="8.1.4.&#160;External (SSL Client Certificates)">External Authentication
                             Provider</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Truststore</em></span>. <a class="link" href="Java-Broker-Management-Managing-Truststores.html" title="7.13.&#160;Truststores">Trust store</a>
                         contain an issuer certificate or the public keys of the clients themselves
                         if peers only is desired.</p></li><li class="listitem"><p><span class="emphasis"><em>Maximum Open Connections</em></span>. AMQP ports only.  Limits
@@ -145,7 +145,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
                     used from the thread pool to dispatch I/O activity to the worker threads.</p><p>Defaults to one eighth of the thread pool size. Minimum 1.</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Ports-Children"></a>7.10.3.&#160;Children</h3></div></div></div><p>
             </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Connection</p></li></ul></div><p>
         </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Ports-Lifecycle"></a>7.10.4.&#160;Lifecycle</h3></div></div></div><p>Not supported</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Important</h3><p>When updating an existing port, changes to SSL settings, binding address and port
-                numbers do not become effective until the Broker is restarted.</p></div></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e3297"><p><a class="para" href="#d0e3297"><sup class="para">[11] </sup></a>Some Linux distributions govern the ceiling with a <code class="literal">sysctl</code>
+                numbers do not become effective until the Broker is restarted.</p></div></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e3332"><p><a class="para" href="#d0e3332"><sup class="para">[11] </sup></a>Some Linux distributions govern the ceiling with a <code class="literal">sysctl</code>
                             setting <code class="literal">net.core.somaxconn</code>.</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-Management-Managing-Consumers.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Managing-Entities.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Authentication-Providers.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.9.&#160;Consumers&#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;7.11.&#160;Authentication Providers</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-Management-Managing-Queues.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html
index c7c28f2..86c1e03 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.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>7.8.&#160;Queues</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>7.8.&#160;Queues</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.8.&#160;Queues</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Exchanges.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Consumers.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-Managing-Queues"></a>7.8.&#160;Queues</h2></div></div></div><p><a class="link" href="Java-Broker-Concepts-Queues.html" title="4.7.&#160;Queues">Queues</a> are named entities that

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
index 001528d..3a150b4 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.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>7.6.&#160;Remote Replication Nodes</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>7.6.&#160;Remote Replication Nodes</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.6.&#160;Remote Replication Nodes</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Virtualhosts.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Exchanges.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-Managing-RemoteReplicationNodes"></a>7.6.&#160;Remote Replication Nodes</h2></div></div></div><p>Used for HA only. A <a class="link" href="Java-Broker-Concepts-RemoteReplicationNodes.html" title="4.4.&#160;Remote Replication Nodes">remote replication node</a> is a representation of another virtualhost node

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html
index 0aacfbc..18039c0 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.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,15 +111,16 @@ 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>7.13.&#160;Truststores</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>7.13.&#160;Truststores</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.13.&#160;Truststores</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Keystores.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Group-Providers.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-Managing-Truststores"></a>7.13.&#160;Truststores</h2></div></div></div><p> A <a class="link" href="Java-Broker-Concepts-Other-Services.html#Java-Broker-Concepts-Truststores" title="4.10.4.&#160;Truststores">Truststore</a> is required by a
         Port in order to SSL client authentication. Some authentication provides also use a
         truststore when connecting to authentication systems that are protected by a private issuer
         SSL certificate.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Truststores-Types"></a>7.13.1.&#160;Types</h3></div></div></div><p>The following truststore types are supported. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>File Trust Store</em></span>. This type accepts the standard JKS
-                        truststore format undertood by Java and Java tools such as <a class="link" href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/keytool.html" target="_top">keytool</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Non Java Trust Store</em></span>. A non java keystore accepts key
-                        material in PEM and DER file formats. </p></li><li class="listitem"><p>TODO</p></li></ul></div><p>
+                        truststore format understood by Java and Java tools such as <a class="link" href="http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/keytool.html" target="_top">keytool</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Non Java Trust Store</em></span>. A non java trust store accepts key
+                        material in PEM and DER file formats. Either a path to the certificate on the server can be specified using the file:// protocol or the certificate can be uploaded with the data:// protocol</p></li><li class="listitem"><p><span class="emphasis"><em>Managed Certificate Store</em></span>. This type accepts key
+                        material in PEM and DER file formats. Contrary to the Non Java Trust Store this store allows the user to add multiple certificates and stores them in the broker configuration.</p></li><li class="listitem"><p><span class="emphasis"><em>Site Specific Trust Store</em></span>. This type will download a certificate from the provided SSL/TLS enabled URL. Note that you must specify both the protocol and the port. Example: https://example.com:443</p></li></ul></div><p>
         </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Truststores-Attributes"></a>7.13.2.&#160;Attributes</h3></div></div></div><p>
             </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Name the truststore</em></span>. Used to identify the
                         truststore.</p></li></ul></div><p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
index d6fb9ba..2bd6499 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.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>7.4.&#160;Virtualhost Nodes</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>7.4.&#160;Virtualhost Nodes</li></ul>
 
         <div id="-middle-content">
-          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.4.&#160;Virtualhost Nodes</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Broker.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Virtualhosts.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-Managing-Virtualhost-Nodes"></a>7.4.&#160;Virtualhost Nodes</h2></div></div></div><p>Virtualhost nodes can only be managed by the HTTP management channel.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhost-Nodes-Types"></a>7.4.1.&#160;Types</h3></div></div></div><p> The following vir
 tualhost nodes types are supported. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>BDB - Node backed with Oracle BDB <a class="footnote" href="#ftn.d0e2679" id="d0e2679"><sup class="footnote">[6]</sup></a></p></li><li class="listitem"><p>BDB HA - Node backed with Oracle BDB utilising High
-          Availability</p></li><li class="listitem"><p>DERBY - Node backed with Apache Derby</p></li><li class="listitem"><p>JDBC - Node backed with an external database <a class="footnote" href="#ftn.d0e2693" id="d0e2693"><sup class="footnote">[7]</sup></a></p></li><li class="listitem"><p>JSON - Node backed with a file containing json</p></li><li class="listitem"><p>Memory - In-memory node (changes lost on Broker restart)</p></li></ul></div><p>
+          <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.4.&#160;Virtualhost Nodes</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Broker.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Virtualhosts.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-Managing-Virtualhost-Nodes"></a>7.4.&#160;Virtualhost Nodes</h2></div></div></div><p>Virtualhost nodes can only be managed by the HTTP management channel.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhost-Nodes-Types"></a>7.4.1.&#160;Types</h3></div></div></div><p> The following vir
 tualhost nodes types are supported. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>BDB - Node backed with Oracle BDB <a class="footnote" href="#ftn.d0e2714" id="d0e2714"><sup class="footnote">[6]</sup></a></p></li><li class="listitem"><p>BDB HA - Node backed with Oracle BDB utilising High
+          Availability</p></li><li class="listitem"><p>DERBY - Node backed with Apache Derby</p></li><li class="listitem"><p>JDBC - Node backed with an external database <a class="footnote" href="#ftn.d0e2728" id="d0e2728"><sup class="footnote">[7]</sup></a></p></li><li class="listitem"><p>JSON - Node backed with a file containing json</p></li><li class="listitem"><p>Memory - In-memory node (changes lost on Broker restart)</p></li></ul></div><p>
     </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes"></a>7.4.2.&#160;Attributes</h3></div></div></div><p>
       </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Name the virtualhost node</em></span>.</p></li><li class="listitem"><p><span class="emphasis"><em>Default Virtual Host Node</em></span>. If true, messaging clients which do
             not specify a virtualhost name will be connected to the virtualhost beneath this node.</p></li><li class="listitem"><p><span class="emphasis"><em>Store Path or JDBC URL.</em></span> Refers the location used to store the
@@ -147,7 +147,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             contained within it. All exchanges and queues, any the messages contained within it are
             removed. In the HA case, deleting the virtualhost node causes it be removed permanently
             from the group.</p></li></ul></div><p>
-    </p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e2679"><p><a class="para" href="#d0e2679"><sup class="para">[6] </sup></a>Oracle BDB JE is optional. 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>.</p></div><div class="footnote" id="ftn.d0e2693"><p><a class="para" href="#d0e2693"><sup class="para">[7] </sup></a>JDBC 4.0 compatible drivers must be available. See <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></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-Management-Managing-Broker.html">Prev</a>
 &#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Managing-Entities.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Virtualhosts.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.3.&#160;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;7.5.&#160;VirtualHosts</td></tr></table></div></div>
+    </p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e2714"><p><a class="para" href="#d0e2714"><sup class="para">[6] </sup></a>Oracle BDB JE is optional. 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>.</p></div><div class="footnote" id="ftn.d0e2728"><p><a class="para" href="#d0e2728"><sup class="para">[7] </sup></a>JDBC 4.0 compatible drivers must be available. See <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></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-Management-Managing-Broker.html">Prev</a>
 &#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Managing-Entities.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-Virtualhosts.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.3.&#160;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;7.5.&#160;VirtualHosts</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-Management-Managing-Virtualhosts.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
index 6d35765..ea5ccae 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.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,12 +111,12 @@ 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>7.5.&#160;VirtualHosts</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>7.5.&#160;VirtualHosts</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">7.5.&#160;VirtualHosts</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Management-Managing-Virtualhost-Nodes.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;7.&#160;Managing Entities</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-RemoteReplicationNodes.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-Managing-Virtualhosts"></a>7.5.&#160;VirtualHosts</h2></div></div></div><p>A virtualhost is a independent namespace in which messaging is performed. Virtualhosts are
-    responsible for the storage of message data.</p><p>Virtualhosts can only be managed by the HTTP management channel.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhosts-Types"></a>7.5.1.&#160;Types</h3></div></div></div><p>The following virtualhost types are supported. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>BDB - Virtualhost backed with Oracle BDB <a class="footnote" href="#ftn.d0e2822" id="d0e2822"><sup class="footnote">[8]</sup></a></p></li><li class="listitem"><p>BDB HA - Virtualhost backed with Oracle BDB utilising High Availability</p></li><li class="listitem"><p>DERBY - Virtualhost backed with Apache Derby</p></li><li class="listitem"><p>JDBC - Virtualhost backed with an external database <a class="footnote" href="#ftn.d0e2836" id="d0e2836"><sup class="footnote">[9]</sup></a></p></li><li class="listitem"><p>Memory - In-memory nod
 e (changes lost on Broker restart)</p></li><li class="listitem"><p>Provided - Virtualhost that co-locates message data within the parent virtualhost
-            node <a class="footnote" href="#ftn.d0e2846" id="d0e2846"><sup class="footnote">[10]</sup></a>.</p></li></ul></div><p>
+    responsible for the storage of message data.</p><p>Virtualhosts can only be managed by the HTTP management channel.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhosts-Types"></a>7.5.1.&#160;Types</h3></div></div></div><p>The following virtualhost types are supported. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>BDB - Virtualhost backed with Oracle BDB <a class="footnote" href="#ftn.d0e2857" id="d0e2857"><sup class="footnote">[8]</sup></a></p></li><li class="listitem"><p>BDB HA - Virtualhost backed with Oracle BDB utilising High Availability</p></li><li class="listitem"><p>DERBY - Virtualhost backed with Apache Derby</p></li><li class="listitem"><p>JDBC - Virtualhost backed with an external database <a class="footnote" href="#ftn.d0e2871" id="d0e2871"><sup class="footnote">[9]</sup></a></p></li><li class="listitem"><p>Memory - In-memory nod
 e (changes lost on Broker restart)</p></li><li class="listitem"><p>Provided - Virtualhost that co-locates message data within the parent virtualhost
+            node <a class="footnote" href="#ftn.d0e2881" id="d0e2881"><sup class="footnote">[10]</sup></a>.</p></li></ul></div><p>
     </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhost-Context"></a>7.5.2.&#160;Context</h3></div></div></div><p>
       </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>use_async_message_store_recovery</em></span> Controls the <a class="link" href="Java-Broker-Runtime-Background-Recovery.html" title="9.7.&#160;Background Recovery">background recovery</a>
             feature.</p></li></ul></div><p>
@@ -141,7 +141,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             connections to the virtualhost and prevents new ones. Any inflight transactions are
             rolled back. Non durable queues and non durable exchanges are lost. Transient messages
             or persistent messages on non-durable queues are lost.</p></li><li class="listitem"><p><span class="emphasis"><em>Start</em></span>. Activates the virtualhost.</p></li></ul></div><p>
-    </p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e2822"><p><a class="para" href="#d0e2822"><sup class="para">[8] </sup></a>Oracle BDB JE is optional. 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>.</p></div><div class="footnote" id="ftn.d0e2836"><p><a class="para" href="#d0e2836"><sup class="para">[9] </sup></a>JDBC 4.0 compatible drivers must be available. See <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></p></div><div class="footnote" id="ftn.d0e2846"><p><a class="para" href="#d0e2846"><sup class="para">[10] </sup></a>Not available if Virtualhost Node type is JSON.</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-Management-Managing-Virtualhost-Nodes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Managing-Entities.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-RemoteReplicationNodes.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.4.&#160;Virtualhost Nodes&#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;7.6.&#160;Remote Replication Nodes</td></tr></table></div></div>
+    </p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div class="footnote" id="ftn.d0e2857"><p><a class="para" href="#d0e2857"><sup class="para">[8] </sup></a>Oracle BDB JE is optional. 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>.</p></div><div class="footnote" id="ftn.d0e2871"><p><a class="para" href="#d0e2871"><sup class="para">[9] </sup></a>JDBC 4.0 compatible drivers must be available. See <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></p></div><div class="footnote" id="ftn.d0e2881"><p><a class="para" href="#d0e2881"><sup class="para">[10] </sup></a>Not available if Virtualhost Node type is JSON.</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-Management-Managing-Virtualhost-Nodes.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Management-Managing-Entities.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Management-Managing-RemoteReplicationNodes.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.4.&#160;Virtualhost Nodes&#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;7.6.&#160;Remote Replication Nodes</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-Miscellaneous-Installing-External-JDBC-Driver.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
index 15f01e4..5738a81 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.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>E.2.&#160;Installing External JDBC Driver</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>E.2.&#160;Installing External JDBC Driver</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">E.2.&#160;Installing External JDBC Driver</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Miscellaneous.html">Prev</a>&#160;</td><th align="center" width="60%">Appendix&#160;E.&#160;Miscellaneous</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.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-Miscellaneous-Installing-External-JDBC-Driver"></a>E.2.&#160;Installing External JDBC Driver</h2></div></div></div><p>In order to use a JDBC Virtualhost Node or a JDBC Virtualhost, you must make the

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
index f0be54b..c76fcd6 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.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>E.3.&#160;Installing Oracle BDB JE</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>E.3.&#160;Installing Oracle BDB JE</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">E.3.&#160;Installing Oracle BDB JE</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">Prev</a>&#160;</td><th align="center" width="60%">Appendix&#160;E.&#160;Miscellaneous</th><td align="right" width="20%">&#160;</td></tr></table><hr /></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"></a>E.3.&#160;Installing Oracle BDB JE</h2></div></div></div><p> The Oracle BDB JE is not distributed with Apache Qpid owing to license considerations.. </p><p>If you wish to use a BDB Virtualhost Node, BDB Virtualhost, or BDB HA Virtualhost Node you

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html
index b0beccf..bca756b 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.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>Appendix&#160;E.&#160;Miscellaneous</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>Appendix&#160;E.&#160;Miscellaneous</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">Appendix&#160;E.&#160;Miscellaneous</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Appendix-Queue-Alerts.html">Prev</a>&#160;</td><th align="center" width="60%">&#160;</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">Next</a></td></tr></table><hr /></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a id="Java-Broker-Miscellaneous"></a>Appendix&#160;E.&#160;Miscellaneous</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-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification">E.1. JVM Installation verification</a></span></dt><dd><dl><dt><span class="section"><a href="Java-Broker-Miscellaneous.html#Java-Broker-Miscella
 neous-JVM-Verification-Windows">E.1.1. Verify JVM on Windows</a></span></dt><dt><span class="section"><a href="Java-Broker-Miscellaneous.html#Java-Broker-Miscellaneous-JVM-Verification-Unix">E.1.2. Verify JVM on Unix</a></span></dt></dl></dd><dt><span class="section"><a href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">E.2. Installing External JDBC Driver</a></span></dt><dt><span class="section"><a href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html">E.3. Installing Oracle BDB JE</a></span></dt></dl></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="Java-Broker-Miscellaneous-JVM-Verification"></a>E.1.&#160;JVM Installation verification</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Miscellaneous-JVM-Verification-Windows"></a>E.1.1.&#160;Verify JVM on Windows</h3></div></div></div><p> Firstly confirm that the JAVA_HOME environment varia
 ble is set correctly by typing the

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Background-Recovery.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
index 229e1a2..8967dbc 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Background-Recovery.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Background-Recovery.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>9.7.&#160;Background Recovery</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>9.7.&#160;Background Recovery</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">9.7.&#160;Background Recovery</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime-Flow-To-Disk.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;9.&#160;Runtime</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Runtime-Message-Compression.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-Runtime-Background-Recovery"></a>9.7.&#160;Background Recovery</h2></div></div></div><p>On startup of the Broker, or restart of a Virtualhost, the Broker restores all durable

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
index ee866ed..81c9631 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Close-Connection-When-No-Route.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,14 +111,14 @@ 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>9.5.&#160;Closing client connections on unroutable mandatory messages</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>9.5.&#160;Closing client connections on unroutable mandatory messages</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">9.5.&#160;Closing client connections on unroutable mandatory messages</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime-Handling-Undeliverable-Messages.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;9.&#160;Runtime</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Runtime-Flow-To-Disk.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-Runtime-Close-Connection-When-No-Route"></a>9.5.&#160;Closing client connections on unroutable mandatory messages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Runtime-Close-Connection-When-No-Route-Summary"></a>9.5.1.&#160;Summary</h3></div></div></div><p>
         Due to asynchronous nature of AMQP 0-8/0-9/0-9-1 protocols sending a message with a routing key for which no queue binding exist results
         in either message being bounced back (if it is mandatory or immediate) or discarded on broker side otherwise.
     </p><p>
-        When a 'mandatory' message is returned back, the Qpid JMS client conveys this by delivering
+        When a 'mandatory' message is returned back, the Apache Qpid JMS client for AMQP 0-9-1/0-10 conveys this by delivering
         an <span class="emphasis"><em>AMQNoRouteException</em></span> through the configured ExceptionListener on the Connection.
         This does not cause channel or connection closure, however it requires a special exception handling
         on client side in order to deal with <span class="emphasis"><em>AMQNoRouteExceptions</em></span>.
@@ -126,12 +126,12 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
         as they usually close the connection on receiving any JMSException.
     </p><p>
         In order to simplify application handling of scenarios where 'mandatory' messages
-        are being sent to queues which do not actually exist, the Java Broker can be configured such that
+        are being sent to queues which do not actually exist, the Apache Qpid Broker for Java can be configured such that
         it will respond to this situation by closing the connection
         rather than returning the unroutable message to the client as it normally should.
         From the application perspective, this will result in failure of synchronous operations in progress such as a session commit() call.
     </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>This feature affects only transacted sessions.</p><p>
-            Qpid JMS client sends 'mandatory' messages when using Queue destinations
+            The Apache Qpid JMS client for AMQP 0-9-1/0-10 sends 'mandatory' messages when using Queue destinations
             and 'non-mandatory' messages when using Topic destinations.
         </p></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Runtime-Close-Connection-When-No-Route-Configuration"></a>9.5.2.&#160;Configuring <span class="emphasis"><em>closeWhenNoRoute</em></span></h3></div></div></div><p>
         The Broker attribute <span class="emphasis"><em>closeWhenNoRoute</em></span> can be set to specify this feature on broker side.
@@ -139,7 +139,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
     </p><p>
         Setting the <span class="emphasis"><em>closeWhenNoRoute</em></span> in the JMS client connection URL can override the broker configuration
         on a connection specific basis, for example :
-    </p><div class="example"><a id="d0e5648"></a><p class="title"><strong>Example&#160;9.1.&#160;Disable feature to close connection on unroutable messages with client URL</strong></p><div class="example-contents"><pre class="screen">
+    </p><div class="example"><a id="d0e5794"></a><p class="title"><strong>Example&#160;9.1.&#160;Disable feature to close connection on unroutable messages with client URL</strong></p><div class="example-contents"><pre class="screen">
 amqp://guest:guest@clientid/?brokerlist='tcp://localhost:5672'&amp;closeWhenNoRoute='false'</pre></div></div><br class="example-break" /><p>
        If no value is specified on the client the broker setting will be used. If client setting is specified then it will take precedence
        over the broker-wide configuration. If the client specifies and broker does not support this feature the warning will be logged.

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Connection-Limit.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
index 09d1e45..c3b34f6 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Connection-Limit.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Connection-Limit.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>9.9.&#160;Connection Limits</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>9.9.&#160;Connection Limits</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">9.9.&#160;Connection Limits</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime-Message-Compression.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;9.&#160;Runtime</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Runtime-Memory.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-Runtime-Connection-Limit"></a>9.9.&#160;Connection Limits</h2></div></div></div><p>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
index acd1f17..31f9a5c 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Disk-Space-Management.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,14 +111,14 @@ 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>9.2.&#160;Disk Space Management</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>9.2.&#160;Disk Space Management</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">9.2.&#160;Disk Space Management</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;9.&#160;Runtime</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Runtime-Producer-Transaction-Timeout.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-Runtime-Disk-Space-Management"></a>9.2.&#160;Disk Space Management</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Qpid-Producer-Flow-Control"></a>9.2.1.&#160;Producer Flow Control</h3></div></div></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-
 Control-GeneralInformation"></a>9.2.1.1.&#160;General Information</h4></div></div></div><p>
-            The Java Broker supports a flow control mechanism to which can be used to prevent either a single queue
+            The Apache Qpid Broker for Java supports a flow control mechanism to which can be used to prevent either a single queue
             or a virtualhost exceeding configured limits.  These two mechanisms are described
             next.
-        </p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control-ServerConfiguration"></a>9.2.1.2.&#160;Server Configuration</h4></div></div></div><div class="section"><div class="titlepage"><div><div><h5 class="title"><a id="d0e5343"></a>Configuring a Queue to use flow control</h5></div></div></div><p>
+        </p></div><div class="section"><div class="titlepage"><div><div><h4 class="title"><a id="Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control-ServerConfiguration"></a>9.2.1.2.&#160;Server Configuration</h4></div></div></div><div class="section"><div class="titlepage"><div><div><h5 class="title"><a id="d0e5489"></a>Configuring a Queue to use flow control</h5></div></div></div><p>
                 Flow control is enabled on a producer when it sends a message to a Queue
                 which is "overfull". The producer flow control will be rescinded when all
                 Queues on which a producer is blocking become "underfull". A Queue is defined
@@ -128,7 +128,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
             </p><p>
                 The capacity and resume capacity can be specified when the queue is created.  This
                 can be done using the Flow Control Settings within the Queue creation dialogue.
-            </p><div class="section"><div class="titlepage"><div><div><h6 class="title"><a id="d0e5356"></a>Broker Log Messages</h6></div></div></div><p>
+            </p><div class="section"><div class="titlepage"><div><div><h6 class="title"><a id="d0e5502"></a>Broker Log Messages</h6></div></div></div><p>
                     There are four Broker log messages that may occur if flow control through queue capacity limits is enabled.
                     Firstly, when a capacity limited queue becomes overfull, a log message similar to the following is produced
                 </p><pre class="programlisting">
@@ -139,7 +139,7 @@ MESSAGE [con:2(guest@anonymous(713889609)/test)/ch:1] [con:2(guest@anonymous(713
 MESSAGE [vh(/test)/qu(MyQueue)] [vh(/test)/qu(MyQueue)] QUE-1004 : Underfull : Size : 600 bytes, Resume Capacity : 800
                 </pre><p>And for every channel which becomes unblocked you will see a message similar to: </p><pre class="programlisting">
 MESSAGE [con:2(guest@anonymous(713889609)/test)/ch:1] [con:2(guest@anonymous(713889609)/test)/ch:1] CHN-1006 : Flow Control Removed
-                </pre><p>Obviously the details of connection, virtual host, queue, size, capacity, etc would depend on the configuration in use.</p></div></div><div class="section"><div class="titlepage"><div><div><h5 class="title"><a id="d0e5379"></a>Disk quota-based flow control</h5></div></div></div><p>
+                </pre><p>Obviously the details of connection, virtual host, queue, size, capacity, etc would depend on the configuration in use.</p></div></div><div class="section"><div class="titlepage"><div><div><h5 class="title"><a id="d0e5525"></a>Disk quota-based flow control</h5></div></div></div><p>
                 Flow control can also be triggered when a configured disk quota is exceeded. This is supported by the BDB and
                 Derby virtualhosts.
             </p><p>
@@ -166,7 +166,7 @@ MESSAGE [con:2(guest@anonymous(713889609)/test)/ch:1] [con:2(guest@anonymous(713
                 The Broker will also impose flow control if the filesystem hosting a virtualhost
                 exceeds a <a class="link" href="Java-Broker-Management-Managing-Broker.html#Java-Broker-Management-Managing-Broker-Context-StoreFilesystemMaxUsagePercent">
                     configured percentage.</a>.
-            </p><div class="section"><div class="titlepage"><div><div><h6 class="title"><a id="d0e5401"></a>Broker Log Messages for quota flow control</h6></div></div></div><p>
+            </p><div class="section"><div class="titlepage"><div><div><h6 class="title"><a id="d0e5547"></a>Broker Log Messages for quota flow control</h6></div></div></div><p>
                     There are two broker log messages that may occur if flow control through disk quota limits is enabled.
                     When the virtual host is blocked due to exceeding of the disk quota limit the following message
                     appears in the broker log

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
index 8ef26b8..aab1c12 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Flow-To-Disk.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>9.6.&#160;Flow to Disk</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>9.6.&#160;Flow to Disk</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">9.6.&#160;Flow to Disk</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime-Close-Connection-When-No-Route.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;9.&#160;Runtime</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Runtime-Background-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-Runtime-Flow-To-Disk"></a>9.6.&#160;Flow to Disk</h2></div></div></div><p>Flow to disk limits the amount of <a class="link" href="Java-Broker-Runtime-Memory.html" title="9.10.&#160;Memory">direct and heap memory</a>

http://git-wip-us.apache.org/repos/asf/qpid-site/blob/18ab1b17/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
----------------------------------------------------------------------
diff --git a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
index d3906cc..a92e134 100644
--- a/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.html
+++ b/content/releases/qpid-java-trunk/java-broker/book/Java-Broker-Runtime-Handling-Undeliverable-Messages.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>9.4.&#160;Handing Undeliverable Messages</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>9.4.&#160;Handing Undeliverable Messages</li></ul>
 
         <div id="-middle-content">
           <div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">9.4.&#160;Handing Undeliverable Messages</th></tr><tr><td align="left" width="20%"><a accesskey="p" href="Java-Broker-Runtime-Producer-Transaction-Timeout.html">Prev</a>&#160;</td><th align="center" width="60%">Chapter&#160;9.&#160;Runtime</th><td align="right" width="20%">&#160;<a accesskey="n" href="Java-Broker-Runtime-Close-Connection-When-No-Route.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-Runtime-Handling-Undeliverable-Messages"></a>9.4.&#160;Handing Undeliverable Messages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Runtime-Handling-Undeliverable-Messages-Introduction"></a>9.4.1.&#160;Introduction</h3></div></div></div><p> Messages that cannot be delivered successfu
 lly to a consumer (for instance, because the


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