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

svn commit: r1726649 [1/6] - in /qpid/java/branches/6.0.x: ./ doc/book/src/ doc/book/src/java-broker/ doc/book/src/java-broker/concepts/ doc/book/src/java-broker/management/channels/ doc/book/src/java-broker/management/managing/ doc/book/src/java-broke...

Author: kwall
Date: Mon Jan 25 16:02:09 2016
New Revision: 1726649

URL: http://svn.apache.org/viewvc?rev=1726649&view=rev
Log:
QPID-6961: Use maven to generate Java Broker and (legacy) Java Client docbook

Merged from trunk with command:

svn merge -c 1722019,1722020,1722674,1722678,1722683,1722711,1725760 https://svn.apache.org/repos/asf/qpid/java/trunk


Added:
    qpid/java/branches/6.0.x/doc/book/src/docbook4to5.sh
      - copied unchanged from r1722019, qpid/java/trunk/doc/book/src/docbook4to5.sh
Modified:
    qpid/java/branches/6.0.x/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/java-broker/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Backup-And-Recovery.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Concepts.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Exchanges-Binding-Arguments.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-High-Availability.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Installation.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Introduction.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Management-Channels.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Security.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Authentication-Providers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Broker.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Other-Services.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Overview.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-RemoteReplicationNodes.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhost-Nodes.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Virtualhosts.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-AMQP-Intrinsic.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-HTTP.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-QMF.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-REST-API.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-Web-Console.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Access-Control-Providers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Authentication-Providers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Broker.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Consumers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Group-Providers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Keystores.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-HTTP.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-RemoteReplicationNodes.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Truststores.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Background-Recovery.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Close-On-No-Route.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Connection-Limit.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Disk-Space-Management.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Flow-To-Disk.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Log-Files.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Memory.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Message-Compression.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Anonymous.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Base64MD5PasswordFile.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-External.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Kerberos.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-LDAP.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-MD5.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-MD5PasswordFile.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Plain.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-PlainPasswordFile.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-ScramSha.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Configuration-Encryption.xml
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-Group-Providers.xml
    qpid/java/branches/6.0.x/doc/book/src/java-perftests/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/java-perftests/JMS-Performance-Test-Framework.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Exceptions.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Maven.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Appendix-PooledConnectionFactory.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Binding-URL.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Book.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Connection-URL.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Document-Scope-And-Intended-Audience.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Examples.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Getting-And-Dependencies.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Introduction.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-JMS-Extensions.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-JNDI-Properties-Format.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Logging.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-System-Properties.xml
    qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml

Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 25 16:02:09 2016
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720664,1721151,1721198,1722246,1722339,1723064,1723194,1723563,1724216,1724251,1724257,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1726244,1726246,1726358,1726436,1726449,1726456
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720664,1721151,1721198,1722019,1722246,1722339,1723064,1723194,1723563,1724216,1724251,1724257,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1726244,1726246,1726358,1726436,1726449,1726456
 /qpid/trunk/qpid:796646-796653

Propchange: qpid/java/branches/6.0.x/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 25 16:02:09 2016
@@ -7,4 +7,4 @@
 /qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/java-broker:1477004-1477093
 /qpid/branches/qpid-2935/qpid/doc/book/src/java-broker:1061302-1072333
 /qpid/branches/qpid-3346/qpid/doc/book/src/java-broker:1144319-1179855
-/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497,1716610,1717626,1717780,1718744
+/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497,1716610,1717626,1717780,1718744,1722019

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml?rev=1726649&r1=1726648&r2=1726649&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml Mon Jan 25 16:02:09 2016
@@ -20,7 +20,7 @@
 
 -->
 
-<book xmlns:xi="http://www.w3.org/2001/XInclude">
+<book xmlns="http://docbook.org/ns/docbook" version="5.0">
   <title>AMQP Messaging Broker (Java)</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="Java-Broker-Introduction.xml"/>

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml?rev=1726649&r1=1726648&r2=1726649&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Environment-Variables.xml Mon Jan 25 16:02:09 2016
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE entities [
-<!ENTITY %  entities SYSTEM  "commonEntities.xml">
-%entities;
-]>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +20,7 @@
 
 -->
 
-<appendix id="Java-Broker-Appendix-Environment-Variables">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Java-Broker-Appendix-Environment-Variables">
   <title>Environment Variables</title>
   <para>The following table describes the environment variables understood by the Qpid scripts
     contained within the <literal>/bin</literal> directory within the Broker distribution.</para>
@@ -41,7 +37,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Environment-Variables-Qpid-Home">
+        <row xml:id="Java-Broker-Appendix-Environment-Variables-Qpid-Home">
           <entry>QPID_HOME</entry>
           <entry>
             <para>None</para>
@@ -58,7 +54,7 @@
               of the script itself.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Environment-Variables-Qpid-Work">
+        <row xml:id="Java-Broker-Appendix-Environment-Variables-Qpid-Work">
           <entry>QPID_WORK</entry>
           <entry>
             <para>User's home directory</para>
@@ -70,21 +66,20 @@
             <para>For example, <literal>QPID_WORK=/var/qpidwork</literal>.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Environment-Variables-Qpid-Opts">
+        <row xml:id="Java-Broker-Appendix-Environment-Variables-Qpid-Opts">
           <entry>QPID_OPTS</entry>
           <entry>
             <para>None</para>
           </entry>
           <entry>
-            <para>This is the preferred mechanism for passing Java <link
-                linkend="Java-Broker-Appendix-System-Properties">system properties</link> to the
+            <para>This is the preferred mechanism for passing Java <link linkend="Java-Broker-Appendix-System-Properties">system properties</link> to the
               Broker. The value must be a list of system properties each separate by a space.
                   <literal>-D<replaceable>name1</replaceable>=<replaceable>value1</replaceable>
                   -D<replaceable>name2</replaceable>=<replaceable>value2</replaceable></literal>.
             </para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Gc">
+        <row xml:id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Gc">
           <entry>QPID_JAVA_GC</entry>
           <entry>
             <literal>-XX:+HeapDumpOnOutOfMemoryError -XX:+UseConcMarkSweepGC</literal>
@@ -95,7 +90,7 @@
             <para>Refer to the JVM's documentation for details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Mem">
+        <row xml:id="Java-Broker-Appendix-Environment-Variables-Qpid-Java-Mem">
           <entry>QPID_JAVA_MEM</entry>
           <entry>
             <literal>-Xmx512m -XX:MaxDirectMemorySize=1536m</literal>
@@ -113,7 +108,7 @@
             <para>Refer to the JVM's documentation for details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Environment-Variables-Java-Opts">
+        <row xml:id="Java-Broker-Appendix-Environment-Variables-Java-Opts">
           <entry>JAVA_OPTS</entry>
           <entry>None</entry>
           <entry>

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml?rev=1726649&r1=1726648&r2=1726649&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Miscellaneous.xml Mon Jan 25 16:02:09 2016
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE entities [
-<!ENTITY %  entities SYSTEM  "commonEntities.xml">
-%entities;
-]>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one
@@ -24,44 +20,44 @@
 
 -->
 
-<appendix id="Java-Broker-Miscellaneous">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Java-Broker-Miscellaneous">
   <title>Miscellaneous</title>
 
-  <section role="h2" id="Java-Broker-Miscellaneous-JVM-Verification">
+  <section role="h2" xml:id="Java-Broker-Miscellaneous-JVM-Verification">
     <title>JVM Installation verification</title>
-    <section role="h2" id="Java-Broker-Miscellaneous-JVM-Verification-Windows">
+    <section role="h2" xml:id="Java-Broker-Miscellaneous-JVM-Verification-Windows">
       <title>Verify JVM on Windows</title>
       <para> Firstly confirm that the JAVA_HOME environment variable is set correctly by typing the
         following at the command prompt: </para>
-      <programlisting><![CDATA[echo %JAVA_HOME%]]></programlisting>
+      <programlisting>echo %JAVA_HOME%</programlisting>
       <para> If JAVA_HOME is set you will see something similar to the following: </para>
-      <screen><![CDATA[c:"\PROGRA~1"\Java\jdk1.7.0_79\]]>
+      <screen>c:"\PROGRA~1"\Java\jdk1.7.0_79\
       </screen>
       <para> Then confirm that a Java installation (1.7 or higher) is available: </para>
-      <programlisting><![CDATA[java -version]]></programlisting>
+      <programlisting>java -version</programlisting>
       <para> If java is available on the path, output similar to the following will be seen: </para>
-      <screen><![CDATA[java version "1.7.0_79"
+      <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)]]></screen>
+Java HotSpot(TM) 64-Bit Server VM (build 24.79-b02, mixed mode)</screen>
     </section>
 
-    <section role="h2" id="Java-Broker-Miscellaneous-JVM-Verification-Unix">
+    <section role="h2" xml:id="Java-Broker-Miscellaneous-JVM-Verification-Unix">
       <title>Verify JVM on Unix</title>
       <para> Firstly confirm that the JAVA_HOME environment variable is set correctly by typing the
         following at the command prompt: </para>
-      <programlisting><![CDATA[echo $JAVA_HOME]]></programlisting>
+      <programlisting>echo $JAVA_HOME</programlisting>
       <para> If JAVA_HOME is set you will see something similar to the following: </para>
-      <screen><![CDATA[/usr/java/jdk1.7.0_80]]>
+      <screen>/usr/java/jdk1.7.0_80
       </screen>
       <para> Then confirm that a Java installation (1.7 or higher) is available: </para>
-      <programlisting><![CDATA[java -version]]></programlisting>
+      <programlisting>java -version</programlisting>
       <para> If java is available on the path, output similar to the following will be seen: </para>
-      <screen><![CDATA[java version "1.7.0_80"
+      <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)]]></screen>
+Java HotSpot(TM) 64-Bit Server VM (build 24.80-b11, mixed mode)</screen>
     </section>
   </section>
-  <section role="h2" id="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver">
+  <section role="h2" xml:id="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver">
     <title>Installing External JDBC Driver</title>
     <para>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
@@ -73,13 +69,12 @@ cp <literal>driver</literal>.jar qpid-br
 copy <literal>driver</literal>.jar qpid-broker-&qpidCurrentRelease;\lib</programlisting>
     
   </section>
-  <section role="h2" id="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE">
+  <section role="h2" xml:id="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE">
     <title>Installing Oracle BDB JE</title>
     <para> The Oracle BDB JE is not distributed with Apache Qpid owing to license considerations.. </para>
     <para>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. </para>
-    <para> Download the Oracle BDB JE &oracleBdbProductVersion; release <ulink
-        url="&oracleJeDownloadUrl;">from the Oracle website.</ulink>
+    <para> Download the Oracle BDB JE &oracleBdbProductVersion; release <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="&oracleJeDownloadUrl;">from the Oracle website.</link>
     </para>
     <para> The download has a name in the form je-&oracleBdbProductVersion;.tar.gz. It is
       recommended that you confirm the integrity of the download by verifying the MD5. </para>

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml?rev=1726649&r1=1726648&r2=1726649&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml Mon Jan 25 16:02:09 2016
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE entities [
-<!ENTITY %  entities SYSTEM  "commonEntities.xml">
-%entities;
-]>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +20,7 @@
 
 -->
 
-<appendix id="Java-Broker-Appendix-Operation-Logging">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Java-Broker-Appendix-Operation-Logging">
   <title>Operational Logging</title>
 
   <para>The Broker will, by default, produce structured log messages in response to key events in
@@ -43,15 +39,13 @@
     <listitem>
       <para><literal>Actor</literal> is the entity within the Broker that is
           <emphasis>performing</emphasis> the action. There are actors corresponding to the Broker
-        itself, Management, Connection, and Channels. Their format is described in the <link
-          linkend="Java-Broker-Appendix-Operation-Logging-Actor-Format">table</link> below.</para>
+        itself, Management, Connection, and Channels. Their format is described in the <link linkend="Java-Broker-Appendix-Operation-Logging-Actor-Format">table</link> below.</para>
     </listitem>
     <listitem>
       <para><literal>Subject</literal> (optional) is the entity within the Broker that is
           <emphasis>receiving</emphasis> the action. There are subjects corresponding to the
         Connections, Channels, Queues, Exchanges, Subscriptions, and Message Stores. Their format is
-        described in the <link linkend="Java-Broker-Appendix-Operation-Logging-Subject-Format"
-          >table</link> below.</para>
+        described in the <link linkend="Java-Broker-Appendix-Operation-Logging-Subject-Format">table</link> below.</para>
       <para>Some actions are reflexive, in these cases the Actor and Subject will be equal.</para>
     </listitem>
     <listitem>
@@ -63,16 +57,14 @@
     </listitem>
   </itemizedlist>
   <para>To illustrate, let's look at two examples.</para>
-  <para><literal><link linkend="Java-Broker-Appendix-Operation-Logging-Message-CON-1001"
-        >CON-1001</link></literal> is used when a messages client makes an AMQP connection. The
+  <para><literal><link linkend="Java-Broker-Appendix-Operation-Logging-Message-CON-1001">CON-1001</link></literal> is used when a messages client makes an AMQP connection. The
     connection actor (<literal>con</literal>) provides us with details of the peer's connection: the
     user id used by the client (myapp1), their IP, ephemeral port number and the name of the virtual
     host. The message text itself gives us further details about the connection: the client id, the
     protocol version in used, and details of the client's qpid library.</para>
   <screen>[con:8(myapp1@/127.0.0.1:52851/default)] CON-1001 : Open : Destination : AMQP(127.0.0.1:5672) :
     Protocol Version : 0-10 : Client ID : myapp1 : Client Version : &qpidCurrentRelease; : Client Product : qpid</screen>
-  <para><literal><link linkend="Java-Broker-Appendix-Operation-Logging-Message-QUE-1001"
-        >QUE-1001</link></literal> is used when a queue is created. The connection actor
+  <para><literal><link linkend="Java-Broker-Appendix-Operation-Logging-Message-QUE-1001">QUE-1001</link></literal> is used when a queue is created. The connection actor
       <literal>con</literal> tells us details of the connection performing the queue creation: the
     user id used by the client (myapp1), the IP, ephemeral port number and the name of the virtual
     host. The queue subject tells use the queue's name (myqueue) and the virtualhost. The message
@@ -81,7 +73,7 @@
   <screen>[con:8(myapp1@/127.0.0.1:52851/default)/ch:0] [vh(/default)/qu(myqueue)] QUE-1001 : Create : Owner: myapp1 Transient</screen>
   <para>The first two tables that follow describe the actor and subject entities, then the later
     provide a complete catalogue of all supported messages.</para>
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Actor-Format">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Actor-Format">
     <title>Actors Entities</title>
     <tgroup cols="2">
       <thead>
@@ -149,7 +141,7 @@
       </tbody>
     </tgroup>
   </table>
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Subject-Format">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Subject-Format">
     <title>Subject Entities</title>
     <tgroup cols="2">
       <thead>
@@ -243,7 +235,7 @@
   <para>The following tables lists all the operation log messages that can be produced by the
     Broker, and the describes the circumstances under which each may be seen.</para>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Broker">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Broker">
     <title>Broker Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -253,7 +245,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1001">
           <entry morerows="1">BRK-1001</entry>
           <entry>Startup : Version: <replaceable>version</replaceable> Build:
               <replaceable>build</replaceable>
@@ -264,7 +256,7 @@
             <para>Indicates that the Broker is starting up</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1002">
           <entry morerows="1">BRK-1002</entry>
           <entry>Starting : Listening on <replaceable>transporttype</replaceable> port
               <replaceable>portnumber</replaceable>
@@ -275,7 +267,7 @@
             <para>Indicates that the Broker has begun listening on a port.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1003">
           <entry morerows="1">BRK-1003</entry>
           <entry>Shutting down : <replaceable>transporttype</replaceable> port
               <replaceable>portnumber</replaceable>
@@ -286,7 +278,7 @@
             <para>Indicates that the Broker has stopped listening on a port.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1004">
           <entry morerows="1">BRK-1004</entry>
           <entry>Qpid Broker Ready</entry>
         </row>
@@ -295,7 +287,7 @@
             <para>Indicates that the Broker is ready for normal operations.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1005">
           <entry morerows="1">BRK-1005</entry>
           <entry>Stopped</entry>
         </row>
@@ -304,7 +296,7 @@
             <para>Indicates that the Broker is stopped.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1006">
           <entry morerows="1">BRK-1006</entry>
           <entry>Using configuration : <replaceable>file</replaceable>
           </entry>
@@ -314,7 +306,7 @@
             <para>Indicates the name of the configuration store in use by the Broker.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1008">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1008">
           <entry morerows="1">BRK-1008</entry>
           <entry><replaceable>delivered|received</replaceable> : <replaceable>size</replaceable>
             kB/s peak : <replaceable>size</replaceable> bytes total</entry>
@@ -324,7 +316,7 @@
             <para>Statistic - bytes delivered or received by the Broker.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1009">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1009">
           <entry morerows="1">BRK-1009</entry>
           <entry><replaceable>delivered|received</replaceable> : <replaceable>size</replaceable>
             msg/s peak : <replaceable>size</replaceable> msgs total</entry>
@@ -334,7 +326,7 @@
             <para>Statistic - messages delivered or received by the Broker.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1010">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1010">
           <entry morerows="1">BRK-1010</entry>
           <entry>Platform : JVM : <replaceable>vendor</replaceable> version: <replaceable>version
           </replaceable> OS : <replaceable>operating system vendor</replaceable> version:
@@ -346,7 +338,7 @@
             <para>Key information about the environment hosting the Broker</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1011">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1011">
           <entry morerows="1">BRK-1011</entry>
           <entry>Maximum Memory : Heap : <replaceable>size</replaceable> bytes Direct : <replaceable>
             bytes</replaceable> size</entry></row>
@@ -355,7 +347,7 @@
             <para>Configured memory paramters for the Broker.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1012">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1012">
           <entry morerows="1">BRK-1012</entry>
           <entry>Management Mode : User Details : <replaceable>management node user id</replaceable> /
             <replaceable>management mode password</replaceable></entry>
@@ -366,7 +358,7 @@
              management credentials that may be used connect to the Broker.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1014">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1014">
           <entry morerows="1">BRK-1014</entry>
           <entry>Message flow to disk active : Message memory use <replaceable>size of all
               messages</replaceable> exceeds threshold <replaceable>threshold
@@ -378,7 +370,7 @@
               threshold so the flow to disk feature has been activated.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1015">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1015">
           <entry morerows="1">BRK-1015</entry>
           <entry>Message flow to disk inactive : Message memory use <replaceable>size of all
               messages</replaceable> within threshold <replaceable>threshold
@@ -390,7 +382,7 @@
               threshold so the flow to disk feature has been deactivated.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1016">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1016">
           <entry morerows="1">BRK-1016</entry>
           <entry>Fatal error : <replaceable>root cause</replaceable> : See log file for more information</entry>
         </row>
@@ -399,7 +391,7 @@
             <para>Indicates that broker was shut down due to fatal error.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1017">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BRK-1017">
           <entry morerows="1">BRK-1017</entry>
           <entry>Process : PID <replaceable>process identifier</replaceable></entry>
         </row>
@@ -412,7 +404,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Management">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Management">
     <title>Management Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -422,7 +414,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1001">
           <entry morerows="1">MNG-1001</entry>
           <entry><replaceable>type</replaceable> Management Startup </entry>
         </row>
@@ -432,7 +424,7 @@
               plugins are JMX and Web.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1002">
           <entry morerows="1">MNG-1002</entry>
           <entry>Starting : <replaceable>type</replaceable> : Listening on <replaceable>transporttype</replaceable> port
               <replaceable>port</replaceable>
@@ -443,7 +435,7 @@
             <para>Indicates that a Management plugin is listening on the given port.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1003">
           <entry morerows="1">MNG-1003</entry>
           <entry>Shutting down : <replaceable>type</replaceable> : port
               <replaceable>port</replaceable></entry>
@@ -453,7 +445,7 @@
             <para>Indicates that a Management plugin is ceasing to listen on the given port.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1004">
           <entry morerows="1">MNG-1004</entry>
           <entry><replaceable>type</replaceable> Management Ready</entry>
         </row>
@@ -462,7 +454,7 @@
             <para>Indicates that a Management plugin is ready for work.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1005">
           <entry morerows="1">MNG-1005</entry>
           <entry><replaceable>type</replaceable> Management Stopped</entry>
         </row>
@@ -471,7 +463,7 @@
             <para>Indicates that a Management plugin is stopped.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1007">
           <entry morerows="1">MNG-1007</entry>
           <entry>Open : User <replaceable>username</replaceable></entry>
         </row>
@@ -481,7 +473,7 @@
               username.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1008">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MNG-1008">
           <entry morerows="1">MNG-1008</entry>
           <entry>Close : User <replaceable>username</replaceable></entry>
         </row>
@@ -495,7 +487,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-VirtualHost">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-VirtualHost">
     <title>Virtual Host Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -506,7 +498,7 @@
       </thead>
       <tbody>
         <!--  Virtual host -->
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1001">
           <entry morerows="1">VHT-1001</entry>
           <entry>Created : <replaceable>virtualhostname</replaceable></entry>
         </row>
@@ -515,7 +507,7 @@
             <para>Indicates that a virtualhost has been created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1002">
           <entry morerows="1">VHT-1002</entry>
           <entry>Closed</entry>
         </row>
@@ -525,7 +517,7 @@
               shutdown.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1003">
           <entry morerows="1">VHT-1003</entry>
           <entry><replaceable>virtualhostname</replaceable> :
               <replaceable>delivered|received</replaceable> : <replaceable>size</replaceable> kB/s
@@ -536,7 +528,7 @@
             <para>Statistic - bytes delivered or received by the virtualhost.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1004">
           <entry morerows="1">VHT-1004</entry>
           <entry><replaceable>virtualhostname</replaceable> :
               <replaceable>delivered|received</replaceable> : <replaceable>size</replaceable> msg/s
@@ -547,7 +539,7 @@
             <para>Statistic - messages delivered or received by the virtualhost.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1005">
           <entry morerows="1">VHT-1005</entry>
           <entry>Unexpected fatal error</entry>
         </row>
@@ -557,7 +549,7 @@
               details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1006">
           <entry morerows="1">VHT-1006</entry>
           <entry>Filesystem is over <replaceable>size in %</replaceable> per cent full, enforcing flow control.</entry>
         </row>
@@ -567,7 +559,7 @@
                   when the usage of file system containing Virtualhost  message store exceeded predefined limit.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-VHT-1007">
           <entry morerows="1">VHT-1007</entry>
           <entry>Filesystem is no longer over <replaceable>size in %</replaceable> per cent full.</entry>
         </row>
@@ -580,7 +572,7 @@
       </tbody>
     </tgroup>
   </table>
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Queue">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Queue">
     <title>Queue Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -591,7 +583,7 @@
       </thead>
       <tbody>
         <!-- Queue -->
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1001">
           <entry morerows="1">QUE-1001</entry>
           <entry>Create : Owner: <replaceable>owner</replaceable>
             <replaceable>AutoDelete</replaceable> [<replaceable>Durable</replaceable>]
@@ -603,7 +595,7 @@
             <para>Indicates that a queue has been created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1002">
           <entry morerows="1">QUE-1002</entry>
           <entry>Deleted</entry>
         </row>
@@ -612,29 +604,27 @@
             <para>Indicates that a queue has been deleted.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1003">
           <entry morerows="1">QUE-1003</entry>
           <entry>Overfull : Size : <replaceable>size</replaceable> bytes, Capacity :
               <replaceable>maximumsize</replaceable></entry>
         </row>
         <row>
           <entry>
-            <para>Indicates that a queue has exceeded its permitted capacity. See <xref
-                linkend="Qpid-Producer-Flow-Control"/> for details.</para>
+            <para>Indicates that a queue has exceeded its permitted capacity. See <xref linkend="Qpid-Producer-Flow-Control"/> for details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1004">
           <entry morerows="1">QUE-1004</entry>
           <entry>Underfull : Size : <replaceable>size</replaceable> bytes, Resume Capacity :
               <replaceable>resumesize</replaceable></entry>
         </row>
         <row>
           <entry>
-            <para>Indicates that a queue has fallen to its resume capacity. See <xref
-                linkend="Qpid-Producer-Flow-Control"/> for details.</para>
+            <para>Indicates that a queue has fallen to its resume capacity. See <xref linkend="Qpid-Producer-Flow-Control"/> for details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1014">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1014">
           <entry morerows="1">QUE-1014</entry>
           <entry>Message flow to disk active : Message memory use <replaceable>size of all
             messages</replaceable> exceeds threshold <replaceable>threshold
@@ -646,7 +636,7 @@
               has exceeded thevthreshold so the flow to disk feature has been activated.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1015">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-QUE-1015">
           <entry morerows="1">QUE-1015</entry>
           <entry>Message flow to disk inactive : Message memory use <replaceable>size of all
             messages</replaceable> within threshold <replaceable>threshold
@@ -661,7 +651,7 @@
       </tbody>
     </tgroup>
   </table>
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Exchange">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Exchange">
     <title>Exchange Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -672,7 +662,7 @@
       </thead>
       <tbody>
         <!-- Exchange -->
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1001">
           <entry morerows="1">EXH-1001</entry>
           <entry>Create : [<replaceable>Durable</replaceable>] Type: <replaceable>type</replaceable>
             Name: <replaceable>exchange name</replaceable></entry>
@@ -682,7 +672,7 @@
             <para>Indicates that an exchange has been created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1002">
           <entry morerows="1">EXH-1002</entry>
           <entry>Deleted</entry>
         </row>
@@ -691,7 +681,7 @@
             <para>Indicates that an exchange has been deleted.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-EXH-1003">
           <entry morerows="1">EXH-1003</entry>
           <entry>Discarded Message : Name: <replaceable>exchange name</replaceable> Routing Key:
               <replaceable>routing key</replaceable></entry>
@@ -699,15 +689,14 @@
         <row>
           <entry>
             <para>Indicates that an exchange received a message that could not be routed to at least
-              one queue. queue has exceeded its permitted capacity. See <xref
-                linkend="Java-Broker-Concepts-Exchanges-UnroutableMessage"/> for details.</para>
+              one queue. queue has exceeded its permitted capacity. See <xref linkend="Java-Broker-Concepts-Exchanges-UnroutableMessage"/> for details.</para>
           </entry>
         </row>
       </tbody>
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Binding">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Binding">
     <title>Binding Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -717,7 +706,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BND-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BND-1001">
           <entry morerows="1">BND-1001</entry>
           <entry>Create : Arguments : <replaceable>arguments</replaceable></entry>
         </row>
@@ -726,7 +715,7 @@
             <para>Indicates that a binding has been made between an exchange and a queue.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-BND-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-BND-1002">
           <entry morerows="1">BND-1002</entry>
           <entry>Deleted</entry>
         </row>
@@ -740,7 +729,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Connection">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Connection">
     <title>Connection Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -750,7 +739,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1001">
           <entry morerows="1">CON-1001</entry>
           <entry>Open : Destination : <replaceable>target port</replaceable> : Protocol Version :
             <replaceable>protocol version</replaceable> : Client ID : <replaceable>clientid</replaceable> :
@@ -763,7 +752,7 @@
               each time it learns more about the client as the connection is negotiated.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1002">
           <entry morerows="1">CON-1002</entry>
           <entry>Close</entry>
         </row>
@@ -774,7 +763,7 @@
               error. </para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1003">
           <entry morerows="1">CON-1003</entry>
           <entry>Closed due to inactivity</entry>
         </row>
@@ -784,7 +773,7 @@
               a heartbeat for too long and is therefore closed as being inactive. </para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1004">
           <entry morerows="1">CON-1004</entry>
           <entry>Connection dropped</entry>
         </row>
@@ -795,7 +784,7 @@
             abruptly terminated.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1005">
           <entry morerows="1">CON-1005</entry>
           <entry>Client version <replaceable>version</replaceable> logged by validation</entry>
         </row>
@@ -805,7 +794,7 @@
               that is configured to be logged.  This feature may help teams manage software currency.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1006">
           <entry morerows="1">CON-1006</entry>
           <entry>Client version <replaceable>version</replaceable> rejected by validation</entry>
         </row>
@@ -815,7 +804,7 @@
               that is configured to be rejected.  This feature may help manage software currency.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CON-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CON-1007">
           <entry morerows="1">CON-1007</entry>
           <entry>Connection close initiated by operator</entry>
         </row>
@@ -830,7 +819,7 @@
   </table>
 
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Channel">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Channel">
     <title>Channel Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -840,7 +829,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1001">
           <entry morerows="1">CHN-1001</entry>
           <entry>Create</entry>
         </row>
@@ -850,7 +839,7 @@
               created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1002">
           <entry morerows="1">CHN-1002</entry>
           <entry>Flow Started</entry>
         </row>
@@ -859,7 +848,7 @@
             <para>Indicates message flow to a session has begun.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1003">
           <entry morerows="1">CHN-1003</entry>
           <entry>Close</entry>
         </row>
@@ -868,7 +857,7 @@
             <para>Indicates that a channel has been closed.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1004">
           <entry morerows="1">CHN-1004</entry>
           <entry>Prefetch Size (bytes) <replaceable>size</replaceable> : Count <replaceable>number
               of messages</replaceable></entry>
@@ -878,7 +867,7 @@
             <para>Indicates the prefetch size in use by a channel.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1005">
           <entry morerows="1">CHN-1005</entry>
           <entry>Flow Control Enforced (Queue <replaceable>queue name</replaceable>)</entry>
         </row>
@@ -886,21 +875,19 @@
           <entry>
             <para>Indicates that producer flow control has been imposed on a channel owning to
               excessive queue depth in the indicated queue. Produces using the channel will be
-              requested to pause the sending of messages. See <xref
-                linkend="Qpid-Producer-Flow-Control"/> for more details.</para>
+              requested to pause the sending of messages. See <xref linkend="Qpid-Producer-Flow-Control"/> for more details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1006">
           <entry morerows="1">CHN-1006</entry>
           <entry>Flow Control Removed</entry>
         </row>
         <row>
           <entry>
-            <para>Indicates that producer flow control has been removed from a channel. See <xref
-                linkend="Qpid-Producer-Flow-Control"/> for more details.</para>
+            <para>Indicates that producer flow control has been removed from a channel. See <xref linkend="Qpid-Producer-Flow-Control"/> for more details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1007">
           <entry morerows="1">CHN-1007</entry>
           <entry>Open Transaction : <replaceable>time</replaceable> ms</entry>
         </row>
@@ -911,7 +898,7 @@
               more details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1008">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1008">
           <entry morerows="1">CHN-1008</entry>
           <entry>Idle Transaction : <replaceable>time</replaceable> ms</entry>
         </row>
@@ -922,7 +909,7 @@
               more details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1009">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1009">
           <entry morerows="1">CHN-1009</entry>
           <entry>Discarded message : <replaceable>message number</replaceable> as no alternate
             exchange configured for queue : <replaceable>queue name</replaceable>{1} routing key :
@@ -931,13 +918,11 @@
         <row>
           <entry>
             <para>Indicates that a channel has discarded a message as the maximum delivery count has
-              been exceeded but the queue defines no alternate exchange. See <xref
-                linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"
-              /> for more details. Note that <replaceable>message number</replaceable> is an
+              been exceeded but the queue defines no alternate exchange. See <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"/> for more details. Note that <replaceable>message number</replaceable> is an
               internal message reference.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1010">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1010">
           <entry morerows="1">CHN-1010</entry>
           <entry>Discarded message : <replaceable>message number</replaceable> as no binding on
             alternate exchange : <replaceable>exchange name</replaceable></entry>
@@ -945,13 +930,11 @@
         <row>
           <entry>
             <para>Indicates that a channel has discarded a message as the maximum delivery count has
-              been exceeded but the queue's alternate exchange has no binding to a queue. See <xref
-                linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"
-              /> for more details. Note that <replaceable>message number</replaceable> is an
+              been exceeded but the queue's alternate exchange has no binding to a queue. See <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Maximum-Delivery-Count"/> for more details. Note that <replaceable>message number</replaceable> is an
               internal message reference.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1011">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1011">
           <entry morerows="1">CHN-1011</entry>
           <entry>Message : <replaceable>message number</replaceable> moved to dead letter queue :
               <replaceable>queue name</replaceable></entry>
@@ -962,7 +945,7 @@
             </para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1012">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1012">
           <entry morerows="1">CHN-1012</entry>
           <entry>Flow Control Ignored. Channel will be closed.</entry>
         </row>
@@ -972,7 +955,7 @@
             </para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1013">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CHN-1013">
           <entry morerows="1">CHN-1013</entry>
           <entry>Uncommitted transaction contains <replaceable>size</replaceable> bytes of incoming message data.</entry>
         </row>
@@ -985,7 +968,7 @@
       </tbody>
     </tgroup>
   </table>
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Subscription">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Subscription">
     <title>Subscription Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -995,7 +978,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1001">
           <entry morerows="1">SUB-1001</entry>
           <entry>Create : [<replaceable>Durable</replaceable>] Arguments :
               <replaceable>arguments</replaceable></entry>
@@ -1006,7 +989,7 @@
               has been created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1002">
           <entry morerows="1">SUB-1002</entry>
           <entry>Close</entry>
         </row>
@@ -1015,7 +998,7 @@
             <para>Indicates that a subscription has been closed.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-SUB-1003">
           <entry morerows="1">SUB-1003</entry>
           <entry>SUB-1003 : Suspended for <replaceable>time</replaceable> ms</entry>
         </row>
@@ -1034,7 +1017,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-MessageStore">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-MessageStore">
     <title>Message Store Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -1044,7 +1027,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1001">
           <entry morerows="1">MST-1001</entry>
           <entry>Created</entry>
         </row>
@@ -1055,7 +1038,7 @@
               headers.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1002">
           <entry morerows="1">MST-1002</entry>
           <entry>Store location : <replaceable>path</replaceable></entry>
         </row>
@@ -1065,7 +1048,7 @@
               location of the message store.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1003">
           <entry morerows="1">MST-1003</entry>
           <entry>Closed</entry>
         </row>
@@ -1074,7 +1057,7 @@
             <para>Indicates that the message store has been closed.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1004">
           <entry morerows="1">MST-1004</entry>
           <entry>Recovery Start</entry>
         </row>
@@ -1083,7 +1066,7 @@
             <para>Indicates that message recovery has begun.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1005">
           <entry morerows="1">MST-1005</entry>
           <entry>Recovered <replaceable>number of messages</replaceable> messages.</entry>
         </row>
@@ -1093,7 +1076,7 @@
               store.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1006">
           <entry morerows="1">MST-1006</entry>
           <entry>Recovered Complete</entry>
         </row>
@@ -1102,7 +1085,7 @@
             <para>Indicates that the message recovery is concluded.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1007">
           <entry morerows="1">MST-1007</entry>
           <entry>Store Passivated</entry>
         </row>
@@ -1113,17 +1096,16 @@
               state.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1008">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1008">
           <entry morerows="1">MST-1008</entry>
           <entry>Store overfull, flow control will be enforced</entry>
         </row>
         <row>
           <entry>
-            <para>The store has breached is maximum configured size. See <xref
-                linkend="Qpid-Producer-Flow-Control"/> for details.</para>
+            <para>The store has breached is maximum configured size. See <xref linkend="Qpid-Producer-Flow-Control"/> for details.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-1009">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-1009">
           <entry morerows="1">MST-1009</entry>
           <entry>Store overfull condition cleared</entry>
         </row>
@@ -1138,7 +1120,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-TransactionStore">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-TransactionStore">
     <title>Transaction Store Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -1148,7 +1130,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1001">
           <entry morerows="1">TXN-1001</entry>
           <entry>Created</entry>
         </row>
@@ -1159,7 +1141,7 @@
               on a queue.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1002">
           <entry morerows="1">TXN-1002</entry>
           <entry>Store location : <replaceable>path</replaceable></entry>
         </row>
@@ -1169,7 +1151,7 @@
               the location of the store.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1003">
           <entry morerows="1">TXN-1003</entry>
           <entry>Closed</entry>
         </row>
@@ -1178,7 +1160,7 @@
             <para>Indicates that the transaction store has been closed.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1004">
           <entry morerows="1">TXN-1004</entry>
           <entry>Recovery Start</entry>
         </row>
@@ -1187,7 +1169,7 @@
             <para>Indicates that transaction recovery has begun.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-MST-TXN">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-MST-TXN">
           <entry morerows="1">TXN-1005</entry>
           <entry>Recovered <replaceable>number</replaceable> messages for queue
               <replaceable>name</replaceable>.</entry>
@@ -1198,7 +1180,7 @@
               given queue.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-TXN-1006">
           <entry morerows="1">TXN-1006</entry>
           <entry>Recovered Complete</entry>
         </row>
@@ -1211,7 +1193,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-ConfigurationStore">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-ConfigurationStore">
     <title>Configuration Store Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -1221,7 +1203,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1001">
           <entry morerows="1">CFG-1001</entry>
           <entry>Created</entry>
         </row>
@@ -1232,7 +1214,7 @@
               and bindings.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1002">
           <entry morerows="1">CFG-1002</entry>
           <entry>Store location : <replaceable>path</replaceable></entry>
         </row>
@@ -1242,7 +1224,7 @@
               for the location of the store.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1003">
           <entry morerows="1">CFG-1003</entry>
           <entry>Closed</entry>
         </row>
@@ -1251,7 +1233,7 @@
             <para>Indicates that the configuration store has been closed.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1004">
           <entry morerows="1">CFG-1004</entry>
           <entry>Recovery Start</entry>
         </row>
@@ -1260,7 +1242,7 @@
             <para>Indicates that configuration recovery has begun.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-CFG-1005">
           <entry morerows="1">CFG-1005</entry>
           <entry>Recovered Complete</entry>
         </row>
@@ -1273,7 +1255,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-HA">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-HA">
     <title>HA Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -1283,7 +1265,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1001">
           <entry morerows="1">HA-1001</entry>
           <entry>Created</entry>
         </row>
@@ -1292,7 +1274,7 @@
             <para>This HA node has been created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1002">
           <entry morerows="1">HA-1002</entry>
           <entry>Deleted</entry>
         </row>
@@ -1301,7 +1283,7 @@
             <para>This HA node has been deleted</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1003">
           <entry morerows="1">HA-1003</entry>
           <entry>Added : Node : '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>)</entry>
@@ -1311,7 +1293,7 @@
             <para>A new node has been added to the group.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1004">
           <entry morerows="1">HA-1004</entry>
           <entry>Removed : Node : '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>)</entry>
@@ -1321,7 +1303,7 @@
             <para>The node has been removed from the group. This removal is permanent.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1005">
           <entry morerows="1">HA-1005</entry>
           <entry>Joined : Node : '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>)</entry>
@@ -1332,7 +1314,7 @@
               restarted, or a network problem may have been resolved.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1006">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1006">
           <entry morerows="1">HA-1006</entry>
           <entry>Left : Node : '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>)</entry>
@@ -1344,7 +1326,7 @@
               member of the group.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1007">
           <entry morerows="1">HA-1007</entry>
           <entry>HA-1007 : Master transfer requested : to '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>)</entry>
@@ -1354,7 +1336,7 @@
             <para>Indicates that a master transfer operation has been requested.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1008">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1008">
           <entry morerows="1">HA-1008</entry>
           <entry>HA-1008 : Intruder detected : Node '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>)</entry>
@@ -1365,7 +1347,7 @@
               go into the ERROR state in response to the condition.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1009">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1009">
           <entry morerows="1">HA-1009</entry>
           <entry>HA-1009 : Insufficient replicas contactable</entry>
         </row>
@@ -1375,7 +1357,7 @@
               contact in order to complete transactions.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1010">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1010">
           <entry morerows="1">HA-1010</entry>
           <entry>HA-1010 : Role change reported: Node : '<replaceable>name</replaceable>'
               (<replaceable>host:port</replaceable>) : from <replaceable>role</replaceable> to
@@ -1386,7 +1368,7 @@
             <para>Indicates that the node has changed role within the group.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1011">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1011">
           <entry morerows="1">HA-1011</entry>
           <entry>HA-1011 : Minimum group size : <replaceable>new group size</replaceable></entry>
         </row>
@@ -1396,7 +1378,7 @@
               changed.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1012">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1012">
           <entry morerows="1">HA-1012</entry>
           <entry>HA-1012 : Priority : <replaceable>priority</replaceable></entry>
         </row>
@@ -1406,7 +1388,7 @@
               cannot be elected master.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1013">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1013">
           <entry morerows="1">HA-1013</entry>
           <entry>HA-1013 : Designated primary : <replaceable>true|false</replaceable></entry>
         </row>
@@ -1416,7 +1398,7 @@
               node groups only.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-HA-1014">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-HA-1014">
           <entry morerows="1">HA-1014</entry>
           <entry>HA-1014 : Diverged transactions discarded</entry>
         </row>
@@ -1438,7 +1420,7 @@
     </tgroup>
   </table>
 
-  <table pgwide="1" id="Java-Broker-Appendix-Operation-Logging-Message-List-Port">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Operation-Logging-Message-List-Port">
     <title>Port Log Messages</title>
     <tgroup cols="2">
       <thead>
@@ -1448,7 +1430,7 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1001">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1001">
           <entry morerows="1">PRT-1001</entry>
           <entry>Create</entry>
         </row>
@@ -1457,7 +1439,7 @@
             <para>Port has been created.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1002">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1002">
           <entry morerows="1">PRT-1002</entry>
           <entry>Open</entry>
         </row>
@@ -1466,7 +1448,7 @@
             <para>Port has been open</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1003">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1003">
           <entry morerows="1">PRT-1003</entry>
           <entry>Close</entry>
         </row>
@@ -1475,7 +1457,7 @@
             <para>Port has been closed</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1004">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1004">
           <entry morerows="1">PRT-1004</entry>
           <entry>Connection count <replaceable>number</replaceable> within <replaceable>warn limit</replaceable> % of maximum <replaceable>limit</replaceable>
           </entry>
@@ -1485,7 +1467,7 @@
             <para>Warns that number of open connections approaches maximum allowed limit</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1005">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1005">
           <entry morerows="1">PRT-1005</entry>
           <entry>Connection from <replaceable>peer</replaceable> rejected. Maximum connection count (<replaceable>limit</replaceable>) for this port already reached.</entry>
         </row>
@@ -1494,7 +1476,7 @@
             <para>Connection from given host is rejected because of reaching the maximum allowed limit</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1007">
+        <row xml:id="Java-Broker-Appendix-Operation-Logging-Message-PRT-1007">
           <entry morerows="1">PRT-1007</entry>
           <entry>Unsupported protocol header received, replying with <replaceable>AMQP version</replaceable></entry>
         </row>

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml?rev=1726649&r1=1726648&r2=1726649&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-Queue-Alerts.xml Mon Jan 25 16:02:09 2016
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE entities [
-<!ENTITY %  entities SYSTEM  "commonEntities.xml">
-%entities;
-]>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +20,7 @@
 
 -->
 
-<appendix id="Java-Broker-Appendix-Queue-Alerts">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Java-Broker-Appendix-Queue-Alerts">
   <title>Queue Alerts</title>
   <para>The Broker supports a variety of queue alerting thresholds. Once configured on a queue,
     these limits will be periodically written to the log if these limits are breached, until the
@@ -38,7 +34,7 @@ INFO [default:VirtualHostHouseKeepingTas
   </screen>
   <para>Note that queue alerts are <emphasis>soft</emphasis> in nature; breaching the limit will
     merely cause the alerts to be generated but messages will still be accepted to the queue.</para>
-  <table pgwide="1" id="Java-Broker-Appendix-Queue-Alerts-Alerting-Messages">
+  <table pgwide="1" xml:id="Java-Broker-Appendix-Queue-Alerts-Alerting-Messages">
     <title>Queue Alerts</title>
     <tgroup cols="2">
       <thead>

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml?rev=1726649&r1=1726648&r2=1726649&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml (original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml Mon Jan 25 16:02:09 2016
@@ -1,8 +1,4 @@
 <?xml version="1.0"?>
-<!DOCTYPE entities [
-<!ENTITY %  entities SYSTEM  "commonEntities.xml">
-%entities;
-]>
 <!--
 
  Licensed to the Apache Software Foundation (ASF) under one
@@ -24,13 +20,11 @@
 
 -->
 
-<appendix id="Java-Broker-Appendix-System-Properties">
+<appendix xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="Java-Broker-Appendix-System-Properties">
   <title>System Properties</title>
   <para>The following table describes the Java system properties used by the Broker to control
     various optional behaviours.</para>
-  <para>The preferred method of enabling these system properties is using the <link
-      linkend="Java-Broker-Appendix-Environment-Variables-Qpid-Opts"
-      ><literal>QPID_OPTS</literal></link> environment variable described in the previous
+  <para>The preferred method of enabling these system properties is using the <link linkend="Java-Broker-Appendix-Environment-Variables-Qpid-Opts"><literal>QPID_OPTS</literal></link> environment variable described in the previous
     section.</para>
   <table pgwide="1">
     <title>System properties</title>
@@ -43,35 +37,33 @@
         </row>
       </thead>
       <tbody>
-        <row id="Java-Broker-Appendix-System-Properties-Broker-Heartbeat-Timeout-Factor">
+        <row xml:id="Java-Broker-Appendix-System-Properties-Broker-Heartbeat-Timeout-Factor">
           <entry>qpid.broker_heartbeat_timeout_factor</entry>
           <entry>2</entry>
           <entry>Factor to determine the maximum length of that may elapse between heartbeats being
             received from the peer before a connection is deemed to have been broken.</entry>
         </row>
-        <row id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Exchange-Suffix">
+        <row xml:id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Exchange-Suffix">
           <entry>qpid.broker_dead_letter_exchange_suffix</entry>
           <entry>_DLE</entry>
-          <entry>Used with the <xref
-              linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues"/>
+          <entry>Used with the <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues"/>
             feature. Governs the suffix used when generating a name for a Dead Letter
             Exchange.</entry>
         </row>
-        <row id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Queue-Suffix">
+        <row xml:id="Java-Broker-Appendix-System-Properties-Broker-Dead-Letter-Queue-Suffix">
           <entry>qpid.broker_dead_letter_queue_suffix</entry>
           <entry>_DLQ</entry>
-          <entry>Used with the <xref
-              linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues"/>
+          <entry>Used with the <xref linkend="Java-Broker-Runtime-Handling-Undeliverable-Messages-Dead-Letter-Queues"/>
             feature. Governs the suffix used when generating a name for a Dead Letter Queue.</entry>
         </row>
-        <row id="Java-Broker-Appendix-System-Properties-Broker-Status-Updates">
+        <row xml:id="Java-Broker-Appendix-System-Properties-Broker-Status-Updates">
           <entry>qpid.broker_status_updates</entry>
           <entry>true</entry>
           <entry>
             <para>If set true, the Broker will produce operational logging messages.</para>
           </entry>
         </row>
-        <row id="Java-Broker-Appendix-System-Properties-Broker-Disabled-Features">
+        <row xml:id="Java-Broker-Appendix-System-Properties-Broker-Disabled-Features">
           <entry>qpid.broker_disabled_features</entry>
           <entry>none</entry>
           <entry>



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