You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/05/15 14:51:19 UTC
svn commit: r1743916 - in /qpid/java/trunk/doc: ./ jms-client-0-10/
jms-client-0-8/src/docbkx/
Author: robbie
Date: Sun May 15 14:51:19 2016
New Revision: 1743916
URL: http://svn.apache.org/viewvc?rev=1743916&view=rev
Log:
QPID-7265: update links to refer to new 0-10 client book, integrate new book into overall build
Modified:
qpid/java/trunk/doc/jms-client-0-10/pom.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/jms-client-0-10/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-10/pom.xml?rev=1743916&r1=1743915&r2=1743916&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-10/pom.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-10/pom.xml Sun May 15 14:51:19 2016
@@ -53,9 +53,9 @@
<artifactId>docbkx-maven-plugin</artifactId>
<configuration>
<includes>JMS-Client-0-10-Book.xml</includes>
- <!-- <postProcess>
- <copy file="${docbook.target}/JMS-Client-Book.html" tofile="${docbook.target}/index.html"/>
- </postProcess> -->
+ <postProcess>
+ <copy file="${docbook.target}/JMS-Client-0-10-Book.html" tofile="${docbook.target}/index.html"/>
+ </postProcess>
</configuration>
</plugin>
<plugin>
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=1743916&r1=1743915&r2=1743916&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 Sun May 15 14:51:19 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="${qpidProgrammingBook}">Address</link> or
+ <literal>address</literal> with content set to either <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient010Book}">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="${qpidProgrammingBook}">Address</link> or
+ <literal>address</literal> with content set to either <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient010Book}">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="${qpidProgrammingBook}">Address</link> format.
+ to parse content using <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient010Book}">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=1743916&r1=1743915&r2=1743916&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 Sun May 15 14:51:19 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="${qpidProgrammingBook}">Programming in Apache Qpid</link>.</para>
+ <para>The client also supports the <emphasis>Address/ADDR</emphasis> format. This is documented in <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient010Book}">Using the Qpid AMQP 0-10 JMS Client</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=1743916&r1=1743915&r2=1743916&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 Sun May 15 14:51:19 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="${qpidProgrammingBook}">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="${qpidJmsClient010Book}">Using the Qpid AMQP 0-10 JMS Client</link>.</para>
</important>
</chapter>
Modified: qpid/java/trunk/doc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/doc/pom.xml?rev=1743916&r1=1743915&r2=1743916&view=diff
==============================================================================
--- qpid/java/trunk/doc/pom.xml (original)
+++ qpid/java/trunk/doc/pom.xml Sun May 15 14:51:19 2016
@@ -47,9 +47,9 @@
<qpidJavaBrokerBook>../../java-broker/book/</qpidJavaBrokerBook>
<qpidJmsClient08Book>../../jms-client-0-8/book/</qpidJmsClient08Book>
+ <qpidJmsClient010Book>../../jms-client-0-10/book/</qpidJmsClient010Book>
<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>
@@ -74,6 +74,7 @@
<modules>
<module>java-broker</module>
<module>jms-client-0-8</module>
+ <module>jms-client-0-10</module>
<module>java-perftests</module>
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org