Repository: qpid-site Updated Branches: refs/heads/asf-site 627da7248 -> 5911c9cf8
DISPATCH-256: Release content minor updates, fix some generation errors. Project: http://git-wip-us.apache.org/repos/asf/qpid-site/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-site/commit/5911c9cf Tree: http://git-wip-us.apache.org/repos/asf/qpid-site/tree/5911c9cf Diff: http://git-wip-us.apache.org/repos/asf/qpid-site/diff/5911c9cf Branch: refs/heads/asf-site Commit: 5911c9cf8ca77a19031ed185fe3e841c05e7503c Parents: 627da72 Author: Alan Conway <[email protected]> Authored: Tue May 17 09:49:46 2016 -0400 Committer: Alan Conway <[email protected]> Committed: Tue May 17 09:49:46 2016 -0400 ---------------------------------------------------------------------- .../qpid-dispatch-master/book/auto_links.html | 8 +++--- .../book/console_installation.html | 2 +- .../qpid-dispatch-master/book/link_routing.html | 2 +- .../qpid-dispatch-master/book/schema.html | 22 +++++++++++++---- .../releases/qpid-dispatch-master/index.html | 2 +- .../qpid-dispatch-master/man/qdmanage.html | 8 +++--- .../man/qdrouterd.conf.html | 26 +++++++++++++++----- .../qpid-dispatch-master/man/qdstat.html | 2 +- .../book/auto_links.html.in | 8 +++--- .../book/console_installation.html.in | 2 +- .../book/link_routing.html.in | 2 +- .../qpid-dispatch-master/book/schema.html.in | 22 +++++++++++++---- input/releases/qpid-dispatch-master/index.md | 2 +- .../qpid-dispatch-master/man/qdmanage.html.in | 8 +++--- .../man/qdrouterd.conf.html.in | 26 +++++++++++++++----- .../qpid-dispatch-master/man/qdstat.html.in | 2 +- 16 files changed, 98 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/book/auto_links.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/book/auto_links.html b/content/releases/qpid-dispatch-master/book/auto_links.html index 42cd747..fdd7498 100644 --- a/content/releases/qpid-dispatch-master/book/auto_links.html +++ b/content/releases/qpid-dispatch-master/book/auto_links.html @@ -144,7 +144,7 @@ through a pair of queues on a broker:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>connector { name: broker role: route-container - addr: <hostname> + host: <hostname> port: <port> sasl-mechanisms: ANONYMOUS } @@ -265,7 +265,7 @@ multiple brokers share the message-queueing load.</p> <div class="highlight-python"><div class="highlight"><pre><span></span>connector { name: broker1 role: route-container - addr: <hostname> + host: <hostname> port: <port> sasl-mechanisms: ANONYMOUS } @@ -273,7 +273,7 @@ multiple brokers share the message-queueing load.</p> connector { name: broker2 role: route-container - addr: <hostname> + host: <hostname> port: <port> sasl-mechanisms: ANONYMOUS } @@ -319,7 +319,7 @@ 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"><div class="highlight"><pre><span></span>qdmanage create --type org.apache.qpid.dispatch.connector addr=<host> port=<port> name=broker3 +<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage create --type org.apache.qpid.dispatch.connector host=<host> port=<port> 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> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/book/console_installation.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/book/console_installation.html b/content/releases/qpid-dispatch-master/book/console_installation.html index bc13941..ca7d0a1 100644 --- a/content/releases/qpid-dispatch-master/book/console_installation.html +++ b/content/releases/qpid-dispatch-master/book/console_installation.html @@ -135,7 +135,7 @@ To start the proton’s nodejs proxy:</p> <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’s role should be ‘normal’. For example:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>listener { - addr: 0.0.0.0 + host: 0.0.0.0 role: normal port: amqp saslMechanisms: ANONYMOUS http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/book/link_routing.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/book/link_routing.html b/content/releases/qpid-dispatch-master/book/link_routing.html index c70d1c8..6f08973 100644 --- a/content/releases/qpid-dispatch-master/book/link_routing.html +++ b/content/releases/qpid-dispatch-master/book/link_routing.html @@ -183,7 +183,7 @@ broker B2:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>connector { name: broker role: route-container - addr: <B2-url> + host: <B2-url> port: <B2-port> sasl-mechanisms: ANONYMOUS } http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/book/schema.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/book/schema.html b/content/releases/qpid-dispatch-master/book/schema.html index 9ab172b..1de21ea 100644 --- a/content/releases/qpid-dispatch-master/book/schema.html +++ b/content/releases/qpid-dispatch-master/book/schema.html @@ -174,8 +174,10 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <p>Tracks peer routers and computes routes to destinations.</p> <p>Operations allowed: <cite>READ</cite></p> <dl class="docutils"> -<dt><em>routerId</em> (string, required, <cite>CREATE</cite>)</dt> -<dd>Router’s unique identity.</dd> +<dt><em>routerId</em> (string, <cite>CREATE</cite>)</dt> +<dd>(DEPRECATED) Router’s unique identity. This attribute has been deprecated. Use id instead</dd> +<dt><em>id</em> (string, <cite>CREATE</cite>)</dt> +<dd>Router’s unique identity. One of id or routerId is required. The router will fail to start without id or routerId</dd> <dt><em>mode</em> (One of [‘standalone’, ‘interior’], default=’standalone’, <cite>CREATE</cite>)</dt> <dd>In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network.</dd> <dt><em>area</em> (string)</dt> @@ -214,7 +216,9 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’, <cite>CREATE</cite>)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’], <cite>CREATE</cite>)</dt> @@ -271,7 +275,9 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’, <cite>CREATE</cite>)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’], <cite>CREATE</cite>)</dt> @@ -308,6 +314,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <dd>[‘in’, ‘out’, ‘both’, ‘no’] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations</dd> <dt><em>linkCapacity</em> (integer, <cite>CREATE</cite>)</dt> <dd>The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link.</dd> +<dt><em>verifyHostName</em> (boolean, default=True, <cite>CREATE</cite>)</dt> +<dd>yes: Ensures that when initiating a connection (as a client) the host name in the URL to which this connector connects to matches the host name in the digital certificate that the peer sends back as part of the SSL connection; no: Does not perform host name verification</dd> <dt><em>saslUsername</em> (string, <cite>CREATE</cite>)</dt> <dd>The user name that the connector is using to connect to a peer.</dd> <dt><em>saslPassword</em> (string, <cite>CREATE</cite>)</dt> @@ -461,6 +469,10 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <dd>Enable user rule set processing and connection denial.</dd> <dt><em>policyFolder</em> (path, <cite>CREATE</cite>)</dt> <dd>The path to a folder that holds policyRuleset definition .json files. For a small system the rulesets may all be defined in this file. At a larger scale it is better to have the policy files in their own folder and to have none of the rulesets defined here. All rulesets in all .json files in this folder are processed.</dd> +<dt><em>defaultApplication</em> (string, <cite>CREATE</cite>)</dt> +<dd>Application policyRuleset to use for connections with no open.hostname or a hostname that does not match any existing policy. For users that don’t wish to use open.hostname or any multi-tennancy feature, this default policy can be the only policy in effect for the network.</dd> +<dt><em>defaultApplicationEnabled</em> (boolean, <cite>CREATE</cite>)</dt> +<dd>Enable defaultApplication policy fallback logic.</dd> </dl> <p><em>connectionsProcessed</em> (integer)</p> <p><em>connectionsDenied</em> (integer)</p> @@ -690,7 +702,7 @@ operational attributes.</p> <p>Remote router node connected to this router.</p> <p>Operations allowed: <cite>READ</cite></p> <dl class="docutils"> -<dt><em>routerId</em> (string)</dt> +<dt><em>id</em> (string)</dt> <dd>Remote node identifier.</dd> <dt><em>instance</em> (integer)</dt> <dd>Remote node boot number.</dd> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/index.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/index.html b/content/releases/qpid-dispatch-master/index.html index aa4f45b..bce2f4f 100644 --- a/content/releases/qpid-dispatch-master/index.html +++ b/content/releases/qpid-dispatch-master/index.html @@ -124,7 +124,7 @@ https://github.com/apache/qpid-proton/blob/go1{/dir}/{file}#L{line}"/> 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 11:48 on Wednesday, 11 May 2016.</p> +<p>This content was generated at 09:44 on Tuesday, 17 May 2016.</p> </div> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/man/qdmanage.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/man/qdmanage.html b/content/releases/qpid-dispatch-master/man/qdmanage.html index 66673ab..2aaea88 100644 --- a/content/releases/qpid-dispatch-master/man/qdmanage.html +++ b/content/releases/qpid-dispatch-master/man/qdmanage.html @@ -188,17 +188,17 @@ formatted output.</dd> <p>–identity=ID : Identity of entity to operate on.</p> <p>–indent=INDENT -: Pretty-printing indent. -1 means don’t pretty-print</p> +: Pretty-printing indent. -1 means don’t pretty-print (default 2)</p> <p>–stdin -: Read attributes as JSON map or list of maps from</p> +: Read attributes as JSON map or list of maps from stdin.</p> <p>–body=BODY -: JSON value to use as body of a non-standard operation</p> +: JSON value to use as body of a non-standard operation call.</p> <p>–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, –bus=URL -: URL of the messaging bus to connect to (default</p> +: URL of the messaging bus to connect to (default 0.0.0.0)</p> <p>-r ROUTER-ID, –router=ROUTER-ID : Router to be queried</p> <p>-t SECS, –timeout=SECS http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html b/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html index acdfed9..34d9373 100644 --- a/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html +++ b/content/releases/qpid-dispatch-master/man/qdrouterd.conf.html @@ -150,7 +150,7 @@ attribute of ‘ssl-profile’ sections.</p> listener { ssl-profile: ssl-profile-one - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 sasl-mechanisms: ANONYMOUS } @@ -165,7 +165,9 @@ listener { <p>Used by: <strong>listener</strong>, <strong>connector</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> @@ -227,8 +229,10 @@ listener { <h3>router<a class="headerlink" href="#router" title="Permalink to this headline">.</a></h3> <p>Tracks peer routers and computes routes to destinations.</p> <dl class="docutils"> -<dt><em>routerId</em> (string, required)</dt> -<dd>Router’s unique identity.</dd> +<dt><em>routerId</em> (string)</dt> +<dd>(DEPRECATED) Router’s unique identity. This attribute has been deprecated. Use id instead</dd> +<dt><em>id</em> (string)</dt> +<dd>Router’s unique identity. One of id or routerId is required. The router will fail to start without id or routerId</dd> <dt><em>mode</em> (One of [‘standalone’, ‘interior’], default=’standalone’)</dt> <dd>In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network.</dd> <dt><em>helloInterval</em> (integer, default=1)</dt> @@ -259,7 +263,9 @@ listener { <p>Annotations: <strong>addrPort</strong>, <strong>connectionRole</strong>, <strong>sslProfile</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> @@ -314,7 +320,9 @@ listener { <p>Annotations: <strong>addrPort</strong>, <strong>connectionRole</strong>, <strong>sslProfile</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> @@ -349,6 +357,8 @@ listener { <dd>[‘in’, ‘out’, ‘both’, ‘no’] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations</dd> <dt><em>linkCapacity</em> (integer)</dt> <dd>The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link.</dd> +<dt><em>verifyHostName</em> (boolean, default=True)</dt> +<dd>yes: Ensures that when initiating a connection (as a client) the host name in the URL to which this connector connects to matches the host name in the digital certificate that the peer sends back as part of the SSL connection; no: Does not perform host name verification</dd> <dt><em>saslUsername</em> (string)</dt> <dd>The user name that the connector is using to connect to a peer.</dd> <dt><em>saslPassword</em> (string)</dt> @@ -473,6 +483,10 @@ listener { <dd>Enable user rule set processing and connection denial.</dd> <dt><em>policyFolder</em> (path)</dt> <dd>The path to a folder that holds policyRuleset definition .json files. For a small system the rulesets may all be defined in this file. At a larger scale it is better to have the policy files in their own folder and to have none of the rulesets defined here. All rulesets in all .json files in this folder are processed.</dd> +<dt><em>defaultApplication</em> (string)</dt> +<dd>Application policyRuleset to use for connections with no open.hostname or a hostname that does not match any existing policy. For users that don’t wish to use open.hostname or any multi-tennancy feature, this default policy can be the only policy in effect for the network.</dd> +<dt><em>defaultApplicationEnabled</em> (boolean)</dt> +<dd>Enable defaultApplication policy fallback logic.</dd> </dl> </div> <div class="section" id="policyruleset"> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/content/releases/qpid-dispatch-master/man/qdstat.html ---------------------------------------------------------------------- diff --git a/content/releases/qpid-dispatch-master/man/qdstat.html b/content/releases/qpid-dispatch-master/man/qdstat.html index 7e44f64..d5ff334 100644 --- a/content/releases/qpid-dispatch-master/man/qdstat.html +++ b/content/releases/qpid-dispatch-master/man/qdstat.html @@ -159,7 +159,7 @@ as memory use.</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, –bus=URL -: URL of the messaging bus to connect to (default</p> +: URL of the messaging bus to connect to (default 0.0.0.0)</p> <p>-r ROUTER-ID, –router=ROUTER-ID : Router to be queried</p> <p>-t SECS, –timeout=SECS http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/book/auto_links.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/book/auto_links.html.in b/input/releases/qpid-dispatch-master/book/auto_links.html.in index d94586b..6a66f25 100644 --- a/input/releases/qpid-dispatch-master/book/auto_links.html.in +++ b/input/releases/qpid-dispatch-master/book/auto_links.html.in @@ -28,7 +28,7 @@ through a pair of queues on a broker:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>connector { name: broker role: route-container - addr: <hostname> + host: <hostname> port: <port> sasl-mechanisms: ANONYMOUS } @@ -149,7 +149,7 @@ multiple brokers share the message-queueing load.</p> <div class="highlight-python"><div class="highlight"><pre><span></span>connector { name: broker1 role: route-container - addr: <hostname> + host: <hostname> port: <port> sasl-mechanisms: ANONYMOUS } @@ -157,7 +157,7 @@ multiple brokers share the message-queueing load.</p> connector { name: broker2 role: route-container - addr: <hostname> + host: <hostname> port: <port> sasl-mechanisms: ANONYMOUS } @@ -203,7 +203,7 @@ 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"><div class="highlight"><pre><span></span>qdmanage create --type org.apache.qpid.dispatch.connector addr=<host> port=<port> name=broker3 +<div class="highlight-python"><div class="highlight"><pre><span></span>qdmanage create --type org.apache.qpid.dispatch.connector host=<host> port=<port> 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> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/book/console_installation.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/book/console_installation.html.in b/input/releases/qpid-dispatch-master/book/console_installation.html.in index 573dbb5..f5b5809 100644 --- a/input/releases/qpid-dispatch-master/book/console_installation.html.in +++ b/input/releases/qpid-dispatch-master/book/console_installation.html.in @@ -19,7 +19,7 @@ To start the proton’s nodejs proxy:</p> <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’s role should be ‘normal’. For example:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>listener { - addr: 0.0.0.0 + host: 0.0.0.0 role: normal port: amqp saslMechanisms: ANONYMOUS http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/book/link_routing.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/book/link_routing.html.in b/input/releases/qpid-dispatch-master/book/link_routing.html.in index 8f4413f..a770baa 100644 --- a/input/releases/qpid-dispatch-master/book/link_routing.html.in +++ b/input/releases/qpid-dispatch-master/book/link_routing.html.in @@ -67,7 +67,7 @@ broker B2:</p> <div class="highlight-python"><div class="highlight"><pre><span></span>connector { name: broker role: route-container - addr: <B2-url> + host: <B2-url> port: <B2-port> sasl-mechanisms: ANONYMOUS } http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/book/schema.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/book/schema.html.in b/input/releases/qpid-dispatch-master/book/schema.html.in index fc35561..2a5dc34 100644 --- a/input/releases/qpid-dispatch-master/book/schema.html.in +++ b/input/releases/qpid-dispatch-master/book/schema.html.in @@ -58,8 +58,10 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <p>Tracks peer routers and computes routes to destinations.</p> <p>Operations allowed: <cite>READ</cite></p> <dl class="docutils"> -<dt><em>routerId</em> (string, required, <cite>CREATE</cite>)</dt> -<dd>Router’s unique identity.</dd> +<dt><em>routerId</em> (string, <cite>CREATE</cite>)</dt> +<dd>(DEPRECATED) Router’s unique identity. This attribute has been deprecated. Use id instead</dd> +<dt><em>id</em> (string, <cite>CREATE</cite>)</dt> +<dd>Router’s unique identity. One of id or routerId is required. The router will fail to start without id or routerId</dd> <dt><em>mode</em> (One of [‘standalone’, ‘interior’], default=’standalone’, <cite>CREATE</cite>)</dt> <dd>In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network.</dd> <dt><em>area</em> (string)</dt> @@ -98,7 +100,9 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’, <cite>CREATE</cite>)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’], <cite>CREATE</cite>)</dt> @@ -155,7 +159,9 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <p>Operations allowed: <cite>CREATE</cite>, <cite>DELETE</cite>, <cite>READ</cite></p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’, <cite>CREATE</cite>)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’, <cite>CREATE</cite>)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’], <cite>CREATE</cite>)</dt> @@ -192,6 +198,8 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <dd>[‘in’, ‘out’, ‘both’, ‘no’] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations</dd> <dt><em>linkCapacity</em> (integer, <cite>CREATE</cite>)</dt> <dd>The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link.</dd> +<dt><em>verifyHostName</em> (boolean, default=True, <cite>CREATE</cite>)</dt> +<dd>yes: Ensures that when initiating a connection (as a client) the host name in the URL to which this connector connects to matches the host name in the digital certificate that the peer sends back as part of the SSL connection; no: Does not perform host name verification</dd> <dt><em>saslUsername</em> (string, <cite>CREATE</cite>)</dt> <dd>The user name that the connector is using to connect to a peer.</dd> <dt><em>saslPassword</em> (string, <cite>CREATE</cite>)</dt> @@ -345,6 +353,10 @@ be modified using the <cite>update</cite> operation, see the entity descriptions <dd>Enable user rule set processing and connection denial.</dd> <dt><em>policyFolder</em> (path, <cite>CREATE</cite>)</dt> <dd>The path to a folder that holds policyRuleset definition .json files. For a small system the rulesets may all be defined in this file. At a larger scale it is better to have the policy files in their own folder and to have none of the rulesets defined here. All rulesets in all .json files in this folder are processed.</dd> +<dt><em>defaultApplication</em> (string, <cite>CREATE</cite>)</dt> +<dd>Application policyRuleset to use for connections with no open.hostname or a hostname that does not match any existing policy. For users that don’t wish to use open.hostname or any multi-tennancy feature, this default policy can be the only policy in effect for the network.</dd> +<dt><em>defaultApplicationEnabled</em> (boolean, <cite>CREATE</cite>)</dt> +<dd>Enable defaultApplication policy fallback logic.</dd> </dl> <p><em>connectionsProcessed</em> (integer)</p> <p><em>connectionsDenied</em> (integer)</p> @@ -574,7 +586,7 @@ operational attributes.</p> <p>Remote router node connected to this router.</p> <p>Operations allowed: <cite>READ</cite></p> <dl class="docutils"> -<dt><em>routerId</em> (string)</dt> +<dt><em>id</em> (string)</dt> <dd>Remote node identifier.</dd> <dt><em>instance</em> (integer)</dt> <dd>Remote node boot number.</dd> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/index.md ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/index.md b/input/releases/qpid-dispatch-master/index.md index 7920240..b6b9878 100644 --- a/input/releases/qpid-dispatch-master/index.md +++ b/input/releases/qpid-dispatch-master/index.md @@ -27,7 +27,7 @@ Code and documentation found here may be unstable, incorrect, or incomplete. For a smoother experience, see the [current stable release]({{current_dispatch_release_url}}/index.html). -This content was generated at 11:48 on Wednesday, 11 May 2016. +This content was generated at 09:44 on Tuesday, 17 May 2016. </div> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/man/qdmanage.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/man/qdmanage.html.in b/input/releases/qpid-dispatch-master/man/qdmanage.html.in index 865ef61..6700ce9 100644 --- a/input/releases/qpid-dispatch-master/man/qdmanage.html.in +++ b/input/releases/qpid-dispatch-master/man/qdmanage.html.in @@ -72,17 +72,17 @@ formatted output.</dd> <p>–identity=ID : Identity of entity to operate on.</p> <p>–indent=INDENT -: Pretty-printing indent. -1 means don’t pretty-print</p> +: Pretty-printing indent. -1 means don’t pretty-print (default 2)</p> <p>–stdin -: Read attributes as JSON map or list of maps from</p> +: Read attributes as JSON map or list of maps from stdin.</p> <p>–body=BODY -: JSON value to use as body of a non-standard operation</p> +: JSON value to use as body of a non-standard operation call.</p> <p>–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, –bus=URL -: URL of the messaging bus to connect to (default</p> +: URL of the messaging bus to connect to (default 0.0.0.0)</p> <p>-r ROUTER-ID, –router=ROUTER-ID : Router to be queried</p> <p>-t SECS, –timeout=SECS http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in b/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in index e39cf60..c3cea2a 100644 --- a/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in +++ b/input/releases/qpid-dispatch-master/man/qdrouterd.conf.html.in @@ -34,7 +34,7 @@ attribute of ‘ssl-profile’ sections.</p> listener { ssl-profile: ssl-profile-one - addr: 0.0.0.0 + host: 0.0.0.0 port: 20102 sasl-mechanisms: ANONYMOUS } @@ -49,7 +49,9 @@ listener { <p>Used by: <strong>listener</strong>, <strong>connector</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> @@ -111,8 +113,10 @@ listener { <h3>router<a class="headerlink" href="#router" title="Permalink to this headline">.</a></h3> <p>Tracks peer routers and computes routes to destinations.</p> <dl class="docutils"> -<dt><em>routerId</em> (string, required)</dt> -<dd>Router’s unique identity.</dd> +<dt><em>routerId</em> (string)</dt> +<dd>(DEPRECATED) Router’s unique identity. This attribute has been deprecated. Use id instead</dd> +<dt><em>id</em> (string)</dt> +<dd>Router’s unique identity. One of id or routerId is required. The router will fail to start without id or routerId</dd> <dt><em>mode</em> (One of [‘standalone’, ‘interior’], default=’standalone’)</dt> <dd>In standalone mode, the router operates as a single component. It does not participate in the routing protocol and therefore will not cooperate with other routers. In interior mode, the router operates in cooperation with other interior routers in an interconnected network.</dd> <dt><em>helloInterval</em> (integer, default=1)</dt> @@ -143,7 +147,9 @@ listener { <p>Annotations: <strong>addrPort</strong>, <strong>connectionRole</strong>, <strong>sslProfile</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> @@ -198,7 +204,9 @@ listener { <p>Annotations: <strong>addrPort</strong>, <strong>connectionRole</strong>, <strong>sslProfile</strong>.</p> <dl class="docutils"> <dt><em>addr</em> (string, default=‘127.0.0.1’)</dt> -<dd>IP address: ipv4 or ipv6 literal or a host name.</dd> +<dd>(DEPRECATED)IP address: ipv4 or ipv6 literal or a host name. This attribute has been deprecated. Use host instead</dd> +<dt><em>host</em> (string, default=‘127.0.0.1’)</dt> +<dd>IP address: ipv4 or ipv6 literal or a host name</dd> <dt><em>port</em> (string, default=’amqp’)</dt> <dd>Port number or symbolic service name.</dd> <dt><em>protocolFamily</em> (One of [‘IPv4’, ‘IPv6’])</dt> @@ -233,6 +241,8 @@ listener { <dd>[‘in’, ‘out’, ‘both’, ‘no’] in: Strip the dispatch router specific annotations only on ingress; out: Strip the dispatch router specific annotations only on egress; both: Strip the dispatch router specific annotations on both ingress and egress; no - do not strip dispatch router specific annotations</dd> <dt><em>linkCapacity</em> (integer)</dt> <dd>The capacity of links within this connection, in terms of message deliveries. The capacity is the number of messages that can be in-flight concurrently for each link.</dd> +<dt><em>verifyHostName</em> (boolean, default=True)</dt> +<dd>yes: Ensures that when initiating a connection (as a client) the host name in the URL to which this connector connects to matches the host name in the digital certificate that the peer sends back as part of the SSL connection; no: Does not perform host name verification</dd> <dt><em>saslUsername</em> (string)</dt> <dd>The user name that the connector is using to connect to a peer.</dd> <dt><em>saslPassword</em> (string)</dt> @@ -357,6 +367,10 @@ listener { <dd>Enable user rule set processing and connection denial.</dd> <dt><em>policyFolder</em> (path)</dt> <dd>The path to a folder that holds policyRuleset definition .json files. For a small system the rulesets may all be defined in this file. At a larger scale it is better to have the policy files in their own folder and to have none of the rulesets defined here. All rulesets in all .json files in this folder are processed.</dd> +<dt><em>defaultApplication</em> (string)</dt> +<dd>Application policyRuleset to use for connections with no open.hostname or a hostname that does not match any existing policy. For users that don’t wish to use open.hostname or any multi-tennancy feature, this default policy can be the only policy in effect for the network.</dd> +<dt><em>defaultApplicationEnabled</em> (boolean)</dt> +<dd>Enable defaultApplication policy fallback logic.</dd> </dl> </div> <div class="section" id="policyruleset"> http://git-wip-us.apache.org/repos/asf/qpid-site/blob/5911c9cf/input/releases/qpid-dispatch-master/man/qdstat.html.in ---------------------------------------------------------------------- diff --git a/input/releases/qpid-dispatch-master/man/qdstat.html.in b/input/releases/qpid-dispatch-master/man/qdstat.html.in index 99cd510..4a897f6 100644 --- a/input/releases/qpid-dispatch-master/man/qdstat.html.in +++ b/input/releases/qpid-dispatch-master/man/qdstat.html.in @@ -43,7 +43,7 @@ as memory use.</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, –bus=URL -: URL of the messaging bus to connect to (default</p> +: URL of the messaging bus to connect to (default 0.0.0.0)</p> <p>-r ROUTER-ID, –router=ROUTER-ID : Router to be queried</p> <p>-t SECS, –timeout=SECS --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
