qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1724964 [8/19] - in /qpid/site/input/releases/qpid-java-trunk: java-broker/ java-broker/book/ java-broker/book/css/ java-broker/book/images/ jms-client-0-8/ jms-client-0-8/book/ jms-client-0-8/book/images/
Date Sat, 16 Jan 2016 12:17:04 GMT
Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Ports.html.in Sat Jan 16 12:17:02 2016
@@ -1,19 +1,33 @@
-<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"><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
-        protocol. This can be an AMQP protocol for messaging or HTTP/JMX for management.</p><p>A port is defined to have one or more transports. A transport can either be plain (TCP) or
-        SSL. When SSL is in use, the port can be configured to accept or require client
-        authentication.</p><p>Any number of ports defined to use AMQP or HTTP protocols can be defined. JMX is limited
-        to a single port instance per JMX protocol type.</p><p>Ports 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-Ports-Attributes"></a>7.10.1.&#160;Attributes</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" 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
+<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
+        protocol. This can be an AMQP protocol for messaging or HTTP for management.</p><p>A port is defined to have one or more transports. A transport can either be plain (TCP) or
+        SSL (TLS). When SSL is in use, the port can be configured to accept or require client
+        authentication.</p><p>Any number of ports defined to use AMQP or HTTP protocols can be defined.</p><p>Ports 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-Ports-Context"></a>7.10.1.&#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>qpid.port.max_open_connections</em></span>. The default maximum number
+                       of concurrent connections supported by an AMQP port.</p></li><li class="listitem"><p><span class="emphasis"><em>qpid.port.amqp.acceptBacklog</em></span>. The backlog is the maximum
+                        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>
+        </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
                         the port. For messaging choose one or more AMQP protocols. For management
-                        choose HTTP or on one the two JMX protocols.</p></li><li class="listitem"><p><span class="emphasis"><em>Transports</em></span>. A list of transports supported by the
-                        port. For messaging or HTTP management chose TCP, SSL or both. For JMX, the
-                        TCP/SSL combination is not supported.</p></li><li class="listitem"><p><span class="emphasis"><em>Keystore</em></span>. <a class="link" href="Java-Broker-Management-Managing-Keystores.html" title="7.12.&#160;Keystores">Keystore</a>
-                        containing the Broker's private key. Required if the SSL is in use.</p></li><li class="listitem"><p><span class="emphasis"><em>Want/Need Client Auth</em></span>. Client authentication can be
+                        choose HTTP.</p></li><li class="listitem"><p><span class="emphasis"><em>Transports</em></span>. A list of transports supported by the
+                        port. For messaging or HTTP management chose TCP, SSL or both.</p></li><li class="listitem"><p><span class="emphasis"><em>Enabled/Disabled Cipher Suites</em></span>. Allows cipher
+                        suites supported by the JVM to be enabled or disabled.  The cipher
+                        suite names are those understood by the JVM.
+                    </p><p>SSLv3 is disabled by default.</p></li><li class="listitem"><p><span class="emphasis"><em>Keystore</em></span>. <a class="link" href="Java-Broker-Management-Managing-Keystores.html" title="7.12.&#160;Keystores">Keystore</a>
+                        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
-                            Provider</a>.</p><p>JMX does not support client authentication.</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>
+                            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></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.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-Ports-Lifecycle"></a>7.10.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>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><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="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;7.11.&#160;Authentication Providers</td></tr></table></div></div>
\ No newline at end of file
+                        if peers only is desired.</p></li><li class="listitem"><p><span class="emphasis"><em>Maximum Open Connections</em></span>. AMQP ports only.  Limits
+                     the number of connections that may be open at any one time.</p></li><li class="listitem"><p><span class="emphasis"><em>Thread pool size</em></span>. AMQP ports only.  Number of worker threads
+                    used to process AMQP connections during connection negotiation phase.</p><p>Defaults to 8.</p></li><li class="listitem"><p><span class="emphasis"><em>Number of selectors</em></span>. AMQP ports only.  Number of worker threads
+                    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>
+                            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>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Queues.html.in Sat Jan 16 12:17:02 2016
@@ -1,8 +1,8 @@
-<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"><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
-    hold/buffer messages for later delivery to consumer applications.</p><p>Queues can be managed using the HTTP, JMX or AMQP channels.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queues-Types"></a>7.8.1.&#160;Types</h3></div></div></div><p>The Broker supports four different queue types, each with different delivery semantics.</p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Standard" title="4.7.1.1.&#160;Standard">Standard</a> - a simple First-In-First-Out (FIFO) queue</p></li><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Priority" title="4.7.1.2.&#160;Priority">Priority</a> - delivery order depends on the priority of each message</p></li><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Jav
 a-Broker-Concepts-Queues-Types-Sorted" title="4.7.1.3.&#160;Sorted Queues">Sorted</a> -
+<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
+    hold/buffer messages for later delivery to consumer applications.</p><p>Queues can be managed using the HTTP or AMQP channels.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queues-Types"></a>7.8.1.&#160;Types</h3></div></div></div><p>The Broker supports four different queue types, each with different delivery semantics.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Standard" title="4.7.1.1.&#160;Standard">Standard</a> - a simple First-In-First-Out (FIFO) queue</p></li><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Priority" title="4.7.1.2.&#160;Priority">Priority</a> - delivery order depends on the priority of each message</p></li><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-
 Queues.html#Java-Broker-Concepts-Queues-Types-Sorted" title="4.7.1.3.&#160;Sorted Queues">Sorted</a> -
             delivery order depends on the value of the sorting key property in each message</p></li><li class="listitem"><p><a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-LVQ" title="4.7.1.4.&#160;Last Value Queues (LVQ)">Last Value
               Queue</a> - also known as an LVQ, retains only the last (newest) message received
-            with a given LVQ key value</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queues-Attributes"></a>7.8.2.&#160;Attributes</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Name of the queue</em></span>. Message consumers and browsers refer to this
+            with a given LVQ key value</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queues-Attributes"></a>7.8.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 of the queue</em></span>. Message consumers and browsers refer to this
             name when they wish to subscribe to queue to receive messages from it.</p></li><li class="listitem"><p><span class="emphasis"><em>Type of the queue</em></span>. Can be either <a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Standard" title="4.7.1.1.&#160;Standard">standard</a>, <a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Priority" title="4.7.1.2.&#160;Priority">priority</a>, <a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-Sorted" title="4.7.1.3.&#160;Sorted Queues">sorted</a>, or <a class="link" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Types-LVQ" title="4.7.1.4.&#160;Last Value Queues (LVQ)">lvq</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Durable</em></span>. Whether the queue survives a restart. Messages on a
             non durable queue do not survive a restart even if they are marked persistent.</p></li><li class="listitem"><p><span class="emphasis"><em>Maximum/Minimum TTL</em></span>. Defines a maximum and minimum
             time-to-live. Messages arriving with ttl larger than the maximum will be overridden by
@@ -15,5 +15,5 @@
             described in detail <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html" title="9.2.&#160;Disk Space Management">Section&#160;9.2, &#8220;Disk Space Management&#8221;</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Alerting Thresholds</em></span>. Queues have the ability to alert on a
             variety of conditions: total queue depth exceeded a number or size, message age exceeded
             a threshold, message size exceeded a threshold. These thresholds are soft. See <a class="xref" href="Java-Broker-Appendix-Queue-Alerts.html" title="Appendix&#160;D.&#160;Queue Alerts">Appendix&#160;D, <em>Queue Alerts</em></a></p></li><li class="listitem"><p><span class="emphasis"><em>Maximum Delivery Count/Alternate Exchange</em></span>. See <a class="xref" href="Java-Broker-Runtime-Handling-Undeliverable-Messages.html" title="9.4.&#160;Handing Undeliverable Messages">Section&#160;9.4, &#8220;Handing Undeliverable Messages&#8221;</a></p></li><li class="listitem"><p><span class="emphasis"><em>Message Groups</em></span>. See <a class="xref" href="Java-Broker-Concepts-Queues.html#Java-Broker-Concepts-Queues-Message-Grouping" title="4.7.3.&#160;Messaging Grouping">Section&#160;4.7.3, &#8220;Messaging Grouping&#8221;</a></p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queue-Children"></a>
 7.8.3.&#160;Children</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>Binding</p></li></ul></div><p>
-    </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queue-Lifecycle"></a>7.8.4.&#160;Lifecycle</h3></div></div></div><p>Not supported</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-Management-Managing-Exchanges.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-Consumers.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.7.&#160;Exchanges&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;7.9.&#160;Consumers</td></tr></table></div></div>
\ No newline at end of file
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Binding</p></li></ul></div><p>
+    </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Queue-Lifecycle"></a>7.8.4.&#160;Lifecycle</h3></div></div></div><p>Not supported</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-Management-Managing-Exchanges.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-Consumers.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.7.&#160;Exchanges&#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.9.&#160;Consumers</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-RemoteReplicationNodes.html.in Sat Jan 16 12:17:02 2016
@@ -1,9 +1,9 @@
-<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"><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
+<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
     in the group. Remote replication nodes are not created directly. Instead the system
     automatically creates a remote replication node for every node in the group. It serves to
-    provide a view of the whole group from every node in the system.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-RemoteReplicationNodes-Attributes"></a>7.6.1.&#160;Attributes</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Name the remote replication node</em></span>. This is the name of the
+    provide a view of the whole group from every node in the system.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-RemoteReplicationNodes-Attributes"></a>7.6.1.&#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 remote replication node</em></span>. This is the name of the
             remote virtualhost node</p></li><li class="listitem"><p><span class="emphasis"><em>Role</em></span>. Indicates the role that the remote node is playing in the
-            group at this moment. </p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p><span class="emphasis"><em>MASTER</em></span> - Remote node is a master.</p></li><li class="listitem"><p><span class="emphasis"><em>REPLICA</em></span> - Remote node is a replica.</p></li><li class="listitem"><p><span class="emphasis"><em>UNREACHABLE</em></span> - Remote node unreachable from this node.
+            group at this moment. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p><span class="emphasis"><em>MASTER</em></span> - Remote node is a master.</p></li><li class="listitem"><p><span class="emphasis"><em>REPLICA</em></span> - Remote node is a replica.</p></li><li class="listitem"><p><span class="emphasis"><em>UNREACHABLE</em></span> - Remote node unreachable from this node.
                   This remote note may be down, or an network problem may prevent it from being
                   contacted.</p></li></ul></div><p>
           </p></li><li class="listitem"><p><span class="emphasis"><em>Join time</em></span>. Time when first contact was established with this
@@ -11,14 +11,14 @@
             processed by node. This is an internal transaction counter and does not relate to any
             value available to the messaging clients. This value can only be used to determine the
             node is up to date relative to others in the group.</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-RemoteReplicationNodes-Children"></a>7.6.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-RemoteReplicationNodes-Lifecycle"></a>7.6.3.&#160;Lifecycle</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Delete</em></span>. Causes the remote node to be permanently removed from
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Delete</em></span>. Causes the remote node to be permanently removed from
             the group. This operation should be used when the virtualhost node cannot be deleted
             from its own Broker, for instance, if a Broker has been destroyed by machine
             failure.</p></li></ul></div><p>
     </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-RemoteReplication-Nodes-Operations"></a>7.6.4.&#160;Operations</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Transfer Master</em></span>. Initiates a process where a master is moved to
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Transfer Master</em></span>. Initiates a process where a master is moved to
             anther node in the group. The transfer sequence is as follows. </p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p>Group waits until the proposed master is reasonable up to date.</p></li><li class="listitem"><p>Any in-flight transactions on the current master are blocked.</p></li><li class="listitem"><p>The current master awaits the proposed master to become up to date.</p></li><li class="listitem"><p>The mastership is transferred. This will automatically disconnect messaging
                   clients from the old master, and in-flight transactions are rolled back. Messaging
                   clients reconnect to the new master.</p></li><li class="listitem"><p>The old master will rejoin as a replica.</p></li></ol></div><p>
           </p></li></ul></div><p>
-    </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-Management-Managing-Virtualhosts.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-Exchanges.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.5.&#160;VirtualHosts&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;7.7.&#160;Exchanges</td></tr></table></div></div>
\ No newline at end of file
+    </p></div></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Management-Managing-Virtualhosts.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-Exchanges.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.5.&#160;VirtualHosts&#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.7.&#160;Exchanges</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Truststores.html.in Sat Jan 16 12:17:02 2016
@@ -1,12 +1,24 @@
-<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"><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
+<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-Attributes"></a>7.13.1.&#160;Attributes</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Name the truststore</em></span>. Used to identify the
-                        truststore.</p></li><li class="listitem"><p><span class="emphasis"><em>Path</em></span>. Path to truststore file</p></li><li class="listitem"><p><span class="emphasis"><em>Truststore password</em></span>. Password used to secure the truststore</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
+        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>
+        </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>
+        </p><p>The following attributes apply to <span class="emphasis"><em>File Trust 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>Path</em></span>. Path to truststore file</p></li><li class="listitem"><p><span class="emphasis"><em>Truststore password</em></span>. Password used to secure the truststore</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. </p></div></li><li class="listitem"><p><span class="emphasis"><em>Certificate Alias</em></span>. An optional way of specifying
                         which certificate the broker should use if the keystore contains multiple
                         entries.</p></li><li class="listitem"><p><span class="emphasis"><em>Manager Factory Algorithm</em></span>. In keystores the have more
                         than one certificate, the alias identifies the certificate to be
                         used.</p></li><li class="listitem"><p><span class="emphasis"><em>Key Store Type</em></span>. Type of Keystore.</p></li><li class="listitem"><p><span class="emphasis"><em>Peers only</em></span>. When "Peers Only" option is selected for
-                        the Truststore it will allow authenticate only those clients that present a certificate
-                        exactly matching a certificate contained within the Truststore database.</p></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Truststores-Children"></a>7.13.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-Truststores-Lifecycle"></a>7.13.3.&#160;Lifecycle</h3></div></div></div><p>Not supported</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-Management-Managing-Keystores.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-Group-Providers.html">Next</a></td></tr><tr><td align="left
 " valign="top" width="40%">7.12.&#160;Keystores&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;7.14.&#160;Group Providers</td></tr></table></div></div>
\ No newline at end of file
+                        the Truststore it will allow authenticate only those clients that present a
+                        certificate exactly matching a certificate contained within the Truststore
+                        database.</p></li></ul></div><p>
+        </p><p>The following attributes apply to <span class="emphasis"><em>Non Java Trust 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>Certificates</em></span>. The cerificate(s) in DER or PEM
+                        format.</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-Children"></a>7.13.3.&#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-Truststores-Lifecycle"></a>7.13.4.&#160;Lifecycle</h3></div></div></div><p>Not supported</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-Management-Managing-Keystores.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-Group-Providers.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">7.12.&#160;Keystores&#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.14.&#160;Group Providers</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhost-Nodes.html.in Sat Jan 16 12:17:02 2016
@@ -1,10 +1,10 @@
-<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"><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 virtualhost nodes types are suppo
 rted. </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>BDB - Node backed with Oracle BDB <a class="footnote" href="#ftn.idm140601085060416" id="idm140601085060416"><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.idm140601085057456" id="idm140601085057456"><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 virtualhost n
 odes 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>
     </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" 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
+      </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
             configuration of the virtualhost.</p></li><li class="listitem"><p><span class="emphasis"><em>Role</em></span> (HA only). The role that this node is currently playing in
-            the group. </p><div class="itemizedlist"><ul class="itemizedlist" type="circle"><li class="listitem"><p>MASTER - Virtualhost node is a master.</p></li><li class="listitem"><p>REPLICA - Virtualhost node is a replica.</p></li><li class="listitem"><p>WAITING - Virtualhost node is awaiting an election result, or may be awaiting
+            the group. </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p>MASTER - Virtualhost node is a master.</p></li><li class="listitem"><p>REPLICA - Virtualhost node is a replica.</p></li><li class="listitem"><p>WAITING - Virtualhost node is awaiting an election result, or may be awaiting
                   more nodes to join in order that an election may be held.</p></li><li class="listitem"><p>DETACHED - Virtualhost node is disconnected from the group.</p></li></ul></div></li><li class="listitem"><p><span class="emphasis"><em>Priority</em></span> (HA only). The priority of this node when elections
             occurs. The attribute can be used to make it more likely for a node to be elected than
             other nodes, or disallow the node from never being elected at all. See <a class="xref" href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-NodePriority" title="10.4.3.&#160;Node Priority">Section&#160;10.4.3, &#8220;Node Priority&#8221;</a></p></li><li class="listitem"><p><span class="emphasis"><em>Minimum Number Of Nodes</em></span> (HA only - groups of three or more).
@@ -12,14 +12,14 @@
             service can be restore when less than quorum nodes are present. See <a class="xref" href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes" title="10.4.4.&#160;Required Minimum Number Of Nodes">Section&#160;10.4.4, &#8220;Required Minimum Number Of Nodes&#8221;</a></p></li><li class="listitem"><p><span class="emphasis"><em>Designated Primary</em></span> (HA only - groups of two). Allows a single
             node in a two node group to operate solo. See <a class="xref" href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-DesignatedPrimary" title="10.4.5.&#160;Designated Primary">Section&#160;10.4.5, &#8220;Designated Primary&#8221;</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-Node-Children"></a>7.4.3.&#160;Children</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
             <a class="link" href="Java-Broker-Management-Managing-Virtualhosts.html" title="7.5.&#160;VirtualHosts">Virtualhost</a>
           </p></li><li class="listitem"><p>
             <a class="link" href="Java-Broker-Management-Managing-RemoteReplicationNodes.html" title="7.6.&#160;Remote Replication Nodes">Remote
               Replication Nodes</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-Node-Lifecycle"></a>7.4.4.&#160;Lifecycle</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Stop</em></span>. Stops the virtualhost node. This closes any existing
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Stop</em></span>. Stops the virtualhost node. This closes any existing
             messaging connections to the virtualhost and prevents new ones. Any inflight
             transactions are rolled back. Non durable queues and exchanges are lost. Transient
             messages or persistent messages on non-durable queues are lost.</p><p>When HA is in use, stopping the virtualhost node stops the virtualhost node from
@@ -31,4 +31,4 @@
             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 align="left" width="100" /><div class="footnote" id="ftn.idm140601085060416"><p><a class="para" href="#idm140601085060416"><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.idm140601085057456"><p><a class="para" href="#idm140601085057456"><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-Br
 oker.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="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;7.5.&#160;VirtualHosts</td></tr></table></div></div>
\ No newline at end of file
+    </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>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Management-Managing-Virtualhosts.html.in Sat Jan 16 12:17:02 2016
@@ -1,25 +1,28 @@
-<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"><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" type="disc"><li class="listitem"><p>BDB - Virtualhost backed with Oracle BDB <a class="footnote" href="#ftn.idm140601085078976" id="idm140601085078976"><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.idm140601085075104" id="idm140601085075104"><sup class="footnote">[9]</sup></a></p></li><li class="listitem"><
 p>Memory - In-memory node (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.idm140601084596096" id="idm140601084596096"><sup class="footnote">[10]</sup></a>.</p></li></ul></div><p>
+<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>
     </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" 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>
+      </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>
     </p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Management-Managing-Virtualhost-Attributes"></a>7.5.3.&#160;Attributes</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Name the virtualhost</em></span>. This is the name the messaging clients
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Name the virtualhost</em></span>. This is the name the messaging clients
             refer to when forming a connection to the Broker.</p></li><li class="listitem"><p><span class="emphasis"><em>Store Path/JDBC URL</em></span>. Refers the file system location or
             database URL used to store the message data.</p></li><li class="listitem"><p><span class="emphasis"><em>Store overflow/underflow</em></span>. Some virtualhosts have the ability to
             limit the of the cumulative size of all the messages contained within the store. This
-            feature is described in detail <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html" title="9.2.&#160;Disk Space Management">Section&#160;9.2, &#8220;Disk Space Management&#8221;</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Store transaction timeouts</em></span>. Warns of long running producer
+            feature is described in detail <a class="xref" href="Java-Broker-Runtime-Disk-Space-Management.html" title="9.2.&#160;Disk Space Management">Section&#160;9.2, &#8220;Disk Space Management&#8221;</a>.</p></li><li class="listitem"><p><span class="emphasis"><em>Connection thread pool size</em></span>. Number of worker threads
+            used to perform messaging with connected clients.  </p><p>Defaults to 64 or double the maximum number of available processors, whichever
+            is the larger.</p></li><li class="listitem"><p><span class="emphasis"><em>Number of selectors</em></span>. Number of worker threads
+            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><li class="listitem"><p><span class="emphasis"><em>Store transaction timeouts</em></span>. Warns of long running producer
             transactions. See <a class="xref" href="Java-Broker-Runtime-Producer-Transaction-Timeout.html" title="9.3.&#160;Producer Transaction Timeout">Section&#160;9.3, &#8220;Producer Transaction Timeout&#8221;</a></p></li><li class="listitem"><p><span class="emphasis"><em>Synchronization policy</em></span>. HA only. See <a class="xref" href="Java-Broker-High-Availability-Behaviour.html#Java-Broker-High-Availability-Behaviour-SynchronizationPolicy" title="10.4.2.&#160;Synchronization Policy">Section&#160;10.4.2, &#8220;Synchronization Policy&#8221;</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-Children"></a>7.5.4.&#160;Children</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p>
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
             <a class="link" href="Java-Broker-Management-Managing-Exchanges.html" title="7.7.&#160;Exchanges">Exchange</a>
           </p></li><li class="listitem"><p>
             <a class="link" href="Java-Broker-Management-Managing-Queues.html" title="7.8.&#160;Queues">Queue</a>
-          </p></li><li class="listitem"><p>Connection</p></li></ul></div><p>
+          </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-Lifecycle"></a>7.5.5.&#160;Lifecycle</h3></div></div></div><p>
-      </p><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem"><p><span class="emphasis"><em>Stop</em></span>. Stops the virtualhost. This closes any existing messaging
+      </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><span class="emphasis"><em>Stop</em></span>. Stops the virtualhost. This closes any existing messaging
             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 align="left" width="100" /><div class="footnote" id="ftn.idm140601085078976"><p><a class="para" href="#idm140601085078976"><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.idm140601085075104"><p><a class="para" href="#idm140601085075104"><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.idm140601084596096"><p><a class="para" href="#idm140601084596096"><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="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;7.6.&#160;Remote Replication Nodes</td></tr></table></div></div>
\ No newline at end of file
+    </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>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html.in Sat Jan 16 12:17:02 2016
@@ -1,5 +1,5 @@
-<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"><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
+<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
       Database's JDBC 4.0 compatible drivers available on the Broker's classpath. To do this copy
-      the driver's JAR file into the <code class="literal">${QPID_HOME}/lib/opt</code> folder.</p><pre class="programlisting">Unix:
-cp <code class="literal">driver</code>.jar qpid-broker-0.32-SNAPSHOT/lib/opt</pre><pre class="programlisting">Windows:
-copy <code class="literal">driver</code>.jar qpid-broker-0.32-SNAPSHOT\lib\opt</pre></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Miscellaneous.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Miscellaneous.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Appendix&#160;E.&#160;Miscellaneous&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;E.3.&#160;Installing Oracle BDB JE</td></tr></table></div></div>
\ No newline at end of file
+      the driver's JAR file into the <code class="literal">${QPID_HOME}/lib</code> folder.</p><pre class="programlisting">Unix:
+cp <code class="literal">driver</code>.jar qpid-broker-6.1.0-SNAPSHOT/lib</pre><pre class="programlisting">Windows:
+copy <code class="literal">driver</code>.jar qpid-broker-6.1.0-SNAPSHOT\lib</pre></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Miscellaneous.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Miscellaneous.html">Up</a></td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Appendix&#160;E.&#160;Miscellaneous&#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;E.3.&#160;Installing Oracle BDB JE</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE.html.in Sat Jan 16 12:17:02 2016
@@ -1,7 +1,7 @@
-<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"><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
-      must make the BDB JE's JAR available on the Broker's classpath. </p><p> Download the Oracle BDB JE 5.0.104 release <a class="ulink" href="http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html?ssSourceSiteId=ocomen" target="_top">from the Oracle website.</a>
+<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
+      must make the BDB JE's JAR available on the Broker's classpath. </p><p> Download the Oracle BDB JE 5.0.104 release <a class="link" href="http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html?ssSourceSiteId=ocomen" target="_top">from the Oracle website.</a>
     </p><p> The download has a name in the form je-5.0.104.tar.gz. It is
       recommended that you confirm the integrity of the download by verifying the MD5. </p><p>Copy the je-5.0.104.jar from within the release into
-        <code class="literal">${QPID_HOME}/lib/opt</code> folder.</p><pre class="programlisting">Unix:
-cp je-5.0.104.jar qpid-broker-0.32-SNAPSHOT/lib/opt</pre><pre class="programlisting">Windows:
-copy je-5.0.104.jar qpid-broker-0.32-SNAPSHOT\lib\opt</pre></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Miscellaneous.html">Up</a></td><td align="right" width="40%">&#160;</td></tr><tr><td align="left" valign="top" width="40%">E.2.&#160;Installing External JDBC Driver&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;</td></tr></table></div></div>
\ No newline at end of file
+        <code class="literal">${QPID_HOME}/lib</code> folder.</p><pre class="programlisting">Unix:
+cp je-5.0.104.jar qpid-broker-6.1.0-SNAPSHOT/lib</pre><pre class="programlisting">Windows:
+copy je-5.0.104.jar qpid-broker-6.1.0-SNAPSHOT\lib</pre></div><div class="navfooter"><hr /><table summary="Navigation footer" width="100%"><tr><td align="left" width="40%"><a accesskey="p" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">Prev</a>&#160;</td><td align="center" width="20%"><a accesskey="u" href="Java-Broker-Miscellaneous.html">Up</a></td><td align="right" width="40%">&#160;</td></tr><tr><td align="left" valign="top" width="40%">E.2.&#160;Installing External JDBC Driver&#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;</td></tr></table></div></div>
\ No newline at end of file

Modified: qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html.in?rev=1724964&r1=1724963&r2=1724964&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html.in (original)
+++ qpid/site/input/releases/qpid-java-trunk/java-broker/book/Java-Broker-Miscellaneous.html.in Sat Jan 16 12:17:02 2016
@@ -1,9 +1,9 @@
-<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-Miscellaneous-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"><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 variable is set correctly by typing
  the
-        following at the command prompt: </p><pre class="programlisting">echo %JAVA_HOME%</pre><p> If JAVA_HOME is set you will see something similar to the following: </p><pre class="screen">c:"\PROGRA~1"\Java\jdk1.7.0_60\
-      </pre><p> Then confirm that a Java installation (1.7 or higher) is available: </p><pre class="programlisting">java -version</pre><p> If java is available on the path, output similar to the following will be seen: </p><pre class="screen">java version "1.7.0_60"
-Java(TM) SE Runtime Environment (build 1.7.0_60-b19)
-Java HotSpot(TM) 64-Bit Server VM (build 24.60-b09, mixed mode)</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Miscellaneous-JVM-Verification-Unix"></a>E.1.2.&#160;Verify JVM on Unix</h3></div></div></div><p> Firstly confirm that the JAVA_HOME environment variable is set correctly by typing the
-        following at the command prompt: </p><pre class="programlisting">echo $JAVA_HOME</pre><p> If JAVA_HOME is set you will see something similar to the following: </p><pre class="screen">/usr/java/jdk1.7.0_60
-      </pre><p> Then confirm that a Java installation (1.7 or higher) is available: </p><pre class="programlisting">java -version</pre><p> If java is available on the path, output similar to the following will be seen: </p><pre class="screen">java version "1.7.0_60"
-Java(TM) SE Runtime Environment (build 1.7.0_60-b19)
-Java HotSpot(TM) 64-Bit Server VM (build 24.60-b09, mixed mode)</pre></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-Appendix-Queue-Alerts.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Appendix&#160;D.&#160;Queue Alerts&#160;</td><td align="center" width="20%"><a accesskey="h" href="index.html">Home</a></td><td align="right" valign="top" width="40%">&#160;E.2.&#160;Installing External JDBC Driver</td></tr></table></div></div>
\ No newline at end of file
+<div class="docbook"><div class="navheader"><table summary="Navigation header" width="100%"><tr><th align="center" colspan="3">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-Miscellaneous-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 variable is set
  correctly by typing the
+        following at the command prompt: </p><pre class="programlisting">echo %JAVA_HOME%</pre><p> If JAVA_HOME is set you will see something similar to the following: </p><pre class="screen">c:"\PROGRA~1"\Java\jdk1.7.0_79\
+      </pre><p> Then confirm that a Java installation (1.7 or higher) is available: </p><pre class="programlisting">java -version</pre><p> If java is available on the path, output similar to the following will be seen: </p><pre class="screen">java version "1.7.0_79"
+Java(TM) SE Runtime Environment (build 1.7.0_79-b15)
+Java HotSpot(TM) 64-Bit Server VM (build 24.79-b02, mixed mode)</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="Java-Broker-Miscellaneous-JVM-Verification-Unix"></a>E.1.2.&#160;Verify JVM on Unix</h3></div></div></div><p> Firstly confirm that the JAVA_HOME environment variable is set correctly by typing the
+        following at the command prompt: </p><pre class="programlisting">echo $JAVA_HOME</pre><p> If JAVA_HOME is set you will see something similar to the following: </p><pre class="screen">/usr/java/jdk1.7.0_80
+      </pre><p> Then confirm that a Java installation (1.7 or higher) is available: </p><pre class="programlisting">java -version</pre><p> If java is available on the path, output similar to the following will be seen: </p><pre class="screen">java version "1.7.0_80"
+Java(TM) SE Runtime Environment (build 1.7.0_80-b15)
+Java HotSpot(TM) 64-Bit Server VM (build 24.80-b11, mixed mode)</pre></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-Appendix-Queue-Alerts.html">Prev</a>&#160;</td><td align="center" width="20%">&#160;</td><td align="right" width="40%">&#160;<a accesskey="n" href="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver.html">Next</a></td></tr><tr><td align="left" valign="top" width="40%">Appendix&#160;D.&#160;Queue Alerts&#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;E.2.&#160;Installing External JDBC Driver</td></tr></table></div></div>
\ No newline at end of file



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


Mime
View raw message