Author: jonathan
Date: Fri Jun 11 13:09:06 2010
New Revision: 953690
URL: http://svn.apache.org/viewvc?rev=953690&view=rev
Log:
Multiple fixes to source files.
Modified:
qpid/trunk/qpid/doc/book/src/ACL.xml
qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml
qpid/trunk/qpid/doc/book/src/Add-New-Users.xml
qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml
qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml
qpid/trunk/qpid/doc/book/src/Getting-Started.xml
qpid/trunk/qpid/doc/book/src/LVQ.xml
qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
qpid/trunk/qpid/doc/book/src/Qpid-Management-Framework.xml
qpid/trunk/qpid/doc/book/src/Running-CPP-Broker.xml
qpid/trunk/qpid/doc/book/src/Using-Broker-Federation.xml
qpid/trunk/qpid/doc/book/src/queue-state-replication.xml
qpid/trunk/qpid/doc/book/src/schemas.xml
Modified: qpid/trunk/qpid/doc/book/src/ACL.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/ACL.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/ACL.xml (original)
+++ qpid/trunk/qpid/doc/book/src/ACL.xml Fri Jun 11 13:09:06 2010
@@ -35,7 +35,8 @@
supported in the following brokers:
</para>
- <table><title/><tgroup cols="2">
+ <table><title>ACL Support in Qpid Broker Versions</title>
+ <tgroup cols="2">
<thead>
<row>
<entry>
@@ -315,7 +316,9 @@ acl deny all all
connection not on management functions:
</para>
- <table><title/><tgroup cols="5">
+ <table>
+ <title>Mapping ACL Traps</title>
+ <tgroup cols="5">
<thead>
<row>
<entry>
@@ -671,7 +674,9 @@ acl deny all all
schema it will be mapped in ACL file as follows
</para>
- <table><title/><tgroup cols="3">
+ <table>
+ <title>Mapping Management Actions to ACL</title>
+ <tgroup cols="3">
<thead>
<row>
<entry>
Modified: qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml (original)
+++ qpid/trunk/qpid/doc/book/src/AMQP-Compatibility.xml Fri Jun 11 13:09:06 2010
@@ -105,7 +105,7 @@
</variablelist>
<table>
- <title/>
+ <title>AMQP Version Support by Qpid Release</title>
<tgroup cols="6">
<tbody>
<row>
@@ -463,7 +463,7 @@
Above table represented in another format.
</para>
<table>
- <title/>
+ <title>AMQP Version Support - alternate format</title>
<tgroup cols="5">
<tbody>
<row>
Modified: qpid/trunk/qpid/doc/book/src/Add-New-Users.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Add-New-Users.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Add-New-Users.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Add-New-Users.xml Fri Jun 11 13:09:06 2010
@@ -201,7 +201,8 @@ martin:X03MO1qnZdYdgyfeuILPmQ==
about the SASL module they support and not the type of
PrincipalDatabase. So I client that understands CRAM-MD5 will
work correctly with a Plain and Base64MD5 PrincipalDatabase.
- </para><table><title/><tgroup cols="2">
+ </para><table>
+ <title>File Format and Principal Database</title><tgroup cols="2">
<tbody>
<row>
<entry>
Modified: qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Binding-URL-Format.xml Fri Jun 11 13:09:06 2010
@@ -43,7 +43,7 @@
is required for the server to instantiate an exchange.
</para><para>
There are a number of options that are currently defined:
- </para><table><title/><tgroup cols="3">
+ </para><table><title>Binding URL Options</title><tgroup cols="3">
<tbody>
<row>
<entry>
Modified:
qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
(original)
+++ qpid/trunk/qpid/doc/book/src/Cheat-Sheet-for-configuring-Queue-Options.xml
Fri Jun 11 13:09:06 2010
@@ -166,7 +166,7 @@
ignored.
</para></listitem>
</itemizedlist><para>
- A fully worked <xref linkend="qpid_LVQ-Example"/> can be found here
+ A fully worked <xref linkend="LVQ-Examplesource"/> can be found
here
</para>
<!--h3--></section>
<section role="h3"
id="CheatSheetforconfiguringQueueOptions-Settingadditionalbehaviors"><title>
@@ -211,7 +211,7 @@
This option is used to determine whether enqueue/dequeue events
representing changes made to queue state are generated. These
events can then be processed by plugins such as that used for
- <xref linkend="qpid_queue-state-replication"/>.
+ <xref linkend="queue-state-replication"/>.
</para><para>
Example:
</para>
Modified: qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Connection-URL-Format.xml Fri Jun 11 13:09:06
2010
@@ -107,7 +107,9 @@ amqp://guest:gu...@client1/development?b
<title> Options</title>
- <table><title/><tgroup cols="3">
+ <table>
+ <title>Connection URL Options</title>
+ <tgroup cols="3">
<tbody>
<row>
<entry>
@@ -182,7 +184,8 @@ brokerlist='<broker url>[;<brok
not have to be re-written. The result is if there is no
transport, 'tcp' is assumed and the default AMQP port of 5672 is
used if no port is specified.
- </para><table><title/><tgroup cols="1">
+ </para><table><title>Broker URL- Transport</title>
+ <tgroup cols="1">
<tbody>
<row>
<entry>
@@ -207,7 +210,9 @@ brokerlist='<broker url>[;<brok
support for further transports the
''client.transportTransportConnection'' class needs updating
along with the parsing to handle the transport.
- </para><table><title/><tgroup cols="3">
+ </para>
+ <table><title>Broker URL - Connection Options</title>
+ <tgroup cols="3">
<tbody>
<row>
<entry>
@@ -283,7 +288,7 @@ failover='<method>[?<options>
used for defining further methods.
</para><para>
Currently implemented failover methods.
- </para><table><title/><tgroup cols="2">
+ </para><table><title>Broker List - Failover Options</title><tgroup
cols="2">
<tbody>
<row>
<entry>
@@ -332,7 +337,7 @@ failover='<method>[?<options>
</para>
<table>
- <title> Options</title>
+ <title>Broker List - Failover Options</title>
<tgroup cols="3">
<tbody>
<row>
Modified: qpid/trunk/qpid/doc/book/src/Getting-Started.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Getting-Started.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Getting-Started.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Getting-Started.xml Fri Jun 11 13:09:06 2010
@@ -24,7 +24,7 @@
<para>To get started with Apache Qpid, follow the steps below.</para>
<orderedlist>
-<listitem><para><xref linkend="chapter-Download"/></para></listitem>
+<listitem><para>Download Apache Qpid.</para></listitem>
<listitem>
<para>Start a broker. </para>
<itemizedlist>
Modified: qpid/trunk/qpid/doc/book/src/LVQ.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/LVQ.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/LVQ.xml (original)
+++ qpid/trunk/qpid/doc/book/src/LVQ.xml Fri Jun 11 13:09:06 2010
@@ -153,7 +153,7 @@ Receiving Data:last
</programlisting>
<!--h2--></section>
<section role="h2" id="LVQ-Examplesource"><title>
- Example source
+ LVQ Program Example
</title>
<programlisting>
Modified: qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Programming-In-Apache-Qpid.xml Fri Jun 11
13:09:06 2010
@@ -2943,8 +2943,8 @@ producer.send(m);
</section>
- <section id="section-JMS-Loggin">
- <title>JMS Client Loggin</title>
+ <section id="section-JMS-Logging">
+ <title>JMS Client Logging</title>
<para>The JMS Client logging is handled using <ulink
url="http://www.slf4j.org/";>SLF4J</ulink>. A user can place a slf4j binding of
their choice in the classpath and configure the respective logging mechanism to
suit their needs. Ex bindings include log4j, jdk1.4 logging ..etc</para>
<para>Following is an example on how to configure the client logging
with the log4j binding.</para>
@@ -2954,8 +2954,9 @@ producer.send(m);
<para>If using the log4j binding please ensure to set the log level for
org.apache.qpid explicitly. Otherwise log4j will default to DEBUG which will
degrade performance considerably due to excessive logging. Recommended logging
level for production is WARN.</para>
<example>
- <para>You could place the snippet below in a log4j.properties file and
place it in the classpath or explicitly specify it using the
-Dlog4j.configuration property. The following configures the qpid client to log
at the WARN level</para>
- <programlisting><![CDATA[
+ <title>log4j Logging Properties</title>
+ <para>You could place the snippet below in a log4j.properties file and
place it in the classpath or explicitly specify it using the
-Dlog4j.configuration property. The following configures the qpid client to log
at the WARN level</para>
+ <programlisting><![CDATA[
log4j.logger.org.apache.qpid=WARN, console
log4j.additivity.org.apache.qpid=false
@@ -2963,7 +2964,7 @@ log4j.appender.console=org.apache.log4j.
log4j.appender.console.Threshold=all
log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n
- ]]></programlisting>
+]]></programlisting>
</example>
</section>
</chapter>
Modified: qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml (original)
+++ qpid/trunk/qpid/doc/book/src/QMF-Python-Console-Tutorial.xml Fri Jun 11
13:09:06 2010
@@ -84,7 +84,7 @@
network. Qpid can be downloaded as source from Apache, is
packaged with a number of Linux distributions, and can be
purchased from commercial vendors that use Qpid. Please see
- <xref linkend="chapter-Download"/> for
+ <ulink
url="http://qpid.apache.org";>http://qpid.apache.org</ulink>for
information as to where to get Qpid Messaging.
</para><para>
Qpid Messaging includes a message broker (qpidd) which typically
@@ -483,7 +483,7 @@ OK
methods. Any number of these methods may be overridden by the
console application. Any method that is not overridden defaults
to a null handler which takes no action when invoked.
- </para><table><title/><tgroup cols="3">
+ </para><table><title>QMF Python Console Class Methods</title><tgroup
cols="3">
<tbody>
<row>
<entry>
Modified: qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml
(original)
+++ qpid/trunk/qpid/doc/book/src/Qpid-Interoperability-Documentation.xml Fri
Jun 11 13:09:06 2010
@@ -48,7 +48,7 @@
This table list the various SASL mechanisms that each component
supports. The version listed shows when this
functionality was added to the product.
- </para><table><title/><tgroup cols="7">
+ </para><table><title>SASL Mechanism Support</title><tgroup cols="7">
<tbody>
<row>
<entry>
@@ -255,7 +255,7 @@
<para>
There have been some custom mechanisms added to our
implementations.
- </para><table><title/><tgroup cols="3">
+ </para><table><title>SASL Custom Mechanisms</title><tgroup cols="3">
<tbody>
<row>
<entry>
Modified: qpid/trunk/qpid/doc/book/src/Qpid-Management-Framework.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Qpid-Management-Framework.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Qpid-Management-Framework.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Qpid-Management-Framework.xml Fri Jun 11
13:09:06 2010
@@ -242,7 +242,7 @@
</para><para>
The XML syntax for <property> and <statistic> have
the following XML-attributes:
- </para><table><title/><tgroup cols="4">
+ </para><table><title>XML Attributes for QMF Properties and
Statistics</title><tgroup cols="4">
<tbody>
<row>
<entry>
@@ -475,7 +475,7 @@
data types. The data types are based on the rich data typing
system provided by the AMQP messaging protocol. The following
table describes the data types available for QMF:
- </para><table><title/><tgroup cols="2">
+ </para><table><title>QMF Datatypes</title><tgroup cols="2">
<tbody>
<row>
<entry>
@@ -638,7 +638,7 @@
attributes of different types. The following table enumerates the
types available in the XML format, which QMF types they map to,
and other special handling that occurs.
- </para><table><title/><tgroup cols="4">
+ </para><table><title>XML Schema Mapping for QMF Types</title><tgroup
cols="4">
<tbody>
<row>
<entry>
Modified: qpid/trunk/qpid/doc/book/src/Running-CPP-Broker.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Running-CPP-Broker.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Running-CPP-Broker.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Running-CPP-Broker.xml Fri Jun 11 13:09:06 2010
@@ -156,19 +156,8 @@ log-to-syslog=yes
with any client that uses the same AMQP version. When running the
C</emphasis>+ broker, it is highly recommended to run AMQP 0-10.
</para><para>
- Note that JMS also works with the C++ broker. For more details on
- using the Java client refer to these pages:
- </para><itemizedlist>
- <listitem><para>
- <xref linkend="How-to-Use-JNDI"/>
- </para></listitem>
- <listitem><para>
- <xref linkend="qpid_URL-Formats"/>
- </para></listitem>
- <listitem><para>
- <xref linkend="qpid_Example-Classes"/>
- </para></listitem>
- </itemizedlist>
+ Note that JMS also works with the C++ broker.
+ </para>
<!--h3--></section>
<!--h2--></section>
<section role="h2" id="RASC-Authentication"><title>
Modified: qpid/trunk/qpid/doc/book/src/Using-Broker-Federation.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Using-Broker-Federation.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/Using-Broker-Federation.xml (original)
+++ qpid/trunk/qpid/doc/book/src/Using-Broker-Federation.xml Fri Jun 11
13:09:06 2010
@@ -494,7 +494,7 @@ Options:
<para>
There are several transport options available for the federation
link:
- </para><table><title/><tgroup cols="2">
+ </para><table><title>Transport Options for Federation</title><tgroup
cols="2">
<tbody>
<row>
<entry>
Modified: qpid/trunk/qpid/doc/book/src/queue-state-replication.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/queue-state-replication.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/queue-state-replication.xml (original)
+++ qpid/trunk/qpid/doc/book/src/queue-state-replication.xml Fri Jun 11
13:09:06 2010
@@ -20,9 +20,9 @@
-->
-<section>
+<section id="queue-state-replication">
<title>
- queue state replication
+ Queue State Replication
</title>
<section role="h2"
id="queuestatereplication-AsynchronousReplicationofQueueState">
Modified: qpid/trunk/qpid/doc/book/src/schemas.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/schemas.xml?rev=953690&r1=953689&r2=953690&view=diff
==============================================================================
--- qpid/trunk/qpid/doc/book/src/schemas.xml (original)
+++ qpid/trunk/qpid/doc/book/src/schemas.xml Fri Jun 11 13:09:06 2010
@@ -21,6 +21,9 @@
-->
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0";>
+ <uri resource="Programming-In-Apache-Qpid.xml" typeId="DocBook"/>
+ <uri resource="queue-state-replication.xml" typeId="DocBook"/>
+ <uri resource="AMQP-Messaging-Broker-Java-Book.xml" typeId="DocBook"/>
<uri resource="High-Level-API.xml" typeId="DocBook"/>
<uri resource="High-Level-API.xml" typeId="DocBook"/>
<uri resource="Java-JMS-Selector-Syntax.xml" typeId="DocBook"/>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
