Modified: qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,28 +20,21 @@ --> -<!DOCTYPE entities [ -<!ENTITY % entities SYSTEM "../commonEntities.xml"> -%entities; -]> -<section id="Java-Broker-Concepts-Queues"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Concepts-Queues"> <title>Queues</title> <para><emphasis>Queue</emphasis>s are named entities within a <link linkend="Java-Broker-Concepts-Virtualhosts">Virtualhost</link> that - hold/buffer messages for later delivery to consumer applications. An <link - linkend="Java-Broker-Concepts-Exchanges">Exchange</link> for passing messages to a queue. + hold/buffer messages for later delivery to consumer applications. An <link linkend="Java-Broker-Concepts-Exchanges">Exchange</link> for passing messages to a queue. Consumers subscribe to a queue in order to receive messages for it. </para> <para>The Broker supports different queue types, each with different delivery semantics. Queues also have the ability to group messages together for delivery to a single consumer.</para> - <section id="Java-Broker-Concepts-Queues-Types"> + <section xml:id="Java-Broker-Concepts-Queues-Types"> <title>Types</title> <para>The Broker supports four different queue types, each with different delivery semantics.<itemizedlist> <listitem> - <para><link linkend="Java-Broker-Concepts-Queues-Types-Standard" - >Standard</link> - a simple First-In-First-Out (FIFO) queue</para> + <para><link linkend="Java-Broker-Concepts-Queues-Types-Standard">Standard</link> - a simple First-In-First-Out (FIFO) queue</para> </listitem> <listitem> - <para><link linkend="Java-Broker-Concepts-Queues-Types-Priority" - >Priority</link> - delivery order depends on the priority of each message</para> + <para><link linkend="Java-Broker-Concepts-Queues-Types-Priority">Priority</link> - delivery order depends on the priority of each message</para> </listitem> <listitem> <para><link linkend="Java-Broker-Concepts-Queues-Types-Sorted">Sorted</link> - @@ -53,36 +46,36 @@ with a given LVQ key value</para> </listitem> </itemizedlist></para> - <section id="Java-Broker-Concepts-Queues-Types-Standard"> + <section xml:id="Java-Broker-Concepts-Queues-Types-Standard"> <title>Standard</title> <para>A simple First-In-First-Out (FIFO) queue</para> </section> - <section id="Java-Broker-Concepts-Queues-Types-Priority"> + <section xml:id="Java-Broker-Concepts-Queues-Types-Priority"> <title>Priority</title> <para>In a priority queue, messages on the queue are delivered in an order determined by the - <ulink url="&oracleJeeDocUrl;javax/jms/Message.html#getJMSPriority()">JMS priority message - header</ulink> within the message. By default Qpid supports the 10 priority levels + <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#getJMSPriority()">JMS priority message + header</link> within the message. By default Qpid supports the 10 priority levels mandated by JMS, with priority value 0 as the lowest priority and 9 as the highest. </para> <para>It is possible to reduce the effective number of priorities if desired.</para> - <para>JMS defines the <ulink url="&oracleJeeDocUrl;javax/jms/Message.html#DEFAULT_PRIORITY"> - default message priority</ulink> as 4. Messages sent without a specified priority use this + <para>JMS defines the <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#DEFAULT_PRIORITY"> + default message priority</link> as 4. Messages sent without a specified priority use this default. </para> </section> - <section id="Java-Broker-Concepts-Queues-Types-Sorted"> + <section xml:id="Java-Broker-Concepts-Queues-Types-Sorted"> <title>Sorted Queues</title> <para>Sorted queues allow the message delivery order to be determined by value of an arbitrary - <ulink url="&oracleJeeDocUrl;javax/jms/Message.html#getStringProperty()">JMS message - property</ulink>. Sort order is alpha-numeric and the property value must have a type + <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#getStringProperty()">JMS message + property</link>. Sort order is alpha-numeric and the property value must have a type java.lang.String.</para> <para>Messages sent to a sorted queue without the specified JMS message property will be put at the head of the queue.</para> </section> - <section id="Java-Broker-Concepts-Queues-Types-LVQ"> + <section xml:id="Java-Broker-Concepts-Queues-Types-LVQ"> <title>Last Value Queues (LVQ)</title> <para>LVQs (or conflation queues) are special queues that automatically discard any message when a newer message arrives with the same key value. The key is specified by arbitrary - <ulink url="&oracleJeeDocUrl;javax/jms/Message.html#getPropertyNames()">JMS message - property</ulink>.</para> + <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleJeeDocUrl;javax/jms/Message.html#getPropertyNames()">JMS message + property</link>.</para> <para>An example of an LVQ might be where a queue represents prices on a stock exchange: when you first consume from the queue you get the latest quote for each stock, and then as new prices come in you are sent only these updates. </para> @@ -95,7 +88,7 @@ will never be "replaced".</para> </section> </section> - <section id="Java-Broker-Concepts-Queues-QueueDeclareArguments"> + <section xml:id="Java-Broker-Concepts-Queues-QueueDeclareArguments"> <title>Queue Declare Arguments</title> <para>To create a priority, sorted or LVQ queue programmatically from AMQP, pass the appropriate queue-declare arguments.</para> @@ -135,7 +128,7 @@ </tgroup> </table> </section> - <section id="Java-Broker-Concepts-Queues-Message-Grouping"> + <section xml:id="Java-Broker-Concepts-Queues-Message-Grouping"> <title>Messaging Grouping</title> <para> The broker allows messaging applications to classify a set of related messages as belonging to a group. This allows a message producer to indicate to the consumer that a group @@ -154,7 +147,7 @@ <emphasis>remove</emphasis> message. This allows both messages to be processed in parallel, which could result in a "race" where the <emphasis>remove</emphasis> operation is incorrectly performed before the <emphasis>add</emphasis> operation. </para> - <section id="Java-Broker-Concepts-Queues-GroupingMessages"> + <section xml:id="Java-Broker-Concepts-Queues-GroupingMessages"> <title>Grouping Messages</title> <para> In order to group messages, the application would designate a particular message header as containing a message's <emphasis>group identifier</emphasis>. The group identifier stored @@ -165,7 +158,7 @@ <para> The header that is used to hold the group identifier, as well as the values used as group identifiers, are totally under control of the application. </para> </section> - <section id="Java-Broker-Concepts-Queues-BrokerRole"> + <section xml:id="Java-Broker-Concepts-Queues-BrokerRole"> <title> The Role of the Broker in Message Grouping </title> <para> The broker will apply the following processing on each grouped message: <itemizedlist> <listitem> @@ -224,7 +217,7 @@ consumption by other consumers - even though it is "behind" group "A" in the queue. </para> </section> </section> - <section id="Java-Broker-Concepts-Queues-SetLowPrefetch"> + <section xml:id="Java-Broker-Concepts-Queues-SetLowPrefetch"> <title>Using low pre-fetch with special queue types</title> <para>Qpid clients receive buffered messages in batches, sized according to the pre-fetch value. The current default is 500. </para> @@ -244,8 +237,7 @@ -Dmax_prefetch=1 </programlisting> <para> The prefetch can be also be adjusted on a per connection basis by adding a - <varname>maxprefetch</varname> value to the <ulink url="&qpidjmsdocClientConectionUrl;" - >Connection URLs</ulink> + <varname>maxprefetch</varname> value to the <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&qpidjmsdocClientConectionUrl;">Connection URLs</link> </para> <programlisting> amqp://guest:guest@client1/development?maxprefetch='1'&brokerlist='tcp://localhost:5672' @@ -254,7 +246,7 @@ amqp://guest:guest@client1/development?m client however, this brings a performance cost. You could test with a slightly higher pre-fetch to trade-off between throughput and exact semantics.</para> </section> - <section id="Java-Broker-Concepts-Queue-EnsureNonDestructiveConsumers"> + <section xml:id="Java-Broker-Concepts-Queue-EnsureNonDestructiveConsumers"> <title>Forcing all consumers to be non-destructive</title> <para>When a consumer attaches to a queue, the normal behaviour is that messages are sent to that consumer are acquired exclusively by that consumer, and when the consumer
Modified: qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Concepts-RemoteReplicationNodes"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Concepts-RemoteReplicationNodes"> <title>Remote Replication Nodes</title> <para>Used for HA only. A <emphasis>remote replication node</emphasis> is a representation of another virtualhost node in the group.</para> Modified: qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Concepts-Virtualhost-Nodes"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Concepts-Virtualhost-Nodes"> <title>Virtualhost Nodes</title> <para>A <emphasis>virtualhost node</emphasis> is a container for the virtualhost. It has exactly one virtualhost.</para> @@ -29,8 +29,7 @@ etc).</para> <para>When HA is in use, it is the virtualhost nodes of many Brokers that come together to form the group. The virtualhost nodes together elect a master. When the high availability feature is - in use, the virtualhost node has <link linkend="Java-Broker-Concepts-RemoteReplicationNodes" - >remote replications nodes</link>. There is a remote replication node corresponding to each + in use, the virtualhost node has <link linkend="Java-Broker-Concepts-RemoteReplicationNodes">remote replications nodes</link>. There is a remote replication node corresponding to each remote virtualhost node that form part of the group.</para> Modified: qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Concepts-Virtualhosts"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Concepts-Virtualhosts"> <title>Virtualhosts</title> <para>A virtualhost is a namespace in which messaging is performed. Virtualhosts are independent; the messaging that goes on within one virtualhost is independent of any messaging that goes on Modified: qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Channel-AMQP-Intrinstic"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Channel-AMQP-Intrinstic"> <title>AMQP Intrinstic Management</title> <para>The AMQP protocols 0-8..0-10 allow for creation, deletion and query of Exchanges, Queue and Bindings.</para> Modified: qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,10 +20,10 @@ --> -<section id="Java-Broker-Management-Channel-HTTP"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Channel-HTTP"> <title>HTTP Management</title> - <section id="Java-Broker-Management-Channel-HTTP-Introduction"> + <section xml:id="Java-Broker-Management-Channel-HTTP-Introduction"> <title>Introduction</title> <para>The HTTP Management plugin provides a HTTP based API for monitoring and control of the Broker. The plugin actually provides two interfaces:</para> @@ -46,7 +46,7 @@ controlled from systems such as Naoios or BMC Control-M.</para> </section> - <section id="Java-Broker-Management-Channel-HTTP-DefaultConfiguration"> + <section xml:id="Java-Broker-Management-Channel-HTTP-DefaultConfiguration"> <title>Default Configuration</title> <para>By default, the Broker is shipped with HTTP enabled running port 8080. The HTTP plugin is configured to require SASL authentication. The port is not SSL protected.</para> Modified: qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-QMF.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-QMF.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-QMF.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-QMF.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Channel-QMF"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Channel-QMF"> <title>QMF</title> <para>QMF is provided by an optional plugin.</para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,9 +20,9 @@ --> -<section id="Java-Broker-Management-Channel-REST-API"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Channel-REST-API"> <title>REST API</title> - <section id="Java-Broker-Management-Channel-REST-API-Introduction"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Introduction"> <title>Introduction</title> <para>This section describes the REST API provided by the Java Broker. The REST API is intended for use by developers who wish to automate the management or monitoring of the Qpid Broker. It @@ -42,21 +42,21 @@ <para>There are also some ancillary services under URI <literal>/service</literal> used for authentication and logout.</para> </section> - <section id="Java-Broker-Management-Channel-REST-API-APIDocs"> + <section xml:id="Java-Broker-Management-Channel-REST-API-APIDocs"> <title>REST API documentation</title> <para>REST API documentation is available on-line from any Java Broker at location <literal>/apidocs</literal>. It is also linked from the menu of the Web Management Console. </para> </section> - <section id="Java-Broker-Management-Channel-REST-API-Authentication"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Authentication"> <title>Authentication</title> <para>Before you can use the REST API, you must authenticate. Authentication decisions are made by the <link linkend="Java-Broker-Concepts-Authentication-Providers">authentication provider</link> associated with HTTP <link linkend="Java-Broker-Concepts-Ports">port</link> on which you connect.</para> - <para>You may authenticate using <ulink url="https://www.ietf.org/rfc/rfc4422.txt";>SASL</ulink> - (<literal>/service/sasl</literal>) or <ulink url="https://tools.ietf.org/html/rfc2617";>HTTP - Basic Authentication</ulink>. The latter is convienent when using tools such as + <para>You may authenticate using <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://www.ietf.org/rfc/rfc4422.txt";>SASL</link> + (<literal>/service/sasl</literal>) or <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="https://tools.ietf.org/html/rfc2617";>HTTP + Basic Authentication</link>. The latter is convienent when using tools such as <literal>curl</literal> on the command line. This is illustrated in the examples below.</para> <para>For SASL authentication use a <literal>GET</literal> request to @@ -65,7 +65,7 @@ <para>It is possible to end an authenticated session using <literal>/service/logout</literal>.</para> </section> - <section id="Java-Broker-Management-Channel-REST-API-Create"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Create"> <title>Configured Object creation</title> <para>Methods PUT or POST can be used to create ConfiguredObject.</para> <para> ConfiguredObject can be created by submitting PUT request against ConfiguredObject full @@ -88,9 +88,9 @@ <para> To create Queue with name "my-queue" on a virtual host with name "vh" (which is contained within virtual host node with name "vhn") either of the following requests should be made: </para> - <screen><![CDATA[PUT /api/latest/queue/vhn/vh HTTP/1.1]]></screen> - <screen><![CDATA[POST /api/latest/queue/vhn/vh HTTP/1.1]]></screen> - <screen><![CDATA[PUT /api/latest/queue/vhn/vh/my-queue HTTP/1.1]]></screen> + <screen>PUT /api/latest/queue/vhn/vh HTTP/1.1</screen> + <screen>POST /api/latest/queue/vhn/vh HTTP/1.1</screen> + <screen>PUT /api/latest/queue/vhn/vh/my-queue HTTP/1.1</screen> <para> Response code 201 should be returned on successful queue creation. Response header "Location" should be set to "/api/latest/queue/test/my-queue". If queue with name "my-queue" already exists and either of 2 first requests above were used, an error response with @@ -99,7 +99,7 @@ update should occur. </para> </example> </section> - <section id="Java-Broker-Management-Channel-REST-API-Update"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Update"> <title>Configured Object update</title> <para>Methods PUT or POST can be used to update ConfiguredObject.</para> <para> ConfiguredObject can be updated by submitting PUT or POST request against @@ -116,11 +116,11 @@ <title>Examples of REST calls for Queue update</title> <para>To update Queue with name "my-queue" on a virtual host with name "vh" (contained in virtual host node with name "vhn") either of the following requests can be made:</para> - <screen><![CDATA[POST /api/latest/queue/vhn/vh/my-queue HTTP/1.1]]></screen> - <screen><![CDATA[POST /api/latest/queue/vhn/vh/my-queue HTTP/1.1]]></screen> + <screen>POST /api/latest/queue/vhn/vh/my-queue HTTP/1.1</screen> + <screen>POST /api/latest/queue/vhn/vh/my-queue HTTP/1.1</screen> </example> </section> - <section id="Java-Broker-Management-Channel-REST-API-Delete"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Delete"> <title>Configured Object deletion</title> <para>Method DELETE can be used to delete ConfiguredObject. Alternatively, ConfiguredObject can be deleted with update request having desiredState attribute set to value "DELETED". POST or @@ -143,12 +143,12 @@ <title>Examples of REST calls for Queue deletion</title> <para>To delete Queue with name "my-queue" on a virtual host with name "vh" (contained in virtual host node with name "vhn") either of the following requests can be made:</para> - <screen><![CDATA[DELETE /api/latest/queue/vhn/vh/my-queue HTTP/1.1]]></screen> - <screen><![CDATA[DELETE /api/latest/queue/vhn/vh?name=my-queue HTTP/1.1]]></screen> - <screen><![CDATA[DELETE /api/latest/queue/vhn/vh?id=real-queue-id HTTP/1.1]]></screen> + <screen>DELETE /api/latest/queue/vhn/vh/my-queue HTTP/1.1</screen> + <screen>DELETE /api/latest/queue/vhn/vh?name=my-queue HTTP/1.1</screen> + <screen>DELETE /api/latest/queue/vhn/vh?id=real-queue-id HTTP/1.1</screen> </example> </section> - <section id="Java-Broker-Management-Channel-REST-API-Get"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Get"> <title>Retrieving Configured Object details</title> <para>Method GET is used to retrieve ConfiguredObject attributes values and children hierarchy.</para> @@ -213,7 +213,7 @@ </varlistentry> </variablelist> </section> - <section id="Java-Broker-Management-Channel-REST-API-Operations"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Operations"> <title>Configured Object operations</title> <para>Method POST is used to invoke Configured Objects operations. Some operations support parameters. Pass parameters using a JSON request body containing a map with a map entry for @@ -221,10 +221,10 @@ <example> <title>Example of REST call to invoke the Queue clear queue operation</title> <para>To clear the queue with name "my-queue" on a virtual host with name "vh".</para> - <screen><![CDATA[POST api/latest/queue/default/vhn/vh/my-queue/clearQueue HTTP/1.1]]></screen> + <screen>POST api/latest/queue/default/vhn/vh/my-queue/clearQueue HTTP/1.1</screen> </example> </section> - <section id="Java-Broker-Management-Channel-REST-API-Status-Codes"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Status-Codes"> <title>HTTP status codes returned by REST interfaces</title> <table> <title>HTTP status codes returned by REST interfaces</title> @@ -319,27 +319,26 @@ </tgroup> </table> </section> - <section id="Java-Broker-Management-Channel-REST-API-Examples"> + <section xml:id="Java-Broker-Management-Channel-REST-API-Examples"> <title>Examples of REST requests with curl</title> <example> <title>Examples of queue creation using curl (authenticating as user admin):</title> - <programlisting><![CDATA[ + <programlisting> #create a durable queue -curl --user admin -X PUT -d '{"durable":true}' http://localhost:8080/api/latest/queue/<vhostnode name>/<vhostname>/<queuename> +curl --user admin -X PUT -d '{"durable":true}' http://localhost:8080/api/latest/queue/<vhostnode name>/<vhostname>/<queuename> #create a durable priority queue -curl --user admin -X PUT -d '{"durable":true,"type":"priority"}' http://localhost:8080/api/latest/queue/<vhostnode name>/<vhostname>/<queuename> - ]]></programlisting> +curl --user admin -X PUT -d '{"durable":true,"type":"priority"}' http://localhost:8080/api/latest/queue/<vhostnode name>/<vhostname>/<queuename> + </programlisting> </example> <example> <title>Example of binding a queue to an exchange using curl</title> - <programlisting><![CDATA[ -curl --user admin -X PUT -d '{}' http://localhost:8080/api/latest/binding/<vhostnode name>/<vhostname>/<exchangename>/<queue-name>/<binding-name> - ]]></programlisting> + <programlisting> +curl --user admin -X PUT -d '{}' http://localhost:8080/api/latest/binding/<vhostnode name>/<vhostname>/<exchangename>/<queue-name>/<binding-name> + </programlisting> </example> <para> NOTE: These curl examples utilise unsecure HTTP transport. To use the examples it is first necessary enable Basic authentication for HTTP within the HTTP Management Configuration - (it is off by default). For details see <xref - linkend="Java-Broker-Management-Managing-Plugin-HTTP"/> + (it is off by default). For details see <xref linkend="Java-Broker-Management-Managing-Plugin-HTTP"/> </para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Channel-Web-Console"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Channel-Web-Console"> <title>Web Management Console</title> <para> The Web Management Console provides a simple and intuitive interface for the Management and Control of the Broker. From here, all aspects of the Broker can be controlled, @@ -41,7 +41,7 @@ </para> <para>The remainder of the section provides an introduction to the web management console and its use.</para> - <section id="Java-Broker-Management-Channel-Web-Console-Accessing"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Accessing"> <title>Accessing the Console</title> <para>The Web Management Console is provided by the HTTP Management Plugin. Providing the HTTP Management Plugin is in its default configuration, the Web Management Console can @@ -54,8 +54,7 @@ <title>Web Management Console - Authentication</title> <mediaobject> <imageobject> - <imagedata fileref="images/Management-Web-Auth.png" format="PNG" scalefit="1" - width="900px"/> + <imagedata fileref="images/Management-Web-Auth.png" format="PNG" scalefit="1" width="900px"/> </imageobject> <textobject> <phrase>Web Console Authentication</phrase> @@ -63,7 +62,7 @@ </mediaobject> </figure> </section> - <section id="Java-Broker-Management-Channel-Web-Console-Orientation"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Orientation"> <title>Orientation</title> <para>After you have logged on you will see a screen similar to the following. The elements of the screen are now explained.</para> @@ -71,8 +70,7 @@ <title>Web Management Orientation - Console</title> <mediaobject> <imageobject> - <imagedata fileref="images/Management-Web-Console.png" format="PNG" scalefit="1" - width="900px"/> + <imagedata fileref="images/Management-Web-Console.png" format="PNG" scalefit="1" width="900px"/> </imageobject> <textobject> <phrase>The Web Console</phrase> @@ -107,12 +105,11 @@ </listitem> </itemizedlist> </para> - <figure id="Java-Broker-Management-Channel-Web-Console-Orientation-Tab"> + <figure xml:id="Java-Broker-Management-Channel-Web-Console-Orientation-Tab"> <title>Web Management Orientation - Tab</title> <mediaobject> <imageobject> - <imagedata fileref="images/Management-Web-Tab.png" format="PNG" scalefit="1" - width="900px"/> + <imagedata fileref="images/Management-Web-Tab.png" format="PNG" scalefit="1" width="900px"/> </imageobject> <textobject> <phrase>A tab within the Web Consle</phrase> @@ -140,10 +137,10 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities"> <title>Managing Entities</title> <para>All the Entities of the Broker of can be managed through the Web Console.</para> - <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Add"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Add"> <title>Adding Entities</title> <para>To <emphasis>add</emphasis> a new entity, click the <literal>Add</literal> button on the Child Panel on the Parent's tab. Clicking the Add button causes an add @@ -153,12 +150,11 @@ details about the attribute and any default value (which may be expressed in terms of a context variable) that will take effect if you leave the attribute unset. An example add dialogue is shown in the figure that follows.</para> - <figure id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Add-Dialogue"> + <figure xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Add-Dialogue"> <title>Web Management Orientation - Add Dialogue</title> <mediaobject> <imageobject> - <imagedata fileref="images/Management-Web-Add-Dialogue.png" format="PNG" - scalefit="1"/> + <imagedata fileref="images/Management-Web-Add-Dialogue.png" format="PNG" scalefit="1"/> </imageobject> <textobject> <phrase>Example add dialogue showing field level help</phrase> @@ -166,7 +162,7 @@ </mediaobject> </figure> </section> - <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Edit"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Edit"> <title>Editing Entities</title> <para>To <emphasis>edit</emphasis> an existing entity, click the <literal>Edit</literal> button on the tab corresponding to the Entity itself. Editing an entity lets you @@ -174,12 +170,11 @@ edit dialogue have field level help that give more details about the attribute and any default value. An example edit dialogue is shown in the figure that follows.</para> - <figure id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Edit-Dialogue"> + <figure xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Edit-Dialogue"> <title>Web Management Orientation - Edit Dialogue</title> <mediaobject> <imageobject> - <imagedata fileref="images/Management-Web-Edit-Dialogue.png" format="PNG" - scalefit="1"/> + <imagedata fileref="images/Management-Web-Edit-Dialogue.png" format="PNG" scalefit="1"/> </imageobject> <textobject> <phrase>Example edit dialogue</phrase> @@ -187,28 +182,25 @@ </mediaobject> </figure> </section> - <section id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Delete"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Delete"> <title>Deleting Entities</title> <para>To <emphasis>remove</emphasis> an existing entity, click the <literal>Delete</literal> button on the tab corresponding to the Entity itself. For some child types, you can select many children from the parent's type and delete many children at once.</para> </section> - <section id="Java-Broker-Management-Channel-Web-Console-Managing-Context-Variables"> + <section xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Context-Variables"> <title>Context Variables</title> - <para>All Entities within the Broker have the ability to have <link - linkend="Java-Broker-Management-Managing-Entities-General">context + <para>All Entities within the Broker have the ability to have <link linkend="Java-Broker-Management-Managing-Entities-General">context variables</link> associated with them.</para> <para>Most add and edit dialogues have the ability to make context variable assignments. To add/change/remove a context variable, click the Context Variable panel to expand it.</para> - <figure - id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Context-Variables-Dialogue"> + <figure xml:id="Java-Broker-Management-Channel-Web-Console-Managing-Entities-Context-Variables-Dialogue"> <title>Web Management Orientation - Context Variables</title> <mediaobject> <imageobject> - <imagedata fileref="images/Management-Web-ContextVar.png" format="PNG" - scalefit="1"/> + <imagedata fileref="images/Management-Web-ContextVar.png" format="PNG" scalefit="1"/> </imageobject> <textobject> <phrase>Editting Context Variables</phrase> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Managing-Access-Control-Providers"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Access-Control-Providers"> <title>Access Control Providers</title> <para>An <link linkend="Java-Broker-Concepts-Access-Control-Providers">Access Control Provider</link> governs who may do what within the Broker. It governs both messaging and Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml Mon Dec 28 22:41:23 2015 @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd";> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -22,7 +20,7 @@ --> -<section id="Java-Broker-Management-Managing-Authentication-Providers"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Authentication-Providers"> <title>Authentication Providers</title> <para> <link linkend="Java-Broker-Concepts-Authentication-Providers">Authentication @@ -30,35 +28,26 @@ authenticate connections.</para> <para>See <xref linkend="Java-Broker-Security-Authentication-Providers"/></para> - <section id="Java-Broker-Management-Managing-Authentication-Providers-Types"> + <section xml:id="Java-Broker-Management-Managing-Authentication-Providers-Types"> <title>Types</title> <para> The following authentication providers are supported: <itemizedlist> - <listitem><para><link linkend="Java-Broker-Security-Anonymous-Provider" - >Anonymous</link>: allows anonymous connections to the + <listitem><para><link linkend="Java-Broker-Security-Anonymous-Provider">Anonymous</link>: allows anonymous connections to the Broker</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-External-Provider" - >External</link>: delegates to external mechanisms such as SSL Client + <listitem><para><link linkend="Java-Broker-Security-External-Provider">External</link>: delegates to external mechanisms such as SSL Client Certificate Authentication</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-Kerberos-Provider" - >Kerberos</link>: uses Kerberos to authenticate connections via + <listitem><para><link linkend="Java-Broker-Security-Kerberos-Provider">Kerberos</link>: uses Kerberos to authenticate connections via GSS-API.</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-LDAP-Provider" - >SimpleLDAP</link>: authenticate users against an LDAP + <listitem><para><link linkend="Java-Broker-Security-LDAP-Provider">SimpleLDAP</link>: authenticate users against an LDAP server.</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-ScramSha-Providers" - >ScramSha</link>: authenticate users against credentials stored in a + <listitem><para><link linkend="Java-Broker-Security-ScramSha-Providers">ScramSha</link>: authenticate users against credentials stored in a local database</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-Plain-Provider" - >Plain</link>: authenticate users against credentials stored in a local + <listitem><para><link linkend="Java-Broker-Security-Plain-Provider">Plain</link>: authenticate users against credentials stored in a local database.</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-PlainPasswordFile-Provider" - >PlainPasswordFile</link>: authenticate users against credentials stored + <listitem><para><link linkend="Java-Broker-Security-PlainPasswordFile-Provider">PlainPasswordFile</link>: authenticate users against credentials stored in plain text in a local file.</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-MD5-Provider" - >MD5</link>: authenticate users against credentials + <listitem><para><link linkend="Java-Broker-Security-MD5-Provider">MD5</link>: authenticate users against credentials stored in a local database.</para></listitem> - <listitem><para><link linkend="Java-Broker-Security-Base64MD5PasswordFile-Provider" - >Base64MD5PasswordFile</link>: authenticate users against credentials + <listitem><para><link linkend="Java-Broker-Security-Base64MD5PasswordFile-Provider">Base64MD5PasswordFile</link>: authenticate users against credentials stored encoded in a local file.</para></listitem> </itemizedlist> </para> @@ -66,7 +55,7 @@ be created, deleted and passwords reset.</para> </section> - <section id="Java-Broker-Management-Managing-Authentication-Providers-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Authentication-Providers-Attributes"> <title>Attributes</title> <para> <itemizedlist> @@ -77,11 +66,11 @@ </para> <para>Other attributes are provider specific.</para> </section> - <section id="Java-Broker-Management-Managing-Authentication-Providers-Children"> + <section xml:id="Java-Broker-Management-Managing-Authentication-Providers-Children"> <title>Children</title> <para>None</para> </section> - <section id="Java-Broker-Management-Managing-Authentication-Providers-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Authentication-Providers-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> <important> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,13 +20,13 @@ --> -<section id="Java-Broker-Management-Managing-Broker"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Broker"> <title>Broker</title> <para>The <link linkend="Java-Broker-Concepts-Broker">Broker</link> is the principal entity. It is composed of a number of other entities that collaborate to provide message broker facilities.</para> <para>The Broker can only be managed via the HTTP management channel.</para> - <section id="Java-Broker-Management-Managing-Broker-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Broker-Attributes"> <title>Attributes</title> <para> <itemizedlist> @@ -40,32 +40,28 @@ </listitem> <listitem> <para><emphasis>Confidential configuration encryption provider</emphasis>. The name of the - provider used to encrypt passwords and other secrets within the configuration. See <xref - linkend="Java-Broker-Security-Configuration-Encryption"/>.</para> + provider used to encrypt passwords and other secrets within the configuration. See <xref linkend="Java-Broker-Security-Configuration-Encryption"/>.</para> </listitem> </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Broker-Context"> + <section xml:id="Java-Broker-Management-Managing-Broker-Context"> <title>Context</title> <para> <itemizedlist> <listitem> - <para><emphasis>broker.flowToDiskThreshold</emphasis> Controls the <link - linkend="Java-Broker-Runtime-Flow-To-Disk">flow to disk</link> feature.</para> + <para><emphasis>broker.flowToDiskThreshold</emphasis> Controls the <link linkend="Java-Broker-Runtime-Flow-To-Disk">flow to disk</link> feature.</para> </listitem> <listitem> - <para><emphasis>broker.messageCompressionEnabled</emphasis> Controls the <link - linkend="Java-Broker-Runtime-Message-Compression">message compression</link> .</para> + <para><emphasis>broker.messageCompressionEnabled</emphasis> Controls the <link linkend="Java-Broker-Runtime-Message-Compression">message compression</link> .</para> </listitem> - <listitem id="Java-Broker-Management-Managing-Broker-Context-StoreFilesystemMaxUsagePercent"> + <listitem xml:id="Java-Broker-Management-Managing-Broker-Context-StoreFilesystemMaxUsagePercent"> <para><emphasis>store.filesystem.maxUsagePercent</emphasis> Maximum percentage of space that may be utilised on a filesystem hosting a virtualhost's message store before producer flow control is automatically imposed.</para> <para>This defaults to 90%.</para> </listitem> - <listitem - id="Java-Broker-Management-Managing-Broker-Context-BrokerDefaultSupportedProtocolVersionReply"> + <listitem xml:id="Java-Broker-Management-Managing-Broker-Context-BrokerDefaultSupportedProtocolVersionReply"> <para><emphasis>qpid.broker_default_supported_protocol_version_reply</emphasis> Used during protocol negotiation. If set, the Broker will offer this AMQP version to a client requesting an AMQP protocol that is not supported by the Broker. If not set, the Broker @@ -84,7 +80,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Broker-Children"> + <section xml:id="Java-Broker-Management-Managing-Broker-Children"> <title>Children</title> <para> <itemizedlist> @@ -114,7 +110,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Broker-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Broker-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Consumers.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Consumers.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Consumers.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Consumers.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,12 +20,12 @@ --> -<section id="Java-Broker-Management-Managing-Consumers"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Consumers"> <title>Consumers</title> <para>A Consumer represents an application's live <emphasis>subcription</emphasis> to a queue. Its presence in the model indicates that an application is currently connected to the queue <emphasis>at this moment</emphasis>. </para> - <section id="Java-Broker-Management-Managing-Consumers-Context"> + <section xml:id="Java-Broker-Management-Managing-Consumers-Context"> <title>Context</title> <para> <itemizedlist> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Managing-Entities-Matrix"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Entities-Matrix"> <title>Entity/Management Channel Support Matrix</title> <para>This tables indicates which management channels support the creation (C), update (U), or deletion (D) of different entities within the Broker.</para> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +20,11 @@ --> -<section id="Java-Broker-Management-Managing-Exchanges"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Exchanges"> <title>Exchanges</title> <para><link linkend="Java-Broker-Concepts-Exchanges">Exchanges</link> can be managed using the HTTP or AMQP channels.</para> - <section id="Java-Broker-Management-Managing-Exchanges-Types"> + <section xml:id="Java-Broker-Management-Managing-Exchanges-Types"> <title>Types</title> <para><itemizedlist> <listitem> @@ -42,7 +42,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Exchanges-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Exchanges-Attributes"> <title>Attributes</title> <para><itemizedlist> <listitem> @@ -50,18 +50,14 @@ producing messages.</para> </listitem> <listitem> - <para><emphasis>Type of the exchange</emphasis>. Can be either <link - linkend="Java-Broker-Concepts-Exchanges-Types-Direct">direct</link>, <link - linkend="Java-Broker-Concepts-Exchanges-Types-Topic">topic</link>, <link - linkend="Java-Broker-Concepts-Exchanges-Types-Fanout">fanout</link>, or <link - linkend="Java-Broker-Concepts-Exchanges-Types-Headers">headers</link>.</para> + <para><emphasis>Type of the exchange</emphasis>. Can be either <link linkend="Java-Broker-Concepts-Exchanges-Types-Direct">direct</link>, <link linkend="Java-Broker-Concepts-Exchanges-Types-Topic">topic</link>, <link linkend="Java-Broker-Concepts-Exchanges-Types-Fanout">fanout</link>, or <link linkend="Java-Broker-Concepts-Exchanges-Types-Headers">headers</link>.</para> </listitem> <listitem> <para><emphasis>Durable</emphasis>. Whether the exchange survives a restart.</para> </listitem> </itemizedlist></para> </section> - <section id="Java-Broker-Management-Managing-Exchanges-Children"> + <section xml:id="Java-Broker-Management-Managing-Exchanges-Children"> <title>Children</title> <para> <itemizedlist> @@ -71,7 +67,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Exchanges-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Exchanges-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Group-Providers.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Group-Providers.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Group-Providers.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Group-Providers.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Managing-Group-Providers"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Group-Providers"> <title>Group Providers</title> <para>See <xref linkend="Java-Broker-Security-Group-Providers"/></para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Keystores.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Keystores.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Keystores.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Keystores.xml Mon Dec 28 22:41:23 2015 @@ -1,8 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE entities [ -<!ENTITY % entities SYSTEM "../../commonEntities.xml"> -%entities; -]> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -24,7 +20,7 @@ --> -<section id="Java-Broker-Management-Managing-Keystores"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Keystores"> <title>Keystores</title> <para>A <link linkend="Java-Broker-Concepts-Keystores">Keystore</link> is required by a Port in order to use SSL for messaging and/or management.</para> @@ -33,13 +29,12 @@ <para>The key material may be held by the Broker itself (held inline within the configuration) or you may use references to files on the server's file system. Whichever mechanism is chosen it is imperative to ensure that private key material remains confidential.</para> - <section id="Java-Broker-Management-Managing-Keystores-Types"> + <section xml:id="Java-Broker-Management-Managing-Keystores-Types"> <title>Types</title> <para>The following keystore types are supported. <itemizedlist> <listitem> <para><emphasis>File Key Store</emphasis>. This type accepts the standard JKS - keystore format undertood by Java and Java tools such as <ulink - url="&oracleKeytool;">keytool</ulink>.</para> + keystore format undertood by Java and Java tools such as <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleKeytool;">keytool</link>.</para> <para>If the keystore contains multiple keys, it is possible to indicate which certificate is to be used by specifying an alias. If no alias is specified the first certificate found in the keystore will be used.</para> @@ -61,7 +56,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Keystores-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Keystores-Attributes"> <title>Attributes</title> <para> <itemizedlist> @@ -80,10 +75,9 @@ </listitem> <listitem> <para><emphasis>Keystore password</emphasis>. Password used to secure the keystore<important> - <para> The password of the certificate used by the Broker <emphasis - role="bold">must</emphasis> match the password of the keystore + <para> The password of the certificate used by the Broker <emphasis role="bold">must</emphasis> match the password of the keystore itself. This is a restriction of the Qpid Broker implementation. If - using the <ulink url="&oracleKeytool;">keytool</ulink> utility, note + using the <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleKeytool;">keytool</link> utility, note that this means the argument to the <option>-keypass</option> option must match the <option>-storepass</option> option. </para> </important></para> @@ -144,11 +138,11 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Keystores-Children"> + <section xml:id="Java-Broker-Management-Managing-Keystores-Children"> <title>Children</title> <para>None</para> </section> - <section id="Java-Broker-Management-Managing-Keystores-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Keystores-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +20,11 @@ --> -<section id="Java-Broker-Management-Managing-Plugin-HTTP"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Plugin-HTTP"> <title>HTTP Plugin</title> <para>The HTTP Plugin provides the <link linkend="Java-Broker-Management-Channel-HTTP">HTTP management channel</link> comprising of the <link linkend="Java-Broker-Management-Channel-Web-Console">Web Management Console</link> and the <link linkend="Java-Broker-Management-Channel-REST-API">REST API</link>.</para> - <section id="Java-Broker-Management-Managing-Plugin-HTTP-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Plugin-HTTP-Attributes"> <title>Attributes</title> <para> <itemizedlist> @@ -51,11 +51,11 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Plugin-HTTP-Children"> + <section xml:id="Java-Broker-Management-Managing-Plugin-HTTP-Children"> <title>Children</title> <para>None</para> </section> - <section id="Java-Broker-Management-Managing-Plugin-HTTP-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Plugin-HTTP-Lifecycle"> <title>Lifecycle</title> <para>Not supported<important><para>NOTE: Changes to the Session Timeout attribute only take effect at broker restart. </para></important></para> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,7 +20,7 @@ --> -<section id="Java-Broker-Management-Managing-Ports"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Ports"> <title>Ports</title> <para>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.</para> @@ -29,7 +29,7 @@ authentication.</para> <para>Any number of ports defined to use AMQP or HTTP protocols can be defined.</para> <para>Ports can only be managed by the HTTP management channel.</para> - <section id="Java-Broker-Management-Managing-Ports-Context"> + <section xml:id="Java-Broker-Management-Managing-Ports-Context"> <title>Context</title> <para> <itemizedlist> @@ -48,7 +48,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Ports-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Ports-Attributes"> <title>Attributes</title> <para><itemizedlist> <listitem> @@ -62,8 +62,7 @@ single network interface.</para> </listitem> <listitem> - <para><emphasis>Authentication Provider</emphasis>. The <link - linkend="Java-Broker-Concepts-Authentication-Providers">authentication + <para><emphasis>Authentication Provider</emphasis>. The <link linkend="Java-Broker-Concepts-Authentication-Providers">authentication provider</link> used to authenticate incoming connections.</para> </listitem> <listitem> @@ -83,21 +82,18 @@ <para>SSLv3 is disabled by default.</para> </listitem> <listitem> - <para><emphasis>Keystore</emphasis>. <link - linkend="Java-Broker-Management-Managing-Keystores">Keystore</link> + <para><emphasis>Keystore</emphasis>. <link linkend="Java-Broker-Management-Managing-Keystores">Keystore</link> containing the Broker's private key. Required if SSL is in use.</para> </listitem> <listitem> <para><emphasis>Want/Need Client Auth</emphasis>. 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 <link - linkend="Java-Broker-Security-External-Provider">External Authentication + using Client Certificate Authentication it may be desirable to use the <link linkend="Java-Broker-Security-External-Provider">External Authentication Provider</link>.</para> </listitem> <listitem> - <para><emphasis>Truststore</emphasis>. <link - linkend="Java-Broker-Management-Managing-Truststores">Trust store</link> + <para><emphasis>Truststore</emphasis>. <link linkend="Java-Broker-Management-Managing-Truststores">Trust store</link> contain an issuer certificate or the public keys of the clients themselves if peers only is desired.</para> </listitem> @@ -117,7 +113,7 @@ </listitem> </itemizedlist></para> </section> - <section id="Java-Broker-Management-Managing-Ports-Children"> + <section xml:id="Java-Broker-Management-Managing-Ports-Children"> <title>Children</title> <para> <itemizedlist> @@ -127,7 +123,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Ports-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Ports-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> <important> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml Mon Dec 28 22:41:23 2015 @@ -1,8 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE entities [ -<!ENTITY % entities SYSTEM "../../commonEntities.xml"> -%entities; -]> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -24,21 +20,19 @@ --> -<section id="Java-Broker-Management-Managing-Queues"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Queues"> <title>Queues</title> <para><link linkend="Java-Broker-Concepts-Queues">Queues</link> are named entities that hold/buffer messages for later delivery to consumer applications.</para> <para>Queues can be managed using the HTTP or AMQP channels.</para> - <section id="Java-Broker-Management-Managing-Queues-Types"> + <section xml:id="Java-Broker-Management-Managing-Queues-Types"> <title>Types</title> <para>The Broker supports four different queue types, each with different delivery semantics.<itemizedlist> <listitem> - <para><link linkend="Java-Broker-Concepts-Queues-Types-Standard" - >Standard</link> - a simple First-In-First-Out (FIFO) queue</para> + <para><link linkend="Java-Broker-Concepts-Queues-Types-Standard">Standard</link> - a simple First-In-First-Out (FIFO) queue</para> </listitem> <listitem> - <para><link linkend="Java-Broker-Concepts-Queues-Types-Priority" - >Priority</link> - delivery order depends on the priority of each message</para> + <para><link linkend="Java-Broker-Concepts-Queues-Types-Priority">Priority</link> - delivery order depends on the priority of each message</para> </listitem> <listitem> <para><link linkend="Java-Broker-Concepts-Queues-Types-Sorted">Sorted</link> - @@ -51,7 +45,7 @@ </listitem> </itemizedlist></para> </section> - <section id="Java-Broker-Management-Managing-Queues-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Queues-Attributes"> <title>Attributes</title> <para><itemizedlist> <listitem> @@ -59,11 +53,7 @@ name when they wish to subscribe to queue to receive messages from it.</para> </listitem> <listitem> - <para><emphasis>Type of the queue</emphasis>. Can be either <link - linkend="Java-Broker-Concepts-Queues-Types-Standard">standard</link>, <link - linkend="Java-Broker-Concepts-Queues-Types-Priority">priority</link>, <link - linkend="Java-Broker-Concepts-Queues-Types-Sorted">sorted</link>, or <link - linkend="Java-Broker-Concepts-Queues-Types-LVQ">lvq</link>.</para> + <para><emphasis>Type of the queue</emphasis>. Can be either <link linkend="Java-Broker-Concepts-Queues-Types-Standard">standard</link>, <link linkend="Java-Broker-Concepts-Queues-Types-Priority">priority</link>, <link linkend="Java-Broker-Concepts-Queues-Types-Sorted">sorted</link>, or <link linkend="Java-Broker-Concepts-Queues-Types-LVQ">lvq</link>.</para> </listitem> <listitem> <para><emphasis>Durable</emphasis>. Whether the queue survives a restart. Messages on a @@ -90,20 +80,17 @@ <listitem> <para><emphasis>Alerting Thresholds</emphasis>. 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 <xref - linkend="Java-Broker-Appendix-Queue-Alerts"/></para> + a threshold, message size exceeded a threshold. These thresholds are soft. See <xref linkend="Java-Broker-Appendix-Queue-Alerts"/></para> </listitem> <listitem> - <para><emphasis>Maximum Delivery Count/Alternate Exchange</emphasis>. See <xref - linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages"/></para> + <para><emphasis>Maximum Delivery Count/Alternate Exchange</emphasis>. See <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages"/></para> </listitem> <listitem> - <para><emphasis>Message Groups</emphasis>. See <xref - linkend="Java-Broker-Concepts-Queues-Message-Grouping"/></para> + <para><emphasis>Message Groups</emphasis>. See <xref linkend="Java-Broker-Concepts-Queues-Message-Grouping"/></para> </listitem> </itemizedlist></para> </section> - <section id="Java-Broker-Management-Managing-Queue-Children"> + <section xml:id="Java-Broker-Management-Managing-Queue-Children"> <title>Children</title> <para> <itemizedlist> @@ -113,7 +100,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Queue-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Queue-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,13 +20,13 @@ --> -<section id="Java-Broker-Management-Managing-RemoteReplicationNodes"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-RemoteReplicationNodes"> <title>Remote Replication Nodes</title> <para>Used for HA only. A <link linkend="Java-Broker-Concepts-RemoteReplicationNodes">remote replication node</link> 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.</para> - <section id="Java-Broker-Management-Managing-RemoteReplicationNodes-Attributes"> + <section xml:id="Java-Broker-Management-Managing-RemoteReplicationNodes-Attributes"> <title>Attributes</title> <para><itemizedlist> <listitem> @@ -62,11 +62,11 @@ </listitem> </itemizedlist></para> </section> - <section id="Java-Broker-Management-Managing-RemoteReplicationNodes-Children"> + <section xml:id="Java-Broker-Management-Managing-RemoteReplicationNodes-Children"> <title>Children</title> <para>None</para> </section> - <section id="Java-Broker-Management-Managing-RemoteReplicationNodes-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-RemoteReplicationNodes-Lifecycle"> <title>Lifecycle</title> <para> <itemizedlist> @@ -79,7 +79,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-RemoteReplication-Nodes-Operations"> + <section xml:id="Java-Broker-Management-Managing-RemoteReplication-Nodes-Operations"> <title>Operations</title> <para> <itemizedlist> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml Mon Dec 28 22:41:23 2015 @@ -1,8 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE entities [ -<!ENTITY % entities SYSTEM "../../commonEntities.xml"> -%entities; -]> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -24,19 +20,18 @@ --> -<section id="Java-Broker-Management-Managing-Truststores"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Truststores"> <title>Truststores</title> <para> A <link linkend="Java-Broker-Concepts-Truststores">Truststore</link> 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.</para> - <section id="Java-Broker-Management-Managing-Truststores-Types"> + <section xml:id="Java-Broker-Management-Managing-Truststores-Types"> <title>Types</title> <para>The following truststore types are supported. <itemizedlist> <listitem> <para><emphasis>File Trust Store</emphasis>. This type accepts the standard JKS - truststore format undertood by Java and Java tools such as <ulink - url="&oracleKeytool;">keytool</ulink>.</para> + truststore format undertood by Java and Java tools such as <link xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="&oracleKeytool;">keytool</link>.</para> </listitem> <listitem> <para><emphasis>Non Java Trust Store</emphasis>. A non java keystore accepts key @@ -48,7 +43,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Truststores-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Truststores-Attributes"> <title>Attributes</title> <para> <itemizedlist> @@ -67,8 +62,7 @@ </listitem> <listitem> <para><emphasis>Truststore password</emphasis>. Password used to secure the truststore<important> - <para> The password of the certificate used by the Broker <emphasis - role="bold">must</emphasis> match the password of the keystore + <para> The password of the certificate used by the Broker <emphasis role="bold">must</emphasis> match the password of the keystore itself. </para> </important></para> </listitem> @@ -104,11 +98,11 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Truststores-Children"> + <section xml:id="Java-Broker-Management-Managing-Truststores-Children"> <title>Children</title> <para>None</para> </section> - <section id="Java-Broker-Management-Managing-Truststores-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Truststores-Lifecycle"> <title>Lifecycle</title> <para>Not supported</para> </section> Modified: qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml?rev=1722019&r1=1722018&r2=1722019&view=diff ============================================================================== --- qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml (original) +++ qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml Mon Dec 28 22:41:23 2015 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -20,29 +20,27 @@ --> -<section id="Java-Broker-Management-Managing-Virtualhost-Nodes"> +<section xmlns="http://docbook.org/ns/docbook"; version="5.0" xml:id="Java-Broker-Management-Managing-Virtualhost-Nodes"> <title>Virtualhost Nodes</title> <para>Virtualhost nodes can only be managed by the HTTP management channel.</para> - <section id="Java-Broker-Management-Managing-Virtualhost-Nodes-Types"> + <section xml:id="Java-Broker-Management-Managing-Virtualhost-Nodes-Types"> <title>Types</title> <para> The following virtualhost nodes types are supported. <itemizedlist> <listitem><para>BDB - Node backed with Oracle BDB <footnote> - <para>Oracle BDB JE is optional. See <xref - linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/>.</para> + <para>Oracle BDB JE is optional. See <xref linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/>.</para> </footnote></para></listitem> <listitem><para>BDB HA - Node backed with Oracle BDB utilising High Availability</para></listitem> <listitem><para>DERBY - Node backed with Apache Derby</para></listitem> <listitem><para>JDBC - Node backed with an external database <footnote> - <para>JDBC 4.0 compatible drivers must be available. See <xref - linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/></para> + <para>JDBC 4.0 compatible drivers must be available. See <xref linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/></para> </footnote></para></listitem> <listitem><para>JSON - Node backed with a file containing json</para></listitem> <listitem><para>Memory - In-memory node (changes lost on Broker restart)</para></listitem> </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes"> + <section xml:id="Java-Broker-Management-Managing-Virtualhost-Nodes-Attributes"> <title>Attributes</title> <para> <itemizedlist> @@ -78,24 +76,21 @@ <listitem> <para><emphasis>Priority</emphasis> (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 <xref - linkend="Java-Broker-High-Availability-Behaviour-NodePriority"/></para> + other nodes, or disallow the node from never being elected at all. See <xref linkend="Java-Broker-High-Availability-Behaviour-NodePriority"/></para> </listitem> <listitem> <para><emphasis>Minimum Number Of Nodes</emphasis> (HA only - groups of three or more). Allows the number of nodes required to hold an election to be reduced in order that - service can be restore when less than quorum nodes are present. See <xref - linkend="Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes"/></para> + service can be restore when less than quorum nodes are present. See <xref linkend="Java-Broker-High-Availability-Behaviour-MinimumNumberOfNodes"/></para> </listitem> <listitem> <para><emphasis>Designated Primary</emphasis> (HA only - groups of two). Allows a single - node in a two node group to operate solo. See <xref - linkend="Java-Broker-High-Availability-Behaviour-DesignatedPrimary"/></para> + node in a two node group to operate solo. See <xref linkend="Java-Broker-High-Availability-Behaviour-DesignatedPrimary"/></para> </listitem> </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Virtualhost-Node-Children"> + <section xml:id="Java-Broker-Management-Managing-Virtualhost-Node-Children"> <title>Children</title> <para> <itemizedlist> @@ -113,7 +108,7 @@ </itemizedlist> </para> </section> - <section id="Java-Broker-Management-Managing-Virtualhost-Node-Lifecycle"> + <section xml:id="Java-Broker-Management-Managing-Virtualhost-Node-Lifecycle"> <title>Lifecycle</title> <para> <itemizedlist> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
