Author: kwall
Date: Sat Jan 2 23:19:50 2016
New Revision: 1722678
URL: http://svn.apache.org/viewvc?rev=1722678&view=rev
Log:
QPID-6961: [Java Docbook] Rationalise cross docbook links to make publishing to
q.a.o more straightforward
Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
qpid/java/trunk/doc/pom.xml
Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
---
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
Sat Jan 2 23:19:50 2016
@@ -463,7 +463,7 @@
<title>Client failover</title>
<para>As mentioned above, the clients need to be able to find the location
of the active
virtualhost within the group.</para>
- <para>Clients can do this using a static technique, for example ,
utilising the <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBookClientConectionUrl}">failover feature of the Qpid
connection url</link>
+ <para>Clients can do this using a static technique, for example ,
utilising the <link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsClient08Book}JMS-Client-0-8-Connection-URL.html">failover
feature of the Qpid connection url</link>
where the client has a list of all the nodes, and tries each node in
sequence until it
discovers the node with the active virtualhost.</para>
<para>Another possibility is a dynamic technique utilising a proxy or
Virtual IP (VIP). These
Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
--- qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
(original)
+++ qpid/java/trunk/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml Sat
Jan 2 23:19:50 2016
@@ -26,7 +26,7 @@
<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="http://www.amqp.org";> Advanced Message Queuing Protocol
(AMQP)</link>. The Java
Broker is actually one of two message brokers provided by the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="http://qpid.apache.org";>Apache Qpid project</link>: the Java Broker
and the C++
Broker.</para>
- <para>This document relates to the Java Broker. The <link
xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="http://x.y.x";>C++ Broker
is
+ <para>This document relates to the Java Broker. The <link
xmlns:xlink="http://www.w3.org/1999/xlink"; xlink:href="${qpidCppBook}">C++
Broker is
described separately</link>.</para>
<para><emphasis>Headline features</emphasis></para>
<itemizedlist mark="circle">
Modified:
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
---
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
(original)
+++
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
Sat Jan 2 23:19:50 2016
@@ -237,7 +237,7 @@
-Dmax_prefetch=1
</programlisting>
<para> The prefetch can be also be adjusted on a per connection basis by
adding a
- <varname>maxprefetch</varname> value to the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBookClientConectionUrl}">Connection URLs</link>
+ <varname>maxprefetch</varname> value to the <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsClient08Book}JMS-Client-0-8-Connection-URL.html">Connection
URLs</link>
</para>
<programlisting>
amqp://guest:guest@client1/development?maxprefetch='1'&brokerlist='tcp://localhost:5672'
Modified:
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
---
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
(original)
+++
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
Sat Jan 2 23:19:50 2016
@@ -70,7 +70,7 @@
<para>
an instance of <literal>AMQQueue</literal> from a
<literal>Reference</literal> containing reference
address (<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJdkDocUrl}javax/naming/RefAddr.html">javax.naming.RefAddr</link>)
- <literal>address</literal> with content set to either <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBook}">Address</link> or
+ <literal>address</literal> with content set to either <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidProgrammingBook}">Address</link> or
<link linkend="JMS-Client-0-8-Binding-URL">Binding URL</link>.
</para>
</listitem>
@@ -78,7 +78,7 @@
<para>
an instance of <literal>AMQTopic</literal> from a
<literal>Reference</literal> containing reference
address (<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${oracleJdkDocUrl}javax/naming/RefAddr.html">javax.naming.RefAddr</link>)
- <literal>address</literal> with content set to either <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBook}">Address</link> or
+ <literal>address</literal> with content set to either <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidProgrammingBook}">Address</link> or
<link linkend="JMS-Client-0-8-Binding-URL">Binding URL</link>.
</para>
</listitem>
@@ -87,7 +87,7 @@
<para>
For <literal>AMQQueue</literal> and <literal>AMQTopic</literal>
prefix <literal>BURL:</literal> need
to be specified for <link linkend="JMS-Client-0-8-Binding-URL">Binding
URL</link>. Otherwise, client will try
- to parse content using <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBook}">Address</link> format.
+ to parse content using <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidProgrammingBook}">Address</link> format.
</para>
</note>
</para>
Modified:
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
(original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
Sat Jan 2 23:19:50 2016
@@ -24,7 +24,7 @@
<title>Binding URL</title>
<para> The <emphasis>Binding URL</emphasis> syntax for addressing<footnote>
- <para>The client also supports the ADDR format. This is documented in
<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBook}">Programming in Apache Qpid</link>.</para>
+ <para>The client also supports the ADDR format. This is documented in
<link xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidProgrammingBook}">Programming in Apache Qpid</link>.</para>
</footnote>. It allows the specification of the bindings between a queue
and an exchange, queue
and exchange creation arguments and some ancillary options.</para>
Modified:
qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
(original)
+++ qpid/java/trunk/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
Sat Jan 2 23:19:50 2016
@@ -35,7 +35,7 @@
<title>Using the Qpid JMS client with 0-10</title>
<para>This book documents the behaviour of the Qpid JMS client when used
with the AMQP
protocols <emphasis>0-8, 0-9, and 0-9-1</emphasis> only. For behaviour
when using the client
- with AMQP 0-10 protocol, please refer to <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidJmsBook}">Programming in Apache Qpid</link>.</para>
+ with AMQP 0-10 protocol, please refer to <link
xmlns:xlink="http://www.w3.org/1999/xlink";
xlink:href="${qpidProgrammingBook}">Programming in Apache Qpid</link>.</para>
</important>
</chapter>
Modified: qpid/java/trunk/doc/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/doc/pom.xml?rev=1722678&r1=1722677&r2=1722678&view=diff
==============================================================================
--- qpid/java/trunk/doc/pom.xml (original)
+++ qpid/java/trunk/doc/pom.xml Sat Jan 2 23:19:50 2016
@@ -45,10 +45,11 @@
<qpidDownloadUrlDesc>the Apache Qpid project web
site</qpidDownloadUrlDesc>
<qpidDownloadUrl>http://qpid.apache.org/download.html</qpidDownloadUrl>
- <qpidCppBook>../../AMQP-Messaging-Broker-CPP-Book/html/</qpidCppBook>
-
<qpidJavaBrokerBook>../../AMQP-Messaging-Broker-Java-Book/html/</qpidJavaBrokerBook>
- <qpidJmsBook>../../Programming-In-Apache-Qpid/html/</qpidJmsBook>
-
<qpidJmsBookClientConectionUrl>${qpidJmsBook}QpidJNDI.html#section-jms-connection-url</qpidJmsBookClientConectionUrl>
+ <qpidJavaBrokerBook>../../java-broker/book/</qpidJavaBrokerBook>
+ <qpidJmsClient08Book>../../jms-client-0-8/book/</qpidJmsClient08Book>
+
+ <qpidCppBook>../../cpp-broker/book/</qpidCppBook>
+ <qpidProgrammingBook>../../programming/book/</qpidProgrammingBook>
<oracleJdkDocUrl>http://docs.oracle.com/javase/7/docs/api/</oracleJdkDocUrl>
<oracleJeeDocUrl>http://docs.oracle.com/javaee/6/api/</oracleJeeDocUrl>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
