Author: robbie
Date: Sun May 15 15:21:40 2016
New Revision: 1743918
URL: http://svn.apache.org/viewvc?rev=1743918&view=rev
Log:
QPID-7265: merge doc changes to 6.0.x branch to add AMQP 0-10 JMS client book
Ran 'svn merge -r 1743758:1743916 ^/qpid/java/trunk/doc' in doc dir, then
updated new pom version to match
Added:
qpid/java/branches/6.0.x/doc/jms-client-0-10/
- copied from r1743916, qpid/java/trunk/doc/jms-client-0-10/
Modified:
qpid/java/branches/6.0.x/doc/ (props changed)
qpid/java/branches/6.0.x/doc/jms-client-0-10/pom.xml
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
qpid/java/branches/6.0.x/doc/pom.xml
Propchange: qpid/java/branches/6.0.x/doc/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun May 15 15:21:40 2016
@@ -0,0 +1,13 @@
+/qpid/branches/0.5.x-dev/doc:886720-886722
+/qpid/branches/0.5.x-dev/qpid/java/doc:886720-886722,887145,892761,894875,916304,916325,930288,931179
+/qpid/branches/QPID-6125-ProtocolRefactoring/java/doc:1628068-1632579
+/qpid/branches/QPID-6262-JavaBrokerNIO/qpid/java/doc:1643238-1666219
+/qpid/branches/java-broker-0-10/qpid/java/doc:795950-829653
+/qpid/branches/java-broker-amqp-1-0-management/java/doc:1562456-1569102
+/qpid/branches/java-broker-bdb-ha2/qpid/java/doc:1576683-1583556
+/qpid/branches/java-broker-config-store-changes/qpid/java/doc:1584338-1584926
+/qpid/branches/java-broker-vhost-refactor/java/doc:1493674-1494547
+/qpid/branches/java-network-refactor/qpid/java/doc:805429-821809
+/qpid/branches/qpid-2935/qpid/java/doc:1061302-1072333
+/qpid/java/trunk/doc: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,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-
1729657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284,1742544,1742900,1742926,1743161,1743228,1743383,1743759-1743916
+/qpid/trunk/qpid/doc:796646-796653
Modified: qpid/java/branches/6.0.x/doc/jms-client-0-10/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-10/pom.xml?rev=1743918&r1=1743916&r2=1743918&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-10/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-10/pom.xml Sun May 15 15:21:40
2016
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-java-doc</artifactId>
- <version>6.1.0-SNAPSHOT</version>
+ <version>6.0.4-SNAPSHOT</version>
</parent>
<artifactId>qpid-java-doc-jms-client-0-10</artifactId>
Modified:
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml?rev=1743918&r1=1743917&r2=1743918&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
(original)
+++
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
Sun May 15 15:21:40 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/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml?rev=1743918&r1=1743917&r2=1743918&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
(original)
+++
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
Sun May 15 15:21:40 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/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml?rev=1743918&r1=1743917&r2=1743918&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
(original)
+++
qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
Sun May 15 15:21:40 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/branches/6.0.x/doc/pom.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/pom.xml?rev=1743918&r1=1743917&r2=1743918&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/pom.xml Sun May 15 15:21:40 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: [email protected]
For additional commands, e-mail: [email protected]
