Author: orudyy
Date: Thu Nov 26 14:07:29 2015
New Revision: 1716665
URL: http://svn.apache.org/viewvc?rev=1716665&view=rev
Log:
QPID-6805: [Documentation] Reorganise files.
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1716086 https://svn.apache.org/repos/asf/qpid/java/trunk
Added:
qpid/java/branches/6.0.x/doc/book/src/java-broker/runtime/
- copied from r1716086, qpid/java/trunk/doc/book/src/java-broker/runtime/
Removed:
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Close-On-No-Route.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Background-Recovery.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Connection-Limit.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management-Producer-Flow-Control.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Disk-Space-Management.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Flow-To-Disk.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Log-Files.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Memory.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Message-Compression.xml
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime-Producer-Transaction-Timeout.xml
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-Initial-Configuration.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/concepts/Java-Broker-Concepts-Exchanges.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-Understanding.xml
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:07:29 2015
@@ -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
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086
/qpid/trunk/qpid:796646-796653
Propchange: qpid/java/branches/6.0.x/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:07:29 2015
@@ -7,3 +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
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=1716665&r1=1716664&r2=1716665&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
Thu Nov 26 14:07:29 2015
@@ -23,7 +23,7 @@
<book xmlns:xi="http://www.w3.org/2001/XInclude";>
<title>AMQP Messaging Broker (Java)</title>
- <xi:include href="Java-Broker-Introduction.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Installation.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Getting-Started.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Concepts.xml"/>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml?rev=1716665&r1=1716664&r2=1716665&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
Thu Nov 26 14:07:29 2015
@@ -140,7 +140,7 @@ $ ./qpid-server -cic ./initial-config.js
Properties</link> within 'Initial Configuration' files to
allow a degree of
customisation with an otherwise fixed file. </para>
<para> For an example file, see <xref
-
linkend="Java-Broker-Configuring-And-Managing-Configuration-Initial-Config-Example"
+ linkend="Java-Broker-Initial-Configuration-Example"
/>
</para>
@@ -252,7 +252,7 @@ $ ./qpid-server -st memory
</para>
<para> Use of these core properties can be seen in the <link
-
linkend="Java-Broker-Configuring-And-Managing-Configuration-Initial-Config-Example"
+ linkend="Java-Broker-Initial-Configuration-Example"
>default 'Initial Configuration' example</link>. </para>
<para> Configuration Properties can be set on the command line using
the
@@ -274,7 +274,7 @@ $ ./qpid-server -prop "qpid.amqp_port=10
</section>
- <section
id="Java-Broker-Configuring-And-Managing-Configuration-Initial-Config-Example">
+ <section id="Java-Broker-Initial-Configuration-Example">
<title>Example of JSON 'Initial Configuration'</title>
<para> An example of the default 'Initial Configuration' JSON file the
broker uses is
provided below:</para>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime.xml?rev=1716665&r1=1716664&r2=1716665&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime.xml
(original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/Java-Broker-Runtime.xml
Thu Nov 26 14:07:29 2015
@@ -22,17 +22,17 @@
<chapter id="Java-Broker-Runtime">
<title>Runtime</title>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Runtime-Log-Files.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Log-Files.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="Java-Broker-Runtime-Disk-Space-Management.xml"/>
+ href="runtime/Java-Broker-Runtime-Disk-Space-Management.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="Java-Broker-Runtime-Producer-Transaction-Timeout.xml"/>
+ href="runtime/Java-Broker-Runtime-Producer-Transaction-Timeout.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="Java-Broker-Runtime-Handling-Undeliverable-Messages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Close-On-No-Route.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Runtime-Flow-To-Disk.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Runtime-Background-Recovery.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Runtime-Message-Compression.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Runtime-Connection-Limit.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="Java-Broker-Runtime-Memory.xml"/>
+ href="runtime/Java-Broker-Runtime-Handling-Undeliverable-Messages.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Close-On-No-Route.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Flow-To-Disk.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Background-Recovery.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Message-Compression.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Connection-Limit.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="runtime/Java-Broker-Runtime-Memory.xml"/>
</chapter>
Modified:
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml?rev=1716665&r1=1716664&r2=1716665&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Exchanges.xml
Thu Nov 26 14:07:29 2015
@@ -195,7 +195,7 @@
<listitem><para>If using AMQP 0-10 protocol, and an alternate exchange has
been set on the exchange, the message is routed to the alternate exchange.
The alternate exchange routes the message according to its routing
algorithm and its binding table. If the messages is still unroutable,
the message is discarded.</para></listitem>
- <listitem><para>If using AMQP protocols 0-8..0-9-1, and the publisher set
the mandatory flag and the<link
linkend="Java-Broker-Close-Connection-When-No-Route">
+ <listitem><para>If using AMQP protocols 0-8..0-9-1, and the publisher set
the mandatory flag and the<link
linkend="Java-Broker-Runtime-Close-Connection-When-No-Route">
close when no route</link> feature did not close the connection, the
message is returned to the Producer.</para></listitem>
<listitem><para>Otherwise, the message is discarded.</para></listitem>
</itemizedlist>
Propchange: qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 14:07:29 2015
@@ -7,3 +7,4 @@
/qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/jms-client-0-8:1477004-1477093
/qpid/branches/qpid-2935/qpid/doc/book/src/jms-client-0-8:1061302-1072333
/qpid/branches/qpid-3346/qpid/doc/book/src/jms-client-0-8:1144319-1179855
+/qpid/java/trunk/doc/book/src/jms-client-0-8:1716086
Modified:
qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
URL:
http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml?rev=1716665&r1=1716664&r2=1716665&view=diff
==============================================================================
---
qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
(original)
+++
qpid/java/branches/6.0.x/doc/book/src/jms-client-0-8/JMS-Client-Understanding.xml
Thu Nov 26 14:07:29 2015
@@ -469,7 +469,7 @@ amqp://guest:guest@clientid/?brokerlist=
<para>To enable or disable from the client, use the Connection URL
option <link
linkend="JMS-Client-0-8-Connection-URL-ConnectionOptions-CloseWhenNoRoute"
><literal>closeWhenNoRoute</literal></link>.</para>
- <para>See <ulink
url="&qpidJavaBrokerBook;Java-Broker-Close-Connection-When-No-Route.html">
+ <para>See <ulink
url="&qpidJavaBrokerBook;Java-Broker-Runtime-Close-Connection-When-No-Route.html">
Closing client connections on unroutable mandatory messages</ulink>
within the Java Broker
book for full details of the functioning of this feature.</para>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
