qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmur...@apache.org
Subject svn commit: r1740870 [1/2] - 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 Mon, 25 Apr 2016 18:13:25 GMT
Author: gmurthy
Date: Mon Apr 25 18:13:24 2016
New Revision: 1740870

URL: http://svn.apache.org/viewvc?rev=1740870&view=rev
Log:
DISPATCH-259 - Fixed man pages for qdstat and qdmanage

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/auto_links.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/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/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/auto_links.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/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
    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

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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/addressing.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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=1740870&r1=1740869&r2=1740870&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 Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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>

Modified: 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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/auto_links.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <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>
@@ -142,7 +141,7 @@ of the container, or</li>
 <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 {
+<div class="highlight-python"><div class="highlight"><pre><span></span>connector {
     name: broker
     role: route-container
     addr: &lt;hostname&gt;
@@ -177,7 +176,8 @@ autoLink {
     addr: queue.second
     dir: out
     connection: broker
-}</pre>
+}
+</pre></div>
 </div>
 <p>The <em>address</em> entity identifies a namespace (queue.*) that will be
 used for routing messages through queues via autolinks.  The four
@@ -185,40 +185,44 @@ used for routing messages through queues
 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
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  queue.second  out  0            inactive
+</pre></div>
 </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
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  queue.second  out  0            failed  Node not found: queue.second
+</pre></div>
 </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 class="highlight-python"><div class="highlight"><pre><span></span>$ python simple_send.py -a 127.0.0.1/queue.first -m3
+all messages confirmed
+</pre></div>
 </div>
 <p>and then look at the address statistics on the router:</p>
-<div class="highlight-python"><pre>$ qdstat -a
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  mobile  queue.first    0    balanced  0        1      0       0      3   3    0     0        0
+</pre></div>
 </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
@@ -232,20 +236,22 @@ that arrived from simple_send and 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 class="highlight-python"><div class="highlight"><pre><span></span>$ python simple_recv_noignore.py -a 127.0.0.1:5672/queue.first -m3
+{u&#39;sequence&#39;: int32(1)}
+{u&#39;sequence&#39;: int32(2)}
+{u&#39;sequence&#39;: int32(3)}
+</pre></div>
 </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
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  mobile  queue.first    0    balanced  0        1      0       0      3   3    0     0        0
+</pre></div>
 </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
@@ -256,7 +262,7 @@ the queue on the connected broker.</p>
 <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 {
+<div class="highlight-python"><div class="highlight"><pre><span></span>connector {
     name: broker1
     role: route-container
     addr: &lt;hostname&gt;
@@ -299,7 +305,8 @@ autoLink {
     addr: queue.first
     dir: out
     connection: broker2
-}</pre>
+}
+</pre></div>
 </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
@@ -312,9 +319,10 @@ to the same address.</p>
 <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
+<div class="highlight-python"><div class="highlight"><pre><span></span>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>
+qdmanage create --type org.apache.qpid.dispatch.router.config.autoLink addr=queue.first dir=out connection=broker3
+</pre></div>
 </div>
 </div>
 </div>

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=1740870&r1=1740869&r2=1740870&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 Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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>
@@ -128,7 +127,7 @@ 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"><pre>$ qdstat -a
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdstat -a
 Router Addresses
   class   addr                   phs  distrib  in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
   ===============================================================================================================
@@ -136,7 +135,8 @@ Router Addresses
   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>
+  local   temp.1GThUllfR7N+BDP        closest  0        1      0       0      0   0    0     0        0
+</pre></div>
 </div>
 <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
@@ -144,7 +144,7 @@ reply-to address of the <em>qdstat</em>
 <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"><pre>$ qdstat -a
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdstat -a
 Router Addresses
   class   addr                   phs  distrib    in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
   =================================================================================================================
@@ -157,7 +157,8 @@ Router Addresses
   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>
+  local   temp.wfx54+zf+YWQF3T        closest    0        1      0       0      0   0    0     0        0
+</pre></div>
 </div>
 </div>
 <div class="section" id="mobile-subscribers">
@@ -169,11 +170,12 @@ 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"><pre>$ python ./simple_recv.py -a 127.0.0.1/my-address</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ python ./simple_recv.py -a 127.0.0.1/my-address
+</pre></div>
 </div>
 <p>This command creates a receiving link subscribed to the specified
 address. To verify the subscription:</p>
-<div class="highlight-python"><pre>$ qdstat -a
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdstat -a
 Router Addresses
   class   addr                   phs  distrib  in-proc  local  remote  cntnr  in  out  thru  to-proc  from-proc
   ===============================================================================================================
@@ -182,11 +184,13 @@ Router Addresses
   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>
+  local   temp.75_d2X23x_KOT51        closest  0        1      0       0      0   0    0     0        0
+</pre></div>
 </div>
 <p>You can then, in a separate command window, run a sender to produce
 messages to that address:</p>
-<div class="highlight-python"><pre>$ python ./simple_send.py -a 127.0.0.1/my-address</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ python ./simple_send.py -a 127.0.0.1/my-address
+</pre></div>
 </div>
 </div>
 <div class="section" id="dynamic-reply-to">
@@ -197,7 +201,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"><pre>#include &lt;qpid/messaging/Address.h&gt;
+<div class="highlight-python"><div class="highlight"><pre><span></span>#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;
@@ -211,61 +215,62 @@ using std::stringstream;
 using std::string;
 
 int main() {
-    const char* url = "amqp:tcp:127.0.0.1:5672";
-    std::string connectionOptions = "{protocol:amqp1.0}";
+    const char* url = &quot;amqp:tcp:127.0.0.1:5672&quot;;
+    std::string connectionOptions = &quot;{protocol:amqp1.0}&quot;;
 
     Connection connection(url, connectionOptions);
     connection.open();
     Session session = connection.createSession();
-    Sender sender = session.createSender("mgmt");
+    Sender sender = session.createSender(&quot;mgmt&quot;);
 
     // create reply receiver and get the reply-to address
-    Receiver receiver = session.createReceiver("#");
+    Receiver receiver = session.createReceiver(&quot;#&quot;);
     Address responseAddress = receiver.getAddress();
 
     Message request;
     request.setReplyTo(responseAddress);
-    request.setProperty("x-amqp-to", "amqp:/_local/$management");
-    request.setProperty("operation", "DISCOVER-MGMT-NODES");
-    request.setProperty("type", "org.amqp.management");
-    request.setProperty("name, "self");
+    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;);
 
     sender.send(request);
     Message response = receiver.fetch();
     Variant content(response.getContentObject());
-    std::cout &lt;&lt; "Response: " &lt;&lt; content &lt;&lt; std::endl &lt;&lt; std::endl;
+    std::cout &lt;&lt; &quot;Response: &quot; &lt;&lt; content &lt;&lt; std::endl &lt;&lt; std::endl;
 
     connection.close();
-}</pre>
+}
+</pre></div>
 </div>
 <p>The equivalent program written in Python against the Proton Messenger
 API:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">proton</span> <span class="kn">import</span> <span class="n">Messenger</span><span class="p">,</span> <span class="n">Message</span>
+<div class="highlight-python"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">proton</span> <span class="kn">import</span> <span class="n">Messenger</span><span class="p">,</span> <span class="n">Message</span>
 
 <span class="k">def</span> <span class="nf">main</span><span class="p">():</span>
-    <span class="n">host</span> <span class="o">=</span> <span class="s">&quot;0.0.0.0:5672&quot;</span>
+    <span class="n">host</span> <span class="o">=</span> <span class="s2">&quot;0.0.0.0:5672&quot;</span>
 
     <span class="n">messenger</span> <span class="o">=</span> <span class="n">Messenger</span><span class="p">()</span>
     <span class="n">messenger</span><span class="o">.</span><span class="n">start</span><span class="p">()</span>
-    <span class="n">messenger</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s">&quot;amqp:/*&quot;</span><span class="p">,</span> <span class="s">&quot;amqp://</span><span class="si">%s</span><span class="s">/$1&quot;</span> <span class="o">%</span> <span class="n">host</span><span class="p">)</span>
-    <span class="n">reply_subscription</span> <span class="o">=</span> <span class="n">messenger</span><span class="o">.</span><span class="n">subscribe</span><span class="p">(</span><span class="s">&quot;amqp:/#&quot;</span><span class="p">)</span>
+    <span class="n">messenger</span><span class="o">.</span><span class="n">route</span><span class="p">(</span><span class="s2">&quot;amqp:/*&quot;</span><span class="p">,</span> <span class="s2">&quot;amqp://</span><span class="si">%s</span><span class="s2">/$1&quot;</span> <span class="o">%</span> <span class="n">host</span><span class="p">)</span>
+    <span class="n">reply_subscription</span> <span class="o">=</span> <span class="n">messenger</span><span class="o">.</span><span class="n">subscribe</span><span class="p">(</span><span class="s2">&quot;amqp:/#&quot;</span><span class="p">)</span>
     <span class="n">reply_address</span> <span class="o">=</span> <span class="n">reply_subscription</span><span class="o">.</span><span class="n">address</span>
 
     <span class="n">request</span>  <span class="o">=</span> <span class="n">Message</span><span class="p">()</span>
     <span class="n">response</span> <span class="o">=</span> <span class="n">Message</span><span class="p">()</span>
 
-    <span class="n">request</span><span class="o">.</span><span class="n">address</span> <span class="o">=</span> <span class="s">&quot;amqp:/_local/$management&quot;</span>
+    <span class="n">request</span><span class="o">.</span><span class="n">address</span> <span class="o">=</span> <span class="s2">&quot;amqp:/_local/$management&quot;</span>
     <span class="n">request</span><span class="o">.</span><span class="n">reply_to</span> <span class="o">=</span> <span class="n">reply_address</span>
-    <span class="n">request</span><span class="o">.</span><span class="n">properties</span> <span class="o">=</span> <span class="p">{</span><span class="s">u&#39;operation&#39;</span> <span class="p">:</span> <span class="s">u&#39;DISCOVER-MGMT-NODES&#39;</span><span class="p">,</span>
-                          <span class="s">u&#39;type&#39;</span>      <span class="p">:</span> <span class="s">u&#39;org.amqp.management&#39;</span><span class="p">,</span>
-                          <span class="s">u&#39;name&#39;</span>      <span class="p">:</span> <span class="s">u&#39;self&#39;</span><span class="p">}</span>
+    <span class="n">request</span><span class="o">.</span><span class="n">properties</span> <span class="o">=</span> <span class="p">{</span><span class="s1">u&#39;operation&#39;</span> <span class="p">:</span> <span class="s1">u&#39;DISCOVER-MGMT-NODES&#39;</span><span class="p">,</span>
+                          <span class="s1">u&#39;type&#39;</span>      <span class="p">:</span> <span class="s1">u&#39;org.amqp.management&#39;</span><span class="p">,</span>
+                          <span class="s1">u&#39;name&#39;</span>      <span class="p">:</span> <span class="s1">u&#39;self&#39;</span><span class="p">}</span>
 
     <span class="n">messenger</span><span class="o">.</span><span class="n">put</span><span class="p">(</span><span class="n">request</span><span class="p">)</span>
     <span class="n">messenger</span><span class="o">.</span><span class="n">send</span><span class="p">()</span>
     <span class="n">messenger</span><span class="o">.</span><span class="n">recv</span><span class="p">()</span>
     <span class="n">messenger</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">response</span><span class="p">)</span>
 
-    <span class="k">print</span> <span class="s">&quot;Response: </span><span class="si">%r</span><span class="s">&quot;</span> <span class="o">%</span> <span class="n">response</span><span class="o">.</span><span class="n">body</span>
+    <span class="k">print</span> <span class="s2">&quot;Response: </span><span class="si">%r</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">response</span><span class="o">.</span><span class="n">body</span>
 
     <span class="n">messenger</span><span class="o">.</span><span class="n">stop</span><span class="p">()</span>
 

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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/book.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/book.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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>

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=1740870&r1=1740869&r2=1740870&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 Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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>

Modified: 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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="console">
 <h1>4. Console<a class="headerlink" href="#console" title="Permalink to this headline">.</a></h1>

Modified: 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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console_installation.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <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>
@@ -129,31 +128,34 @@ https://github.com/apache/qpid-proton/bl
 </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 class="highlight-python"><div class="highlight"><pre><span></span>cd ~/rh-qpid-proton/examples/javascript/messenger
+node proxy.js &amp;
+</pre></div>
 </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 {
+<div class="highlight-python"><div class="highlight"><pre><span></span>listener {
    addr: 0.0.0.0
    role: normal
    port: amqp
    saslMechanisms: ANONYMOUS
-}</pre>
+}
+</pre></div>
 </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/
+<div class="highlight-python"><div class="highlight"><pre><span></span>app/
 bower_components/
 css/
 img/
 index.html
 lib/
 plugin/
-vendor.js</pre>
+vendor.js
+</pre></div>
 </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>

Modified: 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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console_operation.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <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>

Modified: 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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/console_overview.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <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>

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=1740870&r1=1740869&r2=1740870&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 Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/introduction.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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=1740870&r1=1740869&r2=1740870&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 Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ 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>
@@ -139,7 +138,7 @@ establish a link to a topic on a remote
 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"><pre>                Public Network
+<div class="highlight-python"><div class="highlight"><pre><span></span>                Public Network
                +-----------------+
                |      +-----+    |
                | B1   | Rp  |    |
@@ -157,7 +156,8 @@ isolation.  A network like the following
 |         +-----+ |           | +-----+         |
 |                 |           |                 |
 |                 |           |                 |
-+-----------------+           +-----------------+</pre>
++-----------------+           +-----------------+
+</pre></div>
 </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
@@ -180,19 +180,20 @@ 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"><pre>connector {
+<div class="highlight-python"><div class="highlight"><pre><span></span>connector {
     name: broker
     role: route-container
     addr: &lt;B2-url&gt;
     port: &lt;B2-port&gt;
     sasl-mechanisms: ANONYMOUS
-}</pre>
+}
+</pre></div>
 </div>
 <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"><pre>linkRoute {
+<div class="highlight-python"><div class="highlight"><pre><span></span>linkRoute {
     prefix: b2
     dir: in
     connection: broker
@@ -202,7 +203,8 @@ linkRoute {
     prefix: b2
     dir: out
     connection: broker
-}</pre>
+}
+</pre></div>
 </div>
 <p>The linkRoute tells router Ra that any sender or receiver that
 is attached with a target or source (respectively) whos address begins

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/schema.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/schema.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/schema.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/schema.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="management-schema">
 <h1>3.4. Management Schema<a class="headerlink" href="#management-schema" title="Permalink to this headline">.</a></h1>
@@ -213,7 +212,9 @@ be modified using the <cite>update</cite
 <dt><em>protocolFamily</em> (One of [&#8216;IPv4&#8217;, &#8216;IPv6&#8217;], <cite>CREATE</cite>)</dt>
 <dd>[&#8216;IPv4&#8217;, &#8216;IPv6&#8217;] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6.  If not specified, the protocol family will be automatically determined from the address.</dd>
 <dt><em>role</em> (One of [&#8216;normal&#8217;, &#8216;inter-router&#8217;, &#8216;route-container&#8217;, &#8216;on-demand&#8217;], default=&#8217;normal&#8217;, <cite>CREATE</cite>)</dt>
-<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections.</dd>
+<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.</dd>
+<dt><em>cost</em> (integer, default=&#8216;1&#8217;, <cite>CREATE</cite>)</dt>
+<dd>For the &#8216;inter-router&#8217; role only.  This value assigns a cost metric to the inter-router connection.  The default (and minimum) value is one.  Higher values represent higher costs.  The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress.</dd>
 <dt><em>certDb</em> (path, <cite>CREATE</cite>)</dt>
 <dd>The path to the database that contains the public certificates of trusted certificate authorities (CA).</dd>
 <dt><em>certFile</em> (path, <cite>CREATE</cite>)</dt>
@@ -240,8 +241,8 @@ be modified using the <cite>update</cite
 <dd>yes: Require the use of SSL or TLS on the connection; no: Allow clients to connect without SSL or TLS.</dd>
 <dt><em>trustedCerts</em> (path, <cite>CREATE</cite>)</dt>
 <dd>This optional setting can be used to reduce the set of available CAs for client authentication.  If used, this setting must provide a path to a PEM file that contains the trusted certificates.</dd>
-<dt><em>maxFrameSize</em> (integer, default=65536, <cite>CREATE</cite>)</dt>
-<dd>Defaults to 65536.  If specified, it is the maximum frame size in octets that will be used in the connection-open negotiation with a connected peer.  The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity.</dd>
+<dt><em>maxFrameSize</em> (integer, default=16384, <cite>CREATE</cite>)</dt>
+<dd>Defaults to 16384.  If specified, it is the maximum frame size in octets that will be used in the connection-open negotiation with a connected peer.  The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity.</dd>
 <dt><em>idleTimeoutSeconds</em> (integer, default=16, <cite>CREATE</cite>)</dt>
 <dd>The idle timeout, in seconds, for connections through this listener.  If no frames are received on the connection for this time interval, the connection shall be closed.</dd>
 <dt><em>requirePeerAuth</em> (boolean, <cite>CREATE</cite>)</dt>
@@ -268,7 +269,9 @@ be modified using the <cite>update</cite
 <dt><em>protocolFamily</em> (One of [&#8216;IPv4&#8217;, &#8216;IPv6&#8217;], <cite>CREATE</cite>)</dt>
 <dd>[&#8216;IPv4&#8217;, &#8216;IPv6&#8217;] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6.  If not specified, the protocol family will be automatically determined from the address.</dd>
 <dt><em>role</em> (One of [&#8216;normal&#8217;, &#8216;inter-router&#8217;, &#8216;route-container&#8217;, &#8216;on-demand&#8217;], default=&#8217;normal&#8217;, <cite>CREATE</cite>)</dt>
-<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections.</dd>
+<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.</dd>
+<dt><em>cost</em> (integer, default=&#8216;1&#8217;, <cite>CREATE</cite>)</dt>
+<dd>For the &#8216;inter-router&#8217; role only.  This value assigns a cost metric to the inter-router connection.  The default (and minimum) value is one.  Higher values represent higher costs.  The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress.</dd>
 <dt><em>certDb</em> (path, <cite>CREATE</cite>)</dt>
 <dd>The path to the database that contains the public certificates of trusted certificate authorities (CA).</dd>
 <dt><em>certFile</em> (path, <cite>CREATE</cite>)</dt>
@@ -395,6 +398,8 @@ be modified using the <cite>update</cite
 <dd>Treatment of traffic associated with the address</dd>
 <dt><em>dir</em> (One of [&#8216;in&#8217;, &#8216;out&#8217;], required, <cite>CREATE</cite>)</dt>
 <dd>The permitted direction of links: &#8216;in&#8217; means client senders; &#8216;out&#8217; means client receivers</dd>
+<dt><em>operStatus</em> (One of [&#8216;inactive&#8217;, &#8216;active&#8217;])</dt>
+<dd>The operational status of this linkRoute: inactive - The remote container is not connected; active - the remote container is connected and ready to accept link routed attachments.</dd>
 </dl>
 </div>
 <div class="section" id="router-config-autolink">
@@ -687,6 +692,8 @@ operational attributes.</p>
 <dd>Address of the remote node</dd>
 <dt><em>routerLink</em> (entityId)</dt>
 <dd>Local link to remote node</dd>
+<dt><em>cost</em> (integer)</dt>
+<dd>Reachability cost</dd>
 </dl>
 </div>
 <div class="section" id="connection">
@@ -760,10 +767,6 @@ operational attributes.</p>
 <p><em>sessionDenied</em> (integer)</p>
 <p><em>senderDenied</em> (integer)</p>
 <p><em>receiverDenied</em> (integer)</p>
-<p><em>dynamicSrcDenied</em> (integer)</p>
-<p><em>anonymousSenderDenied</em> (integer)</p>
-<p><em>linkSourceDenied</em> (integer)</p>
-<p><em>linkTargetDenied</em> (integer)</p>
 </div>
 </div>
 <div class="section" id="management-operations">

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/technical_details.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/technical_details.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/technical_details.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/technical_details.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="technical-details-and-specifications">
 <h1>3. Technical Details and Specifications<a class="headerlink" href="#technical-details-and-specifications" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/tools.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/tools.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/tools.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/tools.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="tools">
 <h1>2.2. Tools<a class="headerlink" href="#tools" title="Permalink to this headline">.</a></h1>
@@ -168,18 +167,22 @@ are attached to other routers in a netwo
 to not only view but modify the configuration of a running dispatch
 router.</p>
 <p>For example you can query all the connection entities in the router:</p>
-<div class="highlight-python"><pre>$ qdmanage query --type connection</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdmanage query --type connection
+</pre></div>
 </div>
 <p>To enable logging debug and higher level messages by default:</p>
-<div class="highlight-python"><pre>$ qdmanage update log/DEFAULT enable=debug+</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdmanage update log/DEFAULT enable=debug+
+</pre></div>
 </div>
 <p>In fact, everything that can be configured in the configuration file can
 also be created in a running router via management. For example to
 create a new listener in a running router:</p>
-<div class="highlight-python"><pre>$ qdmanage create type=listener port=5555</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdmanage create type=listener port=5555
+</pre></div>
 </div>
 <p>Now you can connect to port 5555, for exampple:</p>
-<div class="highlight-python"><pre>$ qdmanage query -b localhost:5555 --type listener</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ qdmanage query -b localhost:5555 --type listener
+</pre></div>
 </div>
 <p>For complete details see the <cite>qdmanage(8)</cite> man page and the output of
 <cite>qdmanage &#8211;help</cite>. Also for details of what can be configured see the

Modified: qpid/site/docs/releases/qpid-dispatch-master/book/using.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/book/using.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/book/using.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/book/using.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="using-qpid-dispatch">
 <h1>2. Using Qpid Dispatch<a class="headerlink" href="#using-qpid-dispatch" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/docs/releases/qpid-dispatch-master/index.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/index.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/index.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/index.html Mon Apr 25 18:13:24 2016
@@ -124,7 +124,7 @@ https://github.com/apache/qpid-proton/bl
 incomplete.  For a smoother experience, see the <a href="/releases/qpid-dispatch-0.5/index.html">current stable
 release</a>.</p>
 
-<p>This content was generated at 12:55  on Tuesday, 05 April 2016.</p>
+<p>This content was generated at 13:53  on Monday, 25 April 2016.</p>
 
 </div>
 

Modified: qpid/site/docs/releases/qpid-dispatch-master/man/qdmanage.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/man/qdmanage.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/man/qdmanage.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/man/qdmanage.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="qdmanage-manual-page">
 <h1>qdmanage manual page<a class="headerlink" href="#qdmanage-manual-page" title="Permalink to this headline">.</a></h1>
@@ -178,19 +177,41 @@ formatted output.</dd>
 </div>
 <div class="section" id="options">
 <h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">.</a></h2>
-<p>Command &#8216;[&#8216;/tmp/ross/transom/qpid-dispatch-master/tools/qdmanage&#8217;, &#8216;&#8211;help&#8217;]&#8217; returned non-zero exit status 1</p>
-<dl class="docutils">
-<dt>Traceback (most recent call last):</dt>
-<dd><dl class="first last docutils">
-<dt>File &#8220;/tmp/ross/transom/qpid-dispatch-master/tools/qdmanage&#8221;, line 24, in &lt;module&gt;</dt>
-<dd>from qpid_dispatch.management.client import Node, Url</dd>
-<dt>File &#8220;/tmp/ross/transom/qpid-dispatch-master/python/qpid_dispatch/management/client.py&#8221;, line 25, in &lt;module&gt;</dt>
-<dd>import proton</dd>
-</dl>
-</dd>
-</dl>
-<p>ImportError: No module named proton</p>
-<p>Run python script &#8216;/tmp/ross/transom/qpid-dispatch-master/doc/man/help2rst.py&#8217;:CalledProcessError: Command &#8216;[&#8216;/tmp/ross/transom/qpid-dispatch-master/tools/qdmanage&#8217;, &#8216;&#8211;help&#8217;]&#8217; returned non-zero exit status 1</p>
+<p>-h, &#8211;help
+:   show this help message and exit</p>
+<p>&#8211;version
+:   Print version and exit.</p>
+<p>&#8211;type=TYPE
+:   Type of entity to operate on.</p>
+<p>&#8211;name=NAME
+:   Name of entity to operate on.</p>
+<p>&#8211;identity=ID
+:   Identity of entity to operate on.</p>
+<p>&#8211;indent=INDENT
+:   Pretty-printing indent. -1 means don&#8217;t pretty-print</p>
+<p>&#8211;stdin
+:   Read attributes as JSON map or list of maps from</p>
+<p>&#8211;body=BODY
+:   JSON value to use as body of a non-standard operation</p>
+<p>&#8211;properties=PROPERTIES
+:   JSON map to use as properties for a non-standard operation call.</p>
+<div class="section" id="connection-options">
+<h3>Connection Options<a class="headerlink" href="#connection-options" title="Permalink to this headline">.</a></h3>
+<p>-b URL, &#8211;bus=URL
+:   URL of the messaging bus to connect to (default</p>
+<p>-r ROUTER-ID, &#8211;router=ROUTER-ID
+:   Router to be queried</p>
+<p>-t SECS, &#8211;timeout=SECS
+:   Maximum time to wait for connection in seconds (default 5)</p>
+<p>&#8211;ssl-certificate=CERT
+:   Client SSL certificate (PEM Format)</p>
+<p>&#8211;ssl-key=KEY
+:   Client SSL private key (PEM Format)</p>
+<p>&#8211;ssl-trustfile=TRUSTED-CA-DB
+:   Trusted Certificate Authority Database file (PEM Format)</p>
+<p>&#8211;ssl-password=PASSWORD
+:   Certificate password, will be prompted if not specifed.</p>
+</div>
 </div>
 <div class="section" id="files">
 <h2>Files<a class="headerlink" href="#files" title="Permalink to this headline">.</a></h2>
@@ -204,20 +225,25 @@ formatted output.</dd>
 <div class="section" id="examples">
 <h2>Examples<a class="headerlink" href="#examples" title="Permalink to this headline">.</a></h2>
 <p>Show the logging configuration</p>
-<div class="highlight-python"><pre>qdmanage query --type=log</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage query --type=log
+</pre></div>
 </div>
 <p>Enable debug and higher log messages by default:</p>
-<div class="highlight-python"><pre>qdmanage udpdate name=log/DEFAULT enable=debug+</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage udpdate name=log/DEFAULT enable=debug+
+</pre></div>
 </div>
 <p>Enable trace log messages only for the MESSAGE moudle and direct MESSAGE
 logs to the file &#8220;test.log&#8221;</p>
-<div class="highlight-python"><pre>qdmanage udpdate name=log/MESSAGE enable=trace output=test.log</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage udpdate name=log/MESSAGE enable=trace output=test.log
+</pre></div>
 </div>
 <p>Set MESSAGE logging back to the default:</p>
-<div class="highlight-python"><pre>qdmanage udpdate name=log/MESSAGE enable=default</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage udpdate name=log/MESSAGE enable=default
+</pre></div>
 </div>
 <p>Disable MESSAGE logging:</p>
-<div class="highlight-python"><pre>qdmanage udpdate name=log/MESSAGE enable=none</pre>
+<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage udpdate name=log/MESSAGE enable=none
+</pre></div>
 </div>
 </div>
 <div class="section" id="see-also">

Modified: qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.conf.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.conf.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.conf.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.conf.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="qdrouterd-conf-manual-page">
 <h1>qdrouterd.conf manual page<a class="headerlink" href="#qdrouterd-conf-manual-page" title="Permalink to this headline">.</a></h1>
@@ -126,11 +125,12 @@ https://github.com/apache/qpid-proton/bl
 <div class="section" id="description">
 <h2>Description<a class="headerlink" href="#description" title="Permalink to this headline">.</a></h2>
 <p>The configuration file is made up of sections with this syntax:</p>
-<div class="highlight-python"><pre>SECTION-NAME {
+<div class="highlight-python"><div class="highlight"><pre><span></span>SECTION-NAME {
     ATTRIBUTE-NAME: ATTRIBUTE-VALUE
     ATTRIBUTE-NAME: ATTRIBUTE-VALUE
     ...
-}</pre>
+}
+</pre></div>
 </div>
 <p>There are two types of sections:</p>
 <p><em>Configuration sections</em> correspond to configuration entities. They can be queried and
@@ -141,7 +141,7 @@ one or more entity sections.</p>
 that can be included in multiple &#8220;listener&#8221; entities. Here&#8217;s an example, note
 how the &#8216;ssl-profile&#8217; attribute of &#8216;listener&#8217; sections references the &#8216;name&#8217;
 attribute of &#8216;ssl-profile&#8217; sections.</p>
-<div class="highlight-python"><pre>ssl-profile {
+<div class="highlight-python"><div class="highlight"><pre><span></span>ssl-profile {
     name: ssl-profile-one
     cert-db: ca-certificate-1.pem
     cert-file: server-certificate-1.pem
@@ -153,7 +153,8 @@ listener {
     addr: 0.0.0.0
     port: 20102
     sasl-mechanisms: ANONYMOUS
-}</pre>
+}
+</pre></div>
 </div>
 </div>
 <div class="section" id="annotation-sections">
@@ -177,7 +178,9 @@ listener {
 <p>Used by: <strong>listener</strong>, <strong>connector</strong>.</p>
 <dl class="docutils">
 <dt><em>role</em> (One of [&#8216;normal&#8217;, &#8216;inter-router&#8217;, &#8216;route-container&#8217;, &#8216;on-demand&#8217;], default=&#8217;normal&#8217;)</dt>
-<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections.</dd>
+<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.</dd>
+<dt><em>cost</em> (integer, default=&#8216;1&#8217;)</dt>
+<dd>For the &#8216;inter-router&#8217; role only.  This value assigns a cost metric to the inter-router connection.  The default (and minimum) value is one.  Higher values represent higher costs.  The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress.</dd>
 </dl>
 </div>
 <div class="section" id="sslprofile">
@@ -254,7 +257,9 @@ listener {
 <dt><em>protocolFamily</em> (One of [&#8216;IPv4&#8217;, &#8216;IPv6&#8217;])</dt>
 <dd>[&#8216;IPv4&#8217;, &#8216;IPv6&#8217;] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6.  If not specified, the protocol family will be automatically determined from the address.</dd>
 <dt><em>role</em> (One of [&#8216;normal&#8217;, &#8216;inter-router&#8217;, &#8216;route-container&#8217;, &#8216;on-demand&#8217;], default=&#8217;normal&#8217;)</dt>
-<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections.</dd>
+<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.</dd>
+<dt><em>cost</em> (integer, default=&#8216;1&#8217;)</dt>
+<dd>For the &#8216;inter-router&#8217; role only.  This value assigns a cost metric to the inter-router connection.  The default (and minimum) value is one.  Higher values represent higher costs.  The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress.</dd>
 <dt><em>certDb</em> (path)</dt>
 <dd>The path to the database that contains the public certificates of trusted certificate authorities (CA).</dd>
 <dt><em>certFile</em> (path)</dt>
@@ -279,8 +284,8 @@ listener {
 <dd>yes: Require the use of SSL or TLS on the connection; no: Allow clients to connect without SSL or TLS.</dd>
 <dt><em>trustedCerts</em> (path)</dt>
 <dd>This optional setting can be used to reduce the set of available CAs for client authentication.  If used, this setting must provide a path to a PEM file that contains the trusted certificates.</dd>
-<dt><em>maxFrameSize</em> (integer, default=65536)</dt>
-<dd>Defaults to 65536.  If specified, it is the maximum frame size in octets that will be used in the connection-open negotiation with a connected peer.  The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity.</dd>
+<dt><em>maxFrameSize</em> (integer, default=16384)</dt>
+<dd>Defaults to 16384.  If specified, it is the maximum frame size in octets that will be used in the connection-open negotiation with a connected peer.  The frame size is the largest contiguous set of uninterrupted data that can be sent for a message delivery over the connection. Interleaving of messages on different links is done at frame granularity.</dd>
 <dt><em>idleTimeoutSeconds</em> (integer, default=16)</dt>
 <dd>The idle timeout, in seconds, for connections through this listener.  If no frames are received on the connection for this time interval, the connection shall be closed.</dd>
 <dt><em>requirePeerAuth</em> (boolean)</dt>
@@ -307,7 +312,9 @@ listener {
 <dt><em>protocolFamily</em> (One of [&#8216;IPv4&#8217;, &#8216;IPv6&#8217;])</dt>
 <dd>[&#8216;IPv4&#8217;, &#8216;IPv6&#8217;] IPv4: Internet Protocol version 4; IPv6: Internet Protocol version 6.  If not specified, the protocol family will be automatically determined from the address.</dd>
 <dt><em>role</em> (One of [&#8216;normal&#8217;, &#8216;inter-router&#8217;, &#8216;route-container&#8217;, &#8216;on-demand&#8217;], default=&#8217;normal&#8217;)</dt>
-<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections.</dd>
+<dd>The role of an established connection. In the normal role, the connection is assumed to be used for AMQP clients that are doing normal message delivery over the connection.  In the inter-router role, the connection is assumed to be to another router in the network.  Inter-router discovery and routing protocols can only be used over inter-router connections. route-container role can be used for router-container connections, for example, a router-broker connection. on-demand role has been deprecated.</dd>
+<dt><em>cost</em> (integer, default=&#8216;1&#8217;)</dt>
+<dd>For the &#8216;inter-router&#8217; role only.  This value assigns a cost metric to the inter-router connection.  The default (and minimum) value is one.  Higher values represent higher costs.  The cost is used to influence the routing algorithm as it attempts to use the path with the lowest total cost from ingress to egress.</dd>
 <dt><em>certDb</em> (path)</dt>
 <dd>The path to the database that contains the public certificates of trusted certificate authorities (CA).</dd>
 <dt><em>certFile</em> (path)</dt>

Modified: qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/man/qdrouterd.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="qdrouterd-manual-page">
 <h1>qdrouterd manual page<a class="headerlink" href="#qdrouterd-manual-page" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/docs/releases/qpid-dispatch-master/man/qdstat.html
URL: http://svn.apache.org/viewvc/qpid/site/docs/releases/qpid-dispatch-master/man/qdstat.html?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/docs/releases/qpid-dispatch-master/man/qdstat.html (original)
+++ qpid/site/docs/releases/qpid-dispatch-master/man/qdstat.html Mon Apr 25 18:13:24 2016
@@ -115,7 +115,6 @@ https://github.com/apache/qpid-proton/bl
 
         <div id="-middle-content">
           
-
   
   <div class="section" id="qdstat-manual-page">
 <h1>qdstat manual page<a class="headerlink" href="#qdstat-manual-page" title="Permalink to this headline">.</a></h1>
@@ -131,19 +130,49 @@ as memory use.</p>
 </div>
 <div class="section" id="options">
 <h2>Options<a class="headerlink" href="#options" title="Permalink to this headline">.</a></h2>
-<p>Command &#8216;[&#8216;/tmp/ross/transom/qpid-dispatch-master/tools/qdstat&#8217;, &#8216;&#8211;help&#8217;]&#8217; returned non-zero exit status 1</p>
-<dl class="docutils">
-<dt>Traceback (most recent call last):</dt>
-<dd><dl class="first last docutils">
-<dt>File &#8220;/tmp/ross/transom/qpid-dispatch-master/tools/qdstat&#8221;, line 30, in &lt;module&gt;</dt>
-<dd>from qpid_dispatch.management.client import Url, Node, Entity</dd>
-<dt>File &#8220;/tmp/ross/transom/qpid-dispatch-master/python/qpid_dispatch/management/client.py&#8221;, line 25, in &lt;module&gt;</dt>
-<dd>import proton</dd>
-</dl>
-</dd>
-</dl>
-<p>ImportError: No module named proton</p>
-<p>Run python script &#8216;/tmp/ross/transom/qpid-dispatch-master/doc/man/help2rst.py&#8217;:CalledProcessError: Command &#8216;[&#8216;/tmp/ross/transom/qpid-dispatch-master/tools/qdstat&#8217;, &#8216;&#8211;help&#8217;]&#8217; returned non-zero exit status 1</p>
+<p>-h, &#8211;help
+:   show this help message and exit</p>
+<p>&#8211;version
+:   Print version and exit.</p>
+<p>-g, &#8211;general
+:   Show General Router Stats</p>
+<p>-c, &#8211;connections
+:   Show Connections</p>
+<p>-l, &#8211;links
+:   Show Router Links</p>
+<p>-n, &#8211;nodes
+:   Show Router Nodes</p>
+<p>-a, &#8211;address
+:   Show Router Addresses</p>
+<p>-m, &#8211;memory
+:   Show Router Memory Stats</p>
+<p>&#8211;autolinks
+:   Show Auto Links</p>
+<p>&#8211;linkroutes
+:   Show Link Routes</p>
+<p>-v, &#8211;verbose
+:   Show maximum detail</p>
+<p>&#8211;log
+:   Show recent log entries</p>
+<p>&#8211;limit=LIMIT
+:   Limit number of log entries</p>
+<div class="section" id="connection-options">
+<h3>Connection Options<a class="headerlink" href="#connection-options" title="Permalink to this headline">.</a></h3>
+<p>-b URL, &#8211;bus=URL
+:   URL of the messaging bus to connect to (default</p>
+<p>-r ROUTER-ID, &#8211;router=ROUTER-ID
+:   Router to be queried</p>
+<p>-t SECS, &#8211;timeout=SECS
+:   Maximum time to wait for connection in seconds (default 5)</p>
+<p>&#8211;ssl-certificate=CERT
+:   Client SSL certificate (PEM Format)</p>
+<p>&#8211;ssl-key=KEY
+:   Client SSL private key (PEM Format)</p>
+<p>&#8211;ssl-trustfile=TRUSTED-CA-DB
+:   Trusted Certificate Authority Database file (PEM Format)</p>
+<p>&#8211;ssl-password=PASSWORD
+:   Certificate password, will be prompted if not specifed.</p>
+</div>
 </div>
 <div class="section" id="see-also">
 <h2>See also<a class="headerlink" href="#see-also" title="Permalink to this headline">.</a></h2>

Modified: qpid/site/input/releases/qpid-dispatch-master/book/addressing.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-dispatch-master/book/addressing.html.in?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-dispatch-master/book/addressing.html.in (original)
+++ qpid/site/input/releases/qpid-dispatch-master/book/addressing.html.in Mon Apr 25 18:13:24 2016
@@ -1,5 +1,4 @@
 
-
   
   <div class="section" id="addressing">
 <h1>3.2. Addressing<a class="headerlink" href="#addressing" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/input/releases/qpid-dispatch-master/book/amqp-mapping.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-dispatch-master/book/amqp-mapping.html.in?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-dispatch-master/book/amqp-mapping.html.in (original)
+++ qpid/site/input/releases/qpid-dispatch-master/book/amqp-mapping.html.in Mon Apr 25 18:13:24 2016
@@ -1,5 +1,4 @@
 
-
   
   <div class="section" id="amqp-mapping">
 <h1>3.3. AMQP Mapping<a class="headerlink" href="#amqp-mapping" title="Permalink to this headline">.</a></h1>

Modified: qpid/site/input/releases/qpid-dispatch-master/book/auto_links.html.in
URL: http://svn.apache.org/viewvc/qpid/site/input/releases/qpid-dispatch-master/book/auto_links.html.in?rev=1740870&r1=1740869&r2=1740870&view=diff
==============================================================================
--- qpid/site/input/releases/qpid-dispatch-master/book/auto_links.html.in (original)
+++ qpid/site/input/releases/qpid-dispatch-master/book/auto_links.html.in Mon Apr 25 18:13:24 2016
@@ -1,5 +1,4 @@
 
-
   
   <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>
@@ -26,7 +25,7 @@ of the container, or</li>
 <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 {
+<div class="highlight-python"><div class="highlight"><pre><span></span>connector {
     name: broker
     role: route-container
     addr: &lt;hostname&gt;
@@ -61,7 +60,8 @@ autoLink {
     addr: queue.second
     dir: out
     connection: broker
-}</pre>
+}
+</pre></div>
 </div>
 <p>The <em>address</em> entity identifies a namespace (queue.*) that will be
 used for routing messages through queues via autolinks.  The four
@@ -69,40 +69,44 @@ used for routing messages through queues
 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
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  queue.second  out  0            inactive
+</pre></div>
 </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
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  queue.second  out  0            failed  Node not found: queue.second
+</pre></div>
 </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 class="highlight-python"><div class="highlight"><pre><span></span>$ python simple_send.py -a 127.0.0.1/queue.first -m3
+all messages confirmed
+</pre></div>
 </div>
 <p>and then look at the address statistics on the router:</p>
-<div class="highlight-python"><pre>$ qdstat -a
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  mobile  queue.first    0    balanced  0        1      0       0      3   3    0     0        0
+</pre></div>
 </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
@@ -116,20 +120,22 @@ that arrived from simple_send and 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 class="highlight-python"><div class="highlight"><pre><span></span>$ python simple_recv_noignore.py -a 127.0.0.1:5672/queue.first -m3
+{u&#39;sequence&#39;: int32(1)}
+{u&#39;sequence&#39;: int32(2)}
+{u&#39;sequence&#39;: int32(3)}
+</pre></div>
 </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
+<div class="highlight-python"><div class="highlight"><pre><span></span>$ 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>
+  mobile  queue.first    0    balanced  0        1      0       0      3   3    0     0        0
+</pre></div>
 </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
@@ -140,7 +146,7 @@ the queue on the connected broker.</p>
 <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 {
+<div class="highlight-python"><div class="highlight"><pre><span></span>connector {
     name: broker1
     role: route-container
     addr: &lt;hostname&gt;
@@ -183,7 +189,8 @@ autoLink {
     addr: queue.first
     dir: out
     connection: broker2
-}</pre>
+}
+</pre></div>
 </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
@@ -196,9 +203,10 @@ to the same address.</p>
 <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
+<div class="highlight-python"><div class="highlight"><pre><span></span>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>
+qdmanage create --type org.apache.qpid.dispatch.router.config.autoLink addr=queue.first dir=out connection=broker3
+</pre></div>
 </div>
 </div>
 </div>



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


Mime
View raw message