You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/07/19 12:35:26 UTC
svn commit: r1504815 - in /qpid/site: docs/ docs/components/
docs/components/dispatch/ input/ input/components/ input/components/dispatch/
Author: jross
Date: Fri Jul 19 10:35:25 2013
New Revision: 1504815
URL: http://svn.apache.org/r1504815
Log:
QPID-5001: Copy edits to the dispatch content
Modified:
qpid/site/docs/components/dispatch/addressing.html
qpid/site/docs/components/dispatch/index.html
qpid/site/docs/components/index.html
qpid/site/docs/documentation.html
qpid/site/input/components/dispatch/addressing.md
qpid/site/input/components/dispatch/index.md
qpid/site/input/components/index.md
qpid/site/input/documentation.md
Modified: qpid/site/docs/components/dispatch/addressing.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/components/dispatch/addressing.html?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/docs/components/dispatch/addressing.html (original)
+++ qpid/site/docs/components/dispatch/addressing.html Fri Jul 19 10:35:25 2013
@@ -82,10 +82,10 @@ The semantics of an address control how
<p>Address semantics include the following considerations:</p>
<ul>
-<li>Routing pattern (direct, multicast, balanced)</li>
-<li>Routing mechanism (message routed, link routed)</li>
-<li>Undeliverable action (drop, hold and retry, redirect)</li>
-<li>Reliability (N destinations, etc.)</li>
+<li><em>Routing pattern</em> - direct, multicast, balanced</li>
+<li><em>Routing mechanism</em> - message routed, link routed</li>
+<li><em>Undeliverable action</em> - drop, hold and retry, redirect</li>
+<li><em>Reliability</em> - N destinations, etc.</li>
</ul>
<h2 id="routing-patterns">Routing patterns</h2>
@@ -97,7 +97,7 @@ The semantics of an address control how
<tr><td><em>Pattern</em></td><td><em>Description</em></td></tr>
<tr><td><em>Direct</em></td><td>Direct routing allows for only one consumer to use an address at a time. Messages (or links) follow the lowest cost path across the network from the sender to the one receiver.</td></tr>
<tr><td><em>Multicast</em></td><td>Multicast routing allows multiple consumers to use the same address at the same time. Messages are routed such that each consumer receives a copy of the message.</td></tr>
-<tr><td><em>Balanced</em></td><td>Balanced routing also allows multiple consumers to use the same address. In this case, messages (or links) are routed to exactly one of the consumers and the network attempts to balance the traffic load across the set of consumers using the same address.</td></tr>
+<tr><td><em>Balanced</em></td><td>Balanced routing also allows multiple consumers to use the same address. In this case, messages (or links) are routed to exactly one of the consumers, and the network attempts to balance the traffic load across the set of consumers using the same address.</td></tr>
</tbody>
</table>
Modified: qpid/site/docs/components/dispatch/index.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/components/dispatch/index.html?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/docs/components/dispatch/index.html (original)
+++ qpid/site/docs/components/dispatch/index.html Fri Jul 19 10:35:25 2013
@@ -66,7 +66,7 @@ and brokers.</p>
<h2 id="overview">Overview</h2>
-<p>Dispatch Router is an AMQP router that provides advanced interconnect for AMQP.
+<p>The Dispatch router is an AMQP router that provides advanced interconnect for AMQP.
It is <em>not</em> a broker. It will never assume ownership of a message. It will,
however, propagate settlement and disposition across a network such that delivery
guarantees are met.</p>
@@ -75,11 +75,11 @@ guarantees are met.</p>
redundant paths. It uses link-state routing protocols and algorithms (similar to OSPF
or IS-IS from the networking world) to calculate the best path from every point to
every other point and to recover quickly from failures. It does not need to use
-clustering for high availability, rather it relies on redundant paths to provide
+clustering for high availability; rather, it relies on redundant paths to provide
continued connectivity in the face of system or network failure.</p>
<p>A messaging client can make a single AMQP connection into a messaging bus built of
-Dispatch Routers and, over that connection, exchange messages with one or more message
+Dispatch routers and, over that connection, exchange messages with one or more message
brokers, and at the same time exchange messages directly with other endpoints without
involving a broker at all.</p>
Modified: qpid/site/docs/components/index.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/components/index.html?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/docs/components/index.html (original)
+++ qpid/site/docs/components/index.html Fri Jul 19 10:35:25 2013
@@ -75,9 +75,9 @@ persistence, and manageability.</p>
<ul>
<li><a href="cpp-broker/index.html">C++ broker</a> - A native-code AMQP message broker</li>
<li><a href="cpp-broker-tools/index.html">C++ broker command-line tools</a> - Manage the C++ broker</li>
+<li><a href="dispatch/index.html">Dispatch router</a> - An AMQP router for scalable messaging interconnect</li>
<li><a href="java-broker/index.html">Java broker</a> - A pure-Java AMQP message broker</li>
<li><a href="qmf/index.html">QMF</a> - Management built on Qpid messaging</li>
-<li><a href="dispatch/index.html">Dispatch router</a> - An AMQP router for scalable messaging interconnect</li>
</ul>
<h2 id="compatibility">Compatibility</h2>
@@ -89,8 +89,8 @@ persistence, and manageability.</p>
<tr><td><a href="http://qpid.apache.org/components/protocol-engine/index.html">AMQP Protocol Engine</a></td><td>C, Java, Perl, PHP, Python, Ruby</td><td>Linux, OS X, JVM</td><td>1.0</td></tr>
<tr><td><a href="http://qpid.apache.org/components/cpp-broker/index.html">C++ broker</a></td><td>C++</td><td>Linux, Windows</td><td>1.0, 0-10</td></tr>
<tr><td><a href="http://qpid.apache.org/components/cpp-broker-tools/index.html">C++ broker command-line tools</a></td><td>-</td><td>Linux</td><td>0-10</td></tr>
-<tr><td><a href="http://qpid.apache.org/components/java-broker/index.html">Java broker</a></td><td>Java</td><td>JVM</td><td>1.0, 0-10, 0-91, 0-9, 0-8</td></tr>
<tr><td><a href="dispatch/index.html">Dispatch router</a></td><td>C</td><td>Linux</td><td>1.0</td></tr>
+<tr><td><a href="http://qpid.apache.org/components/java-broker/index.html">Java broker</a></td><td>Java</td><td>JVM</td><td>1.0, 0-10, 0-91, 0-9, 0-8</td></tr>
<tr><td><a href="http://qpid.apache.org/components/qpid-jca/index.html">Qpid JCA</a></td><td>Java</td><td>JVM</td><td>0-10</td></tr>
<tr><td><a href="http://qpid.apache.org/components/qpid-jms/index.html">Qpid JMS</a></td><td>Java</td><td>JVM</td><td>1.0, 0-10, 0-91, 0-9, 0-8</td></tr>
<tr><td><a href="http://qpid.apache.org/components/messaging-api/index.html">Qpid Messaging API</a></td><td>C++, Perl, Python, Ruby, .NET</td><td>Linux, Windows</td><td>1.0, 0-10</td></tr>
Modified: qpid/site/docs/documentation.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/documentation.html?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/docs/documentation.html (original)
+++ qpid/site/docs/documentation.html Fri Jul 19 10:35:25 2013
@@ -148,6 +148,13 @@ find older versions with our
<li><a href="http://qpid.apache.org/releases/qpid-0.22/cpp-broker/book/index.html#section-Managing-CPP-Broker">Managing the C++ broker</a></li>
</ul>
+<h3 id="dispatch-router">Dispatch router</h3>
+
+<ul>
+<li><a href="http://qpid.apache.org/components/dispatch/index.html">Overview</a></li>
+<li><a href="http://qpid.apache.org/components/dispatch/addressing.html">Addressing</a></li>
+</ul>
+
<h3 id="java-broker">Java broker</h3>
<ul>
@@ -166,12 +173,6 @@ find older versions with our
<li><a href="http://qpid.apache.org/releases/qpid-0.22/qmf/ruby/examples/index.html">Ruby examples</a></li>
</ul>
-<h3 id="qpid-dispatch-router">Qpid Dispatch router</h3>
-
-<ul>
-<li><a href="http://qpid.apache.org/components/dispatch/index.html">Overview</a></li>
-</ul>
-
</div>
<h2 id="more-information">More information</h2>
Modified: qpid/site/input/components/dispatch/addressing.md
URL: http://svn.apache.org/viewvc/qpid/site/input/components/dispatch/addressing.md?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/input/components/dispatch/addressing.md (original)
+++ qpid/site/input/components/dispatch/addressing.md Fri Jul 19 10:35:25 2013
@@ -47,10 +47,10 @@ The semantics of an address control how
Address semantics include the following considerations:
- - Routing pattern (direct, multicast, balanced)
- - Routing mechanism (message routed, link routed)
- - Undeliverable action (drop, hold and retry, redirect)
- - Reliability (N destinations, etc.)
+ - *Routing pattern* - direct, multicast, balanced
+ - *Routing mechanism* - message routed, link routed
+ - *Undeliverable action* - drop, hold and retry, redirect
+ - *Reliability* - N destinations, etc.
## Routing patterns
@@ -59,7 +59,7 @@ Routing patterns constrain the paths tha
|| *Pattern* || *Description* ||
|| *Direct* || Direct routing allows for only one consumer to use an address at a time. Messages (or links) follow the lowest cost path across the network from the sender to the one receiver. ||
|| *Multicast* || Multicast routing allows multiple consumers to use the same address at the same time. Messages are routed such that each consumer receives a copy of the message. ||
- || *Balanced* || Balanced routing also allows multiple consumers to use the same address. In this case, messages (or links) are routed to exactly one of the consumers and the network attempts to balance the traffic load across the set of consumers using the same address. ||
+ || *Balanced* || Balanced routing also allows multiple consumers to use the same address. In this case, messages (or links) are routed to exactly one of the consumers, and the network attempts to balance the traffic load across the set of consumers using the same address. ||
## Routing mechanisms
Modified: qpid/site/input/components/dispatch/index.md
URL: http://svn.apache.org/viewvc/qpid/site/input/components/dispatch/index.md?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/input/components/dispatch/index.md (original)
+++ qpid/site/input/components/dispatch/index.md Fri Jul 19 10:35:25 2013
@@ -32,7 +32,7 @@ and brokers.
## Overview
-Dispatch Router is an AMQP router that provides advanced interconnect for AMQP.
+The Dispatch router is an AMQP router that provides advanced interconnect for AMQP.
It is *not* a broker. It will never assume ownership of a message. It will,
however, propagate settlement and disposition across a network such that delivery
guarantees are met.
@@ -41,11 +41,11 @@ The router is meant to be deployed in to
redundant paths. It uses link-state routing protocols and algorithms (similar to OSPF
or IS-IS from the networking world) to calculate the best path from every point to
every other point and to recover quickly from failures. It does not need to use
-clustering for high availability, rather it relies on redundant paths to provide
+clustering for high availability; rather, it relies on redundant paths to provide
continued connectivity in the face of system or network failure.
A messaging client can make a single AMQP connection into a messaging bus built of
-Dispatch Routers and, over that connection, exchange messages with one or more message
+Dispatch routers and, over that connection, exchange messages with one or more message
brokers, and at the same time exchange messages directly with other endpoints without
involving a broker at all.
Modified: qpid/site/input/components/index.md
URL: http://svn.apache.org/viewvc/qpid/site/input/components/index.md?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/input/components/index.md (original)
+++ qpid/site/input/components/index.md Fri Jul 19 10:35:25 2013
@@ -42,9 +42,9 @@ persistence, and manageability.
- [C++ broker](cpp-broker/index.html) - A native-code AMQP message broker
- [C++ broker command-line tools](cpp-broker-tools/index.html) - Manage the C++ broker
+ - [Dispatch router](dispatch/index.html) - An AMQP router for scalable messaging interconnect
- [Java broker](java-broker/index.html) - A pure-Java AMQP message broker
- [QMF](qmf/index.html) - Management built on Qpid messaging
- - [Dispatch router](dispatch/index.html) - An AMQP router for scalable messaging interconnect
## Compatibility
@@ -53,8 +53,8 @@ persistence, and manageability.
|| [AMQP Protocol Engine](@site-url@/components/protocol-engine/index.html) || C, Java, Perl, PHP, Python, Ruby || Linux, OS X, JVM || 1.0 ||
|| [C++ broker](@site-url@/components/cpp-broker/index.html) || C++ || Linux, Windows || 1.0, 0-10 ||
|| [C++ broker command-line tools](@site-url@/components/cpp-broker-tools/index.html) || - || Linux || 0-10 ||
- || [Java broker](@site-url@/components/java-broker/index.html) || Java || JVM || 1.0, 0-10, 0-91, 0-9, 0-8 ||
|| [Dispatch router](dispatch/index.html) || C || Linux || 1.0 ||
+ || [Java broker](@site-url@/components/java-broker/index.html) || Java || JVM || 1.0, 0-10, 0-91, 0-9, 0-8 ||
|| [Qpid JCA](@site-url@/components/qpid-jca/index.html) || Java || JVM || 0-10 ||
|| [Qpid JMS](@site-url@/components/qpid-jms/index.html) || Java || JVM || 1.0, 0-10, 0-91, 0-9, 0-8 ||
|| [Qpid Messaging API](@site-url@/components/messaging-api/index.html) || C++, Perl, Python, Ruby, .NET || Linux, Windows || 1.0, 0-10 ||
Modified: qpid/site/input/documentation.md
URL: http://svn.apache.org/viewvc/qpid/site/input/documentation.md?rev=1504815&r1=1504814&r2=1504815&view=diff
==============================================================================
--- qpid/site/input/documentation.md (original)
+++ qpid/site/input/documentation.md Fri Jul 19 10:35:25 2013
@@ -83,6 +83,11 @@ find older versions with our
- [Overview](@site-url@/components/cpp-broker-tools/index.html)
- [Managing the C++ broker](@current-release-url@/cpp-broker/book/index.html#section-Managing-CPP-Broker)
+### Dispatch router
+
+ - [Overview](@site-url@/components/dispatch/index.html)
+ - [Addressing](@site-url@/components/dispatch/addressing.html)
+
### Java broker
- [Overview](@site-url@/components/java-broker/index.html)
@@ -97,10 +102,6 @@ find older versions with our
- [Python examples](@current-release-url@/qmf/python/examples/index.html)
- [Ruby examples](@current-release-url@/qmf/ruby/examples/index.html)
-### Qpid Dispatch router
-
- - [Overview](@site-url@/components/dispatch/index.html)
-
</div>
## More information
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org