qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tr...@apache.org
Subject svn commit: r1737854 [1/4] - in /qpid/site: docs/releases/qpid-dispatch-master/ docs/releases/qpid-dispatch-master/book/ docs/releases/qpid-dispatch-master/man/ input/releases/qpid-dispatch-master/ input/releases/qpid-dispatch-master/book/ input/releas...
Date Tue, 05 Apr 2016 17:01:11 GMT
Author: tross
Date: Tue Apr  5 17:01:10 2016
New Revision: 1737854

URL: http://svn.apache.org/viewvc?rev=1737854&view=rev
Log:
Updated master Dispatch docs

Added:
    qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html
    qpid/site/docs/releases/qpid-dispatch-master/book/console.html
    qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html
    qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html
    qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html
    qpid/site/input/releases/qpid-dispatch-master/book/auto_links.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/console.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/console_installation.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/console_operation.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/console_overview.html.in
Modified:
    qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html
    qpid/site/docs/releases/qpid-dispatch-master/book/amqp-mapping.html
    qpid/site/docs/releases/qpid-dispatch-master/book/basic_usage.html
    qpid/site/docs/releases/qpid-dispatch-master/book/book.html
    qpid/site/docs/releases/qpid-dispatch-master/book/client_compatibility.html
    qpid/site/docs/releases/qpid-dispatch-master/book/default_config.html
    qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html
    qpid/site/docs/releases/qpid-dispatch-master/book/link_routing.html
    qpid/site/docs/releases/qpid-dispatch-master/book/schema.html
    qpid/site/docs/releases/qpid-dispatch-master/book/technical_details.html
    qpid/site/docs/releases/qpid-dispatch-master/book/tools.html
    qpid/site/docs/releases/qpid-dispatch-master/book/using.html
    qpid/site/docs/releases/qpid-dispatch-master/index.html
    qpid/site/docs/releases/qpid-dispatch-master/man/qdmanage.html
    qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.conf.html
    qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.html
    qpid/site/docs/releases/qpid-dispatch-master/man/qdstat.html
    qpid/site/input/releases/qpid-dispatch-master/book/addressing.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/amqp-mapping.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/basic_usage.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/book.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/client_compatibility.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/default_config.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/introduction.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/link_routing.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/schema.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/technical_details.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/tools.html.in
    qpid/site/input/releases/qpid-dispatch-master/book/using.html.in
    qpid/site/input/releases/qpid-dispatch-master/index.md
    qpid/site/input/releases/qpid-dispatch-master/man/qdmanage.html.in
    qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in
    qpid/site/input/releases/qpid-dispatch-master/man/qdrouterd.html.in
    qpid/site/input/releases/qpid-dispatch-master/man/qdstat.html.in
    qpid/site/python/generate.py

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="addressing">
 <h1>3.2. Addressing<a class="headerlink" href="#addressing" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/amqp-mapping.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/amqp-mapping.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/amqp-mapping.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/amqp-mapping.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="amqp-mapping">
 <h1>3.3. AMQP Mapping<a class="headerlink" href="#amqp-mapping" title="Permalink to this headline">.</a></h1>
@@ -163,11 +164,10 @@ properties. A router may append, remove,
 annotation field depending on the policy in place for
 routing the message.</td>
 </tr>
-<tr class="row-odd"><td>x-opt-qd.class</td>
-<td>string</td>
-<td>Message class. This is used to allow the router to
-provide separate paths for different classes of
-traffic.</td>
+<tr class="row-odd"><td>x-opt-qd.phase</td>
+<td>integer</td>
+<td>The address-phase, if not zero, for messages flowing
+between routers.</td>
 </tr>
 </tbody>
 </table>
@@ -188,7 +188,13 @@ traffic.</td>
 <tbody valign="top">
 <tr class="row-even"><td>qd.router</td>
 <td>This capability is added to sources and targets that are used for
-inter-router message exchange.</td>
+inter-router message exchange.  This capability denotes a link used for
+router-control messages flowing between routers.</td>
+</tr>
+<tr class="row-odd"><td>qd.router-data</td>
+<td>This capability is added to sources and targets that are used for
+inter-router message exchange.  This capability denotes a link used for
+user messages being message-routed across an inter-router connection.</td>
 </tr>
 </tbody>
 </table>
@@ -238,14 +244,18 @@ Dispatch Router.</p>
 endpoint. Messages using this address pattern shall not
 be routed over more than one link.</td>
 </tr>
-<tr class="row-odd"><td><cite>_topo/&lt;area&gt;/&lt;router&gt;/&lt;addr&gt;</cite></td>
-<td>An address that references an endpoint attached to a
+<tr class="row-odd"><td><cite>_topo/0/&lt;router&gt;/&lt;addr&gt;</cite></td>
+<td><p class="first">An address that references an endpoint attached to a
 specific router node in the network topology. Messages
 with addresses that follow this pattern shall be routed
 along the shortest path to the specified router. Note
 that addresses of this form are a-priori routable in
 that the address itself contains enough information to
-route the message to its destination.</td>
+route the message to its destination.</p>
+<p class="last">The &#8216;0&#8217; component immediately preceding the router-id
+is a placeholder for an _area_ which may be used in
+the future if area routing is implemented.</p>
+</td>
 </tr>
 <tr class="row-even"><td><cite>&lt;addr&gt;</cite></td>
 <td>A mobile address. An address of this format represents
@@ -262,8 +272,8 @@ addresses.</td>
 <h3>3.3.4.2. Supported Addresses<a class="headerlink" href="#supported-addresses" title="Permalink to this headline">.</a></h3>
 <table border="1" class="docutils">
 <colgroup>
-<col width="33%" />
-<col width="67%" />
+<col width="35%" />
+<col width="65%" />
 </colgroup>
 <thead valign="bottom">
 <tr class="row-odd"><th class="head"><em>Address</em></th>
@@ -277,7 +287,7 @@ address would be used by an endpoint tha
 client/console/tool wishing to access management data from
 the attached container.</td>
 </tr>
-<tr class="row-odd"><td><cite>_topo/0/Router.E/agent</cite></td>
+<tr class="row-odd"><td><cite>_topo/0/Router.E/$management</cite></td>
 <td>The management agent at Router.E in area 0. This address
 would be used by a management client wishing to access
 management data from a specific container that is reachable

Added: qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html?rev=1737854&view=auto
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html (added)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html Tue Apr  5 17:01:10 2016
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>2.5. Indirect Waypoints and Auto-Links. - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Java broker</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-dispatch-master/index.html">Qpid Dispatch Master</a></li><li>2.5. Indirect Waypoints and Auto-Links.</li></ul>
+
+        <div id="-middle-content">
+          
+
+  
+  <div class="section" id="indirect-waypoints-and-auto-links">
+<h1>2.5. Indirect Waypoints and Auto-Links<a class="headerlink" href="#indirect-waypoints-and-auto-links" title="Permalink to this headline">.</a></h1>
+<p>This feature was introduced in Qpid Dispatch 0.6.  It is a significant
+improvement on an earlier somewhat experimental feature called
+Waypoints.</p>
+<p>Auto-link is a feature of Qpid Dispatch Router that enables a router
+to actively attach a link to a node on an external AMQP container.
+The obvious application for this feature is to route messages through
+a queue on a broker, but other applications are possible as well.</p>
+<p>An auto-link manages the lifecycle of one AMQP link.  If messages are
+to be routed to and from a queue on a broker, then two auto-links are
+needed: one for sending messages to the queue and another for
+receiving messages from the queue.  The container to which an
+auto-link attempts to attach may be identified in one of two ways:</p>
+<blockquote>
+<div><ul class="simple">
+<li>The name of the connector/listener that resulted in the connection
+of the container, or</li>
+<li>The AMQP container-id of the remote container.</li>
+</ul>
+</div></blockquote>
+<div class="section" id="queue-waypoint-example">
+<h2>2.5.1. Queue Waypoint Example<a class="headerlink" href="#queue-waypoint-example" title="Permalink to this headline">.</a></h2>
+<p>Here is an example configuration for routing messages deliveries
+through a pair of queues on a broker:</p>
+<div class="highlight-python"><pre>connector {
+    name: broker
+    role: route-container
+    addr: &lt;hostname&gt;
+    port: &lt;port&gt;
+    sasl-mechanisms: ANONYMOUS
+}
+
+address {
+    prefix: queue
+    waypoint: yes
+}
+
+autoLink {
+    addr: queue.first
+    dir: in
+    connection: broker
+}
+
+autoLink {
+    addr: queue.first
+    dir: out
+    connection: broker
+}
+
+autoLink {
+    addr: queue.second
+    dir: in
+    connection: broker
+}
+
+autoLink {
+    addr: queue.second
+    dir: out
+    connection: broker
+}</pre>
+</div>
+<p>The <em>address</em> entity identifies a namespace (queue.*) that will be
+used for routing messages through queues via autolinks.  The four
+<em>autoLink</em> entities identify the head and tail of two queues on the
+broker that will be connected via auto-links.</p>
+<p>If there is no broker connected, the auto-links shall remain
+<em>inactive</em>.  This can be observed by using the <em>qdstat</em> tool:</p>
+<div class="highlight-python"><pre>$ qdstat --autolinks
+AutoLinks
+  addr          dir  phase  link  status    lastErr
+  ===================================================
+  queue.first   in   1            inactive
+  queue.first   out  0            inactive
+  queue.second  in   1            inactive
+  queue.second  out  0            inactive</pre>
+</div>
+<p>If a broker comes online with a queue called <em>queue.first</em>, the
+auto-links will attempt to activate:</p>
+<div class="highlight-python"><pre>$ qdstat --autolinks
+AutoLinks
+  addr          dir  phase  link  status  lastErr
+  ======================================================================
+  queue.first   in   1      6     active
+  queue.first   out  0      7     active
+  queue.second  in   1            failed  Node not found: queue.second
+  queue.second  out  0            failed  Node not found: queue.second</pre>
+</div>
+<p>Note that two of the auto-links are in <em>failed</em> state because the
+queue does not exist on the broker.</p>
+<p>If we now use the Qpid Proton example application <em>simple_send</em> to
+send three messages to queue.first via the router:</p>
+<div class="highlight-python"><pre>$ python simple_send.py -a 127.0.0.1/queue.first -m3
+all messages confirmed</pre>
+</div>
+<p>and then look at the address statistics on the router:</p>
+<div class="highlight-python"><pre>$ qdstat -a
+Router Addresses
+  class   addr           phs  distrib   in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
+  ========================================================================================================
+  mobile  queue.first    1    balanced  0        0      0       0      0   0    0     0        0
+  mobile  queue.first    0    balanced  0        1      0       0      3   3    0     0        0</pre>
+</div>
+<p>we see that <em>queue.first</em> appears twice in the list of addresses.  The
+<em>phs</em>, or phase column shows that there are two phases for the
+address.  Phase &#8216;0&#8217; is for routing message deliveries from producers
+to the tail of the queue (the <em>out</em> auto-link associated with the
+queue).  Phase &#8216;1&#8217; is for routing deliveries from the head of the
+queue to subscribed consumers.</p>
+<p>Note that three deliveries have been counted in the &#8220;in&#8221; and &#8220;out&#8221;
+columns for phase &#8216;0&#8217;.  The &#8220;in&#8221; column represents the three messages
+that arrived from simple_send and the &#8220;out&#8221; column represents the
+three deliveries to the queue on the broker.</p>
+<p>If we now use <em>simple_recv</em> to receive three messages from this
+address:</p>
+<div class="highlight-python"><pre>$ python simple_recv_noignore.py -a 127.0.0.1:5672/queue.first -m3
+{u'sequence': int32(1)}
+{u'sequence': int32(2)}
+{u'sequence': int32(3)}</pre>
+</div>
+<p>We receive the three queued messages.  Looking at the addresses again,
+we see that phase &#8216;1&#8217; was used to deliver those messages from the
+queue to the consumer.</p>
+<div class="highlight-python"><pre>$ qdstat -a
+Router Addresses
+  class   addr           phs  distrib   in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
+  ========================================================================================================
+  mobile  queue.first    1    balanced  0        0      0       0      3   3    0     0        0
+  mobile  queue.first    0    balanced  0        1      0       0      3   3    0     0        0</pre>
+</div>
+<p>Note that even in a multi-router network, and with multiple producers
+and consumers for <em>queue.first</em>, all deliveries will be routed through
+the queue on the connected broker.</p>
+</div>
+<div class="section" id="sharded-queue-example">
+<h2>2.5.2. Sharded Queue Example<a class="headerlink" href="#sharded-queue-example" title="Permalink to this headline">.</a></h2>
+<p>Here is an extension of the above example to illustrate how Qpid
+Dispatch Router can be used to create a distributed queue in which
+multiple brokers share the message-queueing load.</p>
+<div class="highlight-python"><pre>connector {
+    name: broker1
+    role: route-container
+    addr: &lt;hostname&gt;
+    port: &lt;port&gt;
+    sasl-mechanisms: ANONYMOUS
+}
+
+connector {
+    name: broker2
+    role: route-container
+    addr: &lt;hostname&gt;
+    port: &lt;port&gt;
+    sasl-mechanisms: ANONYMOUS
+}
+
+address {
+    prefix: queue
+    waypoint: yes
+}
+
+autoLink {
+    addr: queue.first
+    dir: in
+    connection: broker1
+}
+
+autoLink {
+    addr: queue.first
+    dir: out
+    connection: broker1
+}
+
+autoLink {
+    addr: queue.first
+    dir: in
+    connection: broker2
+}
+
+autoLink {
+    addr: queue.first
+    dir: out
+    connection: broker2
+}</pre>
+</div>
+<p>In the above configuration, there are two instances of <em>queue.first</em>
+on brokers 1 and 2.  Message traffic from producers to address
+<em>queue.first</em> shall be balanced between the two instance and messages
+from the queues shall be balanced across the collection of subscribers
+to the same address.</p>
+</div>
+<div class="section" id="dynamically-adding-shards">
+<h2>2.5.3. Dynamically Adding Shards<a class="headerlink" href="#dynamically-adding-shards" title="Permalink to this headline">.</a></h2>
+<p>Since configurable entities in the router can also be accessed via the
+management protocol, we can remotely add a shard to the above example
+using <em>qdmanage</em>:</p>
+<div class="highlight-python"><pre>qdmanage create --type org.apache.qpid.dispatch.connector addr=&lt;host&gt; port=&lt;port&gt; name=broker3
+qdmanage create --type org.apache.qpid.dispatch.router.config.autoLink addr=queue.first dir=in connection=broker3
+qdmanage create --type org.apache.qpid.dispatch.router.config.autoLink addr=queue.first dir=out connection=broker3</pre>
+</div>
+</div>
+</div>
+
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</a></li>
+            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
+            <li><a href="http://www.apache.org/security/">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/basic_usage.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/basic_usage.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/basic_usage.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/basic_usage.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="basic-usage-and-examples">
 <h1>2.3. Basic Usage and Examples<a class="headerlink" href="#basic-usage-and-examples" title="Permalink to this headline">.</a></h1>
@@ -127,32 +128,36 @@ with any other routers and only routes m
 endpoints.</p>
 <p>If your router is running in stand-alone mode, <em>qdstat -a</em> will look
 like the following:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ qdstat -a
+<div class="highlight-python"><pre>$ qdstat -a
 Router Addresses
-  class   address          phase  in-proc  local  remote  in  out  thru  to-proc  from-proc
-  ===========================================================================================
-  local   $management             Y        0      0       0   0    0     0        0
-  mobile  $management      0      Y        0      0       1   0    0     1        0
-  local   temp.4Q3i01lWbs                  1      0       0   0    0     0        0
-</pre></div>
+  class   addr                   phs  distrib  in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
+  ===============================================================================================================
+  local   $_management_internal       closest  1        0      0       0      0   0    0     0        0
+  local   $displayname                closest  1        0      0       0      0   0    0     0        0
+  mobile  $management            0    closest  1        0      0       0      1   0    0     1        0
+  local   $management                 closest  1        0      0       0      0   0    0     0        0
+  local   temp.1GThUllfR7N+BDP        closest  0        1      0       0      0   0    0     0        0</pre>
 </div>
-<p>Note that there are two known addresses. <em>$management</em> is the address of
-the router&#8217;s embedded management agent. <em>temp.4Q3i01lWbs</em> is the temporary
+<p>Note that there are a number of known addresses. <em>$management</em> is the address of
+the router&#8217;s embedded management agent. <em>temp.1GThUllfR7N+BDP</em> is the temporary
 reply-to address of the <em>qdstat</em> client making requests to the agent.</p>
 <p>If you change the mode to interior and restart the processs, the same
 command will yield additional addresses which are used for
 inter-router communication:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ qdstat -a
+<div class="highlight-python"><pre>$ qdstat -a
 Router Addresses
-  class   address          phase  in-proc  local  remote  in  out  thru  to-proc  from-proc
-  ===========================================================================================
-  local   $management             Y        0      0       0   0    0     0        0
-  mobile  $management      0      Y        0      0       1   0    0     1        0
-  local   qdhello                 Y        0      0       0   0    0     0        3
-  local   qdrouter                Y        0      0       0   0    0     0        1
-  local   qdrouter.ma             Y        0      0       0   0    0     0        0
-  local   temp.2ot2AWsnYz                  1      0       0   0    0     0        0
-</pre></div>
+  class   addr                   phs  distrib    in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
+  =================================================================================================================
+  local   $_management_internal       closest    1        0      0       0      0   0    0     0        0
+  local   $displayname                closest    1        0      0       0      0   0    0     0        0
+  mobile  $management            0    closest    1        0      0       0      1   0    0     1        0
+  local   $management                 closest    1        0      0       0      0   0    0     0        0
+  local   qdhello                     flood      1        0      0       0      0   0    0     0        10
+  local   qdrouter                    flood      1        0      0       0      0   0    0     0        0
+  topo    qdrouter                    flood      1        0      0       0      0   0    0     0        1
+  local   qdrouter.ma                 multicast  1        0      0       0      0   0    0     0        0
+  topo    qdrouter.ma                 multicast  1        0      0       0      0   0    0     0        0
+  local   temp.wfx54+zf+YWQF3T        closest    0        1      0       0      0   0    0     0        0</pre>
 </div>
 </div>
 <div class="section" id="mobile-subscribers">
@@ -164,25 +169,24 @@ attaches, the messages will be routed to
 <p>To illustrate a subscription on a stand-alone router, you can use the
 examples that are provided with Qpid Proton. Using the <em>simple_recv.py</em> example
 receiver:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ python ./simple_recv.py -a 127.0.0.1/my-address
-</pre></div>
+<div class="highlight-python"><pre>$ python ./simple_recv.py -a 127.0.0.1/my-address</pre>
 </div>
 <p>This command creates a receiving link subscribed to the specified
 address. To verify the subscription:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ qdstat -a
+<div class="highlight-python"><pre>$ qdstat -a
 Router Addresses
-  class   address          phase  in-proc  local  remote  in  out  thru  to-proc  from-proc
-  ===========================================================================================
-  local   $management             Y        0      0       0   0    0     0        0
-  mobile  $management      0      Y        0      0       1   0    0     1        0
-  mobile  my-address       0               1      0       0   0    0     0        0
-  local   temp.JAgKj1+iB8                  1      0       0   0    0     0        0
-</pre></div>
+  class   addr                   phs  distrib  in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
+  ===============================================================================================================
+  local   $_management_internal       closest  1        0      0       0      0   0    0     0        0
+  local   $displayname                closest  1        0      0       0      0   0    0     0        0
+  mobile  $management            0    closest  1        0      0       0      2   0    0     2        0
+  local   $management                 closest  1        0      0       0      0   0    0     0        0
+  mobile  my-address             0    closest  0        1      0       0      0   0    0     0        0
+  local   temp.75_d2X23x_KOT51        closest  0        1      0       0      0   0    0     0        0</pre>
 </div>
 <p>You can then, in a separate command window, run a sender to produce
 messages to that address:</p>
-<div class="highlight-python"><div class="highlight"><pre>$ python ./simple_send.py -a 127.0.0.1/my-address
-</pre></div>
+<div class="highlight-python"><pre>$ python ./simple_send.py -a 127.0.0.1/my-address</pre>
 </div>
 </div>
 <div class="section" id="dynamic-reply-to">
@@ -193,7 +197,7 @@ take to get there. To illustrate this fe
 program (written in C++ against the qpid::messaging API) that queries
 the management agent of the attached router for a list of other known
 routers&#8217; management addresses.</p>
-<div class="highlight-python"><div class="highlight"><pre>#include &lt;qpid/messaging/Address.h&gt;
+<div class="highlight-python"><pre>#include &lt;qpid/messaging/Address.h&gt;
 #include &lt;qpid/messaging/Connection.h&gt;
 #include &lt;qpid/messaging/Message.h&gt;
 #include &lt;qpid/messaging/Receiver.h&gt;
@@ -207,33 +211,32 @@ using std::stringstream;
 using std::string;
 
 int main() {
-    const char* url = &quot;amqp:tcp:127.0.0.1:5672&quot;;
-    std::string connectionOptions = &quot;{protocol:amqp1.0}&quot;;
+    const char* url = "amqp:tcp:127.0.0.1:5672";
+    std::string connectionOptions = "{protocol:amqp1.0}";
 
     Connection connection(url, connectionOptions);
     connection.open();
     Session session = connection.createSession();
-    Sender sender = session.createSender(&quot;mgmt&quot;);
+    Sender sender = session.createSender("mgmt");
 
     // create reply receiver and get the reply-to address
-    Receiver receiver = session.createReceiver(&quot;#&quot;);
+    Receiver receiver = session.createReceiver("#");
     Address responseAddress = receiver.getAddress();
 
     Message request;
     request.setReplyTo(responseAddress);
-    request.setProperty(&quot;x-amqp-to&quot;, &quot;amqp:/_local/$management&quot;);
-    request.setProperty(&quot;operation&quot;, &quot;DISCOVER-MGMT-NODES&quot;);
-    request.setProperty(&quot;type&quot;, &quot;org.amqp.management&quot;);
-    request.setProperty(&quot;name, &quot;self&quot;);
+    request.setProperty("x-amqp-to", "amqp:/_local/$management");
+    request.setProperty("operation", "DISCOVER-MGMT-NODES");
+    request.setProperty("type", "org.amqp.management");
+    request.setProperty("name, "self");
 
     sender.send(request);
     Message response = receiver.fetch();
     Variant content(response.getContentObject());
-    std::cout &lt;&lt; &quot;Response: &quot; &lt;&lt; content &lt;&lt; std::endl &lt;&lt; std::endl;
+    std::cout &lt;&lt; "Response: " &lt;&lt; content &lt;&lt; std::endl &lt;&lt; std::endl;
 
     connection.close();
-}
-</pre></div>
+}</pre>
 </div>
 <p>The equivalent program written in Python against the Proton Messenger
 API:</p>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/book.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/book.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/book.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/book.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="qpid-dispatch-router-book">
 <h1>Qpid Dispatch Router Book<a class="headerlink" href="#qpid-dispatch-router-book" title="Permalink to this headline">.</a></h1>
@@ -143,6 +144,12 @@ https://github.com/apache/qpid-proton/bl
 <li class="toctree-l3"><a class="reference internal" href="link_routing.html#configuration">2.4.1. Configuration</a></li>
 </ul>
 </li>
+<li class="toctree-l2"><a class="reference internal" href="auto_links.html">2.5. Indirect Waypoints and Auto-Links</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="auto_links.html#queue-waypoint-example">2.5.1. Queue Waypoint Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="auto_links.html#sharded-queue-example">2.5.2. Sharded Queue Example</a></li>
+<li class="toctree-l3"><a class="reference internal" href="auto_links.html#dynamically-adding-shards">2.5.3. Dynamically Adding Shards</a></li>
+</ul>
+</li>
 </ul>
 </li>
 <li class="toctree-l1"><a class="reference internal" href="technical_details.html">3. Technical Details and Specifications</a><ul>
@@ -167,6 +174,24 @@ https://github.com/apache/qpid-proton/bl
 </ul>
 </li>
 </ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="console.html">4. Console</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="console_overview.html">4.1. Console overview</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_installation.html">4.2. Console installation</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="console_installation.html#prerequisites">4.2.1. Prerequisites</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_installation.html#the-console-files">4.2.2. The console files</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html">4.3. Console operation</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#logging-in-to-a-router-network">4.3.1. Logging in to a router network</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#overview-page">4.3.2. Overview page</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#topology-page">4.3.3. Topology page</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#router-entity-details-page">4.3.4. Router entity details page</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#charts-page">4.3.5. Charts page</a></li>
+<li class="toctree-l3"><a class="reference internal" href="console_operation.html#schema-page">4.3.6. Schema page</a></li>
+</ul>
+</li>
+</ul>
 </li>
 </ul>
 </div>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/client_compatibility.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/client_compatibility.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/client_compatibility.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/client_compatibility.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="client-compatibility">
 <h1>3.1. Client Compatibility<a class="headerlink" href="#client-compatibility" title="Permalink to this headline">.</a></h1>

Added: qpid/site/docs/releases/qpid-dispatch-master/book/console.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/console.html?rev=1737854&view=auto
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console.html (added)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console.html Tue Apr  5 17:01:10 2016
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>4. Console. - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Java broker</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-dispatch-master/index.html">Qpid Dispatch Master</a></li><li>4. Console.</li></ul>
+
+        <div id="-middle-content">
+          
+
+  
+  <div class="section" id="console">
+<h1>4. Console<a class="headerlink" href="#console" title="Permalink to this headline">.</a></h1>
+<div class="toctree-wrapper compound">
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="console_overview.html">4.1. Console overview</a></li>
+<li class="toctree-l1"><a class="reference internal" href="console_installation.html">4.2. Console installation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="console_installation.html#prerequisites">4.2.1. Prerequisites</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_installation.html#the-console-files">4.2.2. The console files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="console_operation.html">4.3. Console operation</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#logging-in-to-a-router-network">4.3.1. Logging in to a router network</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#overview-page">4.3.2. Overview page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#topology-page">4.3.3. Topology page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#router-entity-details-page">4.3.4. Router entity details page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#charts-page">4.3.5. Charts page</a></li>
+<li class="toctree-l2"><a class="reference internal" href="console_operation.html#schema-page">4.3.6. Schema page</a></li>
+</ul>
+</li>
+</ul>
+</div>
+</div>
+
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</a></li>
+            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
+            <li><a href="http://www.apache.org/security/">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

Added: qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html?rev=1737854&view=auto
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html (added)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html Tue Apr  5 17:01:10 2016
@@ -0,0 +1,192 @@
+<!DOCTYPE html>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>4.2. Console installation. - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Java broker</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-dispatch-master/index.html">Qpid Dispatch Master</a></li><li>4.2. Console installation.</li></ul>
+
+        <div id="-middle-content">
+          
+
+  
+  <div class="section" id="console-installation">
+<h1>4.2. Console installation<a class="headerlink" href="#console-installation" title="Permalink to this headline">.</a></h1>
+<div class="section" id="prerequisites">
+<h2>4.2.1. Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">.</a></h2>
+<p>The following need to be installed before running a console:</p>
+<ul class="simple">
+<li>One or more dispatch routers. See the documentation for the dispatch router for help in starting a router network.</li>
+<li>node.js This is needed to provide a proxy between the console&#8217;s websocket traffic and tcp.</li>
+<li>A web server. This can be any server capable of serving static html/js/css/image files.</li>
+</ul>
+<p>A nodejs proxy is distributed with proton.
+To start the proton&#8217;s nodejs proxy:</p>
+<div class="highlight-python"><pre>cd ~/rh-qpid-proton/examples/javascript/messenger
+node proxy.js &amp;</pre>
+</div>
+<p>This will start the proxy listening to ws traffic on port 5673 and translating it to tcp on port 5672.
+One of the routers in the network needs to have a listener configured on port 5672. That listener&#8217;s role should be &#8216;normal&#8217;. For example:</p>
+<div class="highlight-python"><pre>listener {
+   addr: 0.0.0.0
+   role: normal
+   port: amqp
+   saslMechanisms: ANONYMOUS
+}</pre>
+</div>
+</div>
+<div class="section" id="the-console-files">
+<h2>4.2.2. The console files<a class="headerlink" href="#the-console-files" title="Permalink to this headline">.</a></h2>
+<p>The files for the console are located under the console directory in
+the source tree.:</p>
+<div class="highlight-python"><pre>app/
+bower_components/
+css/
+img/
+index.html
+lib/
+plugin/
+vendor.js</pre>
+</div>
+<dl class="docutils">
+<dt>Copy these files to a directory under the the html or webapps directory of your web server. For example, for apache tomcat the files should be under webapps/dispatch. Then the console is available as::</dt>
+<dd><a class="reference external" href="http://localhost:8080/dispatch">http://localhost:8080/dispatch</a></dd>
+</dl>
+</div>
+</div>
+
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</a></li>
+            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
+            <li><a href="http://www.apache.org/security/">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

Added: qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html?rev=1737854&view=auto
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html (added)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html Tue Apr  5 17:01:10 2016
@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>4.3. Console operation. - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Java broker</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-dispatch-master/index.html">Qpid Dispatch Master</a></li><li>4.3. Console operation.</li></ul>
+
+        <div id="-middle-content">
+          
+
+  
+  <div class="section" id="console-operation">
+<h1>4.3. Console operation<a class="headerlink" href="#console-operation" title="Permalink to this headline">.</a></h1>
+<div class="section" id="logging-in-to-a-router-network">
+<h2>4.3.1. Logging in to a router network<a class="headerlink" href="#logging-in-to-a-router-network" title="Permalink to this headline">.</a></h2>
+<p>The console communicates to the router network using the proton javascript bindings. When run from a web page, the proton bindings use web sockets to send and receive commands. However, the dispatch router requires tcp. Therefore a web-sockets to tcp proxy is used.</p>
+<img alt="console_login.png" src="console_login.png" />
+<p>Enter the address of a proxy that is connected to a router in the network.</p>
+<p>User name and password are not used at this time.</p>
+<p>The Autostart checkbox, when checked, will automatically log in with the previous host:port the next time you start the console.</p>
+</div>
+<div class="section" id="overview-page">
+<h2>4.3.2. Overview page<a class="headerlink" href="#overview-page" title="Permalink to this headline">.</a></h2>
+<p>On the overview page, aggregate information about routers, addresses, and connections is displayed.</p>
+<img alt="console_overview.png" src="console_overview.png" />
+</div>
+<div class="section" id="topology-page">
+<h2>4.3.3. Topology page<a class="headerlink" href="#topology-page" title="Permalink to this headline">.</a></h2>
+<p>This page displays the router network in a graphical form showing how the routers are connected and information about the individual routers and links.</p>
+<img alt="console_topology.png" src="console_topology.png" />
+</div>
+<div class="section" id="router-entity-details-page">
+<h2>4.3.4. Router entity details page<a class="headerlink" href="#router-entity-details-page" title="Permalink to this headline">.</a></h2>
+<img alt="console_entity.png" src="console_entity.png" />
+<p>Displays detailed information about entities such as routers, links, addresses, memory.</p>
+<p>Numeric attributes can be graphed by clicking on the graph icon.</p>
+</div>
+<div class="section" id="charts-page">
+<h2>4.3.5. Charts page<a class="headerlink" href="#charts-page" title="Permalink to this headline">.</a></h2>
+<img alt="console_charts.png" src="console_charts.png" />
+<p>This page displays graphs of numeric values that are on the entity details page.</p>
+</div>
+<div class="section" id="schema-page">
+<h2>4.3.6. Schema page<a class="headerlink" href="#schema-page" title="Permalink to this headline">.</a></h2>
+<img alt="console_schema.png" src="console_schema.png" />
+<p>This page displays the json schema that is used to manage the router network.</p>
+</div>
+</div>
+
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</a></li>
+            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
+            <li><a href="http://www.apache.org/security/">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

Added: qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html?rev=1737854&view=auto
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html (added)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html Tue Apr  5 17:01:10 2016
@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>4.1. Console overview. - Apache Qpid&#8482;</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="stylesheet" href="/site.css" type="text/css" async="async"/>
+    <link rel="stylesheet" href="/deferred.css" type="text/css" defer="defer"/>
+    <script type="text/javascript">var _deferredFunctions = [];</script>
+    <script type="text/javascript" src="/deferred.js" defer="defer"></script>
+    <!--[if lte IE 8]>
+      <link rel="stylesheet" href="/ie.css" type="text/css"/>
+      <script type="text/javascript" src="/html5shiv.js"></script>
+    <![endif]-->
+
+    <!-- Redirects for `go get` and godoc.org -->
+    <meta name="go-import"
+          content="qpid.apache.org git https://git-wip-us.apache.org/repos/asf/qpid-proton.git"/>
+    <meta name="go-source"
+          content="qpid.apache.org
+https://github.com/apache/qpid-proton/blob/go1/README.md
+https://github.com/apache/qpid-proton/tree/go1{/dir}
+https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/>
+  </head>
+  <body>
+    <div id="-content">
+      <div id="-top" class="panel">
+        <a id="-menu-link"><img width="16" height="16" src="" alt="Menu"/></a>
+
+        <a id="-search-link"><img width="22" height="16" src="" alt="Search"/></a>
+
+        <ul id="-global-navigation">
+          <li><a id="-logotype" href="/index.html">Apache Qpid<sup>&#8482;</sup></a></li>
+          <li><a href="/documentation.html">Documentation</a></li>
+          <li><a href="/download.html">Download</a></li>
+          <li><a href="/discussion.html">Discussion</a></li>
+        </ul>
+      </div>
+
+      <div id="-menu" class="panel" style="display: none;">
+        <div class="flex">
+          <section>
+            <h3>Project</h3>
+
+            <ul>
+              <li><a href="/overview.html">Overview</a></li>
+              <li><a href="/components/index.html">Components</a></li>
+              <li><a href="/releases/index.html">Releases</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Messaging APIs</h3>
+
+            <ul>
+              <li><a href="/proton/index.html">Qpid Proton</a></li>
+              <li><a href="/components/jms/index.html">Qpid JMS</a></li>
+              <li><a href="/components/messaging-api/index.html">Qpid Messaging API</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Servers and tools</h3>
+
+            <ul>
+              <li><a href="/components/java-broker/index.html">Java broker</a></li>
+              <li><a href="/components/cpp-broker/index.html">C++ broker</a></li>
+              <li><a href="/components/dispatch-router/index.html">Dispatch router</a></li>
+            </ul>
+          </section>
+
+          <section>
+            <h3>Resources</h3>
+
+            <ul>
+              <li><a href="/dashboard.html">Dashboard</a></li>
+              <li><a href="https://cwiki.apache.org/confluence/display/qpid/Index">Wiki</a></li>
+              <li><a href="/resources.html">More resources</a></li>
+            </ul>
+          </section>
+        </div>
+      </div>
+
+      <div id="-search" class="panel" style="display: none;">
+        <form action="http://www.google.com/search" method="get">
+          <input type="hidden" name="sitesearch" value="qpid.apache.org"/>
+          <input type="text" name="q" maxlength="255" autofocus="autofocus" tabindex="1"/>
+          <button type="submit">Search</button>
+          <a href="/search.html">More ways to search</a>
+        </form>
+      </div>
+
+      <div id="-middle" class="panel">
+        <ul id="-path-navigation"><li><a href="/index.html">Home</a></li><li><a href="/releases/index.html">Releases</a></li><li><a href="/releases/qpid-dispatch-master/index.html">Qpid Dispatch Master</a></li><li>4.1. Console overview.</li></ul>
+
+        <div id="-middle-content">
+          
+
+  
+  <div class="section" id="console-overview">
+<h1>4.1. Console overview<a class="headerlink" href="#console-overview" title="Permalink to this headline">.</a></h1>
+<p>The console is an HTML based web site that displays information about a qpid dispatch router network.</p>
+<p>The console requires an HTML web server that can serve static html, javascript, style sheets, and images.</p>
+<p>The current version of the is read-only. The ability to call management methods that change the running of the router network is planned for a future version of console.</p>
+<p>The console only provides limited information about the clients that are attached to the router network and is therfore more appropriate for administrators needing to know the layout and health of the router network.</p>
+</div>
+
+
+
+          <hr/>
+
+          <ul id="-apache-navigation">
+            <li><a href="http://www.apache.org/">Apache</a></li>
+            <li><a href="http://www.apache.org/licenses/">License</a></li>
+            <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a></li>
+            <li><a href="http://www.apache.org/foundation/thanks.html">Thanks!</a></li>
+            <li><a href="http://www.apache.org/security/">Security</a></li>
+            <li><a href="http://www.apache.org/"><img id="-apache-feather" width="48" height="14" src="" alt="Apache"/></a></li>
+          </ul>
+
+          <p id="-legal">
+            Apache Qpid, Messaging built on AMQP; Copyright &#169; 2015
+            The Apache Software Foundation; Licensed under
+            the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+            License, Version 2.0</a>; Apache Qpid, Qpid, Qpid Proton,
+            Proton, Apache, the Apache feather logo, and the Apache Qpid
+            project logo are trademarks of The Apache Software
+            Foundation; All other marks mentioned may be trademarks or
+            registered trademarks of their respective owners
+          </p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/default_config.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/default_config.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/default_config.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/default_config.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="configuration">
 <h1>2.1. Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html Tue Apr  5 17:01:10 2016
@@ -115,6 +115,7 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="introduction">
 <h1>1. Introduction<a class="headerlink" href="#introduction" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/link_routing.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/link_routing.html?rev=1737854&r1=1737853&r2=1737854&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/link_routing.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/link_routing.html Tue Apr  5 17:01:10 2016
@@ -115,10 +115,12 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
+
   
   <div class="section" id="link-routing">
 <h1>2.4. Link Routing<a class="headerlink" href="#link-routing" title="Permalink to this headline">.</a></h1>
-<p>This feature was introduced in Qpid Dispatch 0.4.</p>
+<p>This feature was introduced in Qpid Dispatch 0.4.
+This feature was significantly updated in Qpid Dispatch 0.6.</p>
 <p>Link-routing is an alternative strategy for routing messages across a
 network of routers.  With the existing message-routing strategy, each
 router makes a routing decision on a per-message basis when the
@@ -132,10 +134,12 @@ dispositions is performed across the rou
 protocol to interact with other endpoints in far-flung parts of the
 network.  For example, a client can establish a receiver across the
 network to a queue on a remote broker and use link credit to control
-the flow of messages from the broker.</p>
+the flow of messages from the broker.  Similarly, a receiver can
+establish a link to a topic on a remote broker using a server-side
+filter.</p>
 <p>Why would one want to do this?  One reason is to provide client
 isolation.  A network like the following can be deployed:</p>
-<div class="highlight-python"><div class="highlight"><pre>                Public Network
+<div class="highlight-python"><pre>                Public Network
                +-----------------+
                |      +-----+    |
                | B1   | Rp  |    |
@@ -153,8 +157,7 @@ isolation.  A network like the following
 |         +-----+ |           | +-----+         |
 |                 |           |                 |
 |                 |           |                 |
-+-----------------+           +-----------------+
-</pre></div>
++-----------------+           +-----------------+</pre>
 </div>
 <p>The clients in Private Net B can be constrained (by firewall policy)
 to only connect to the Router in their own network.  Using
@@ -177,50 +180,57 @@ message-router network between them.</p>
 configured to support the example described above?</p>
 <p>First, router Ra needs to be told how to make a connection to the
 broker B2:</p>
-<div class="highlight-python"><div class="highlight"><pre>connector {
+<div class="highlight-python"><pre>connector {
     name: broker
-    role: on-demand
+    role: route-container
     addr: &lt;B2-url&gt;
     port: &lt;B2-port&gt;
     sasl-mechanisms: ANONYMOUS
-}
-</pre></div>
+}</pre>
 </div>
-<p>This <em>on-demand</em> connector tells the router how to connect to an
+<p>This <em>route-container</em> connector tells the router how to connect to an
 external AMQP container when it is needed.  The name &#8220;broker&#8221; will be
 used later to refer to this connection.</p>
 <p>Now, the router must be configured to route certain addresses to B2:</p>
-<div class="highlight-python"><div class="highlight"><pre>linkRoutePattern {
+<div class="highlight-python"><pre>linkRoute {
     prefix: b2
-    connector: broker
+    dir: in
+    connection: broker
 }
-</pre></div>
+
+linkRoute {
+    prefix: b2
+    dir: out
+    connection: broker
+}</pre>
 </div>
-<p>The linkRoutePattern tells router Ra that any sender or receiver that
+<p>The linkRoute tells router Ra that any sender or receiver that
 is attached with a target or source (respectively) whos address begins
-with &#8220;b2&#8221;, should be routed to the broker B2 (via the on-demand
+with &#8220;b2&#8221;, should be routed to the broker B2 (via the route-container
 connector).</p>
+<p>Note that receiving and sending links are configured and routed
+separately.  This allows configuration of link routes for listeners
+only or senders only.  A direction of &#8220;in&#8221; matches client senders
+(i.e. links that carry messages inbound to the router network).
+Direction &#8220;out&#8221; matches client receivers.</p>
 <dl class="docutils">
 <dt>Examples of addresses that &#8220;begin with &#8216;b2&#8217;&#8221; include:</dt>
 <dd><ul class="first last simple">
 <li>b2</li>
-<li>b2/queues</li>
-<li>b2/queues/app1</li>
+<li>b2.queues</li>
+<li>b2.queues.app1</li>
 </ul>
 </dd>
 </dl>
-<p>When the on-demand connector is configured, router Ra establishes a
+<p>When the route-container connector is configured, router Ra establishes a
 connection to the broker.  Once the connection is open, Ra tells the
 other routers (Rp and Rb) that it is a valid destination for
 link-routes to the &#8220;b2&#8221; prefix.  This means that sender or receiver
 links attached to Rb or Rp will be routed via the shortest path to Ra
 where they are then routed outbound to the broker B2.</p>
-<p>On Rp and Rb, it is advisable to add the following configuration:</p>
-<div class="highlight-python"><div class="highlight"><pre>linkRoutePattern {
-    prefix: b2
-}
-</pre></div>
-</div>
+<p>On Rp and Rb, it is advisable to add the identical configuration.  It
+is permissible for a linkRoute configuration to reference a connection
+that does not exist.</p>
 <p>This configuration tells the routers that link-routing is intended to
 be available for targets and sources starting with &#8220;b2&#8221;.  This is
 important because it is possible that B2 might be unavailable or shut



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message