You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2018/10/31 16:50:44 UTC
qpid-dispatch git commit: DISPATCH-1162 - More edge references,
added a new chapter for topologies
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 283cb2f74 -> aacb11ad2
DISPATCH-1162 - More edge references, added a new chapter for topologies
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/aacb11ad
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/aacb11ad
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/aacb11ad
Branch: refs/heads/master
Commit: aacb11ad2bfa02430dfb289667c0d3f8cec58a0e
Parents: 283cb2f
Author: Ted Ross <tr...@redhat.com>
Authored: Wed Oct 31 12:49:17 2018 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Wed Oct 31 12:49:17 2018 -0400
----------------------------------------------------------------------
docs/books/user-guide/book.adoc | 3 +++
.../user-guide/configuration-connections.adoc | 6 +++--
.../user-guide/modules/network-topologies.adoc | 26 ++++++++++++++++++++
docs/books/user-guide/theory_of_operation.adoc | 2 ++
4 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/aacb11ad/docs/books/user-guide/book.adoc
----------------------------------------------------------------------
diff --git a/docs/books/user-guide/book.adoc b/docs/books/user-guide/book.adoc
index ca0f2c6..6cd1873 100644
--- a/docs/books/user-guide/book.adoc
+++ b/docs/books/user-guide/book.adoc
@@ -50,6 +50,9 @@ include::routing.adoc[leveloffset=+1]
// Logging
include::logging.adoc[leveloffset=+1]
+// Network Topologies
+include::modules/network-topologies.adoc[leveloffset=+1]
+
// Management
include::management.adoc[leveloffset=+1]
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/aacb11ad/docs/books/user-guide/configuration-connections.adoc
----------------------------------------------------------------------
diff --git a/docs/books/user-guide/configuration-connections.adoc b/docs/books/user-guide/configuration-connections.adoc
index d424630..75b444c 100644
--- a/docs/books/user-guide/configuration-connections.adoc
+++ b/docs/books/user-guide/configuration-connections.adoc
@@ -37,8 +37,9 @@ Several types of listeners are defined by their role.
|===
| Role | Description
| normal | The connection is used for AMQP clients using normal message delivery.
-| inter-router | 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.
+| inter-router | The connection is assumed to be to another interior router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections.
| route-container | The connection is a broker or other resource that holds known addresses. The router will use this connection to create links as necessary. The addresses are available for routing only after the remote resource has created a connection.
+| edge | The connection is between an edge router and an interior router.
|===
.Procedure
@@ -84,8 +85,9 @@ Several types of connectors are defined by their role.
|===
| Role | Description
| normal | The connection is used for AMQP clients using normal message delivery. On this connector the router will initiate the connection but it will never create any links. Links are to be created by the peer that accepts the connection.
-| inter-router | 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.
+| inter-router | The connection is assumed to be to another interior router in the network. Inter-router discovery and routing protocols can only be used over inter-router connections.
| route-container | The connection is to a broker or other resource that holds known addresses. The router will use this connection to create links as necessary. The addresses are available for routing only after the router has created a connection to the remote resource.
+| edge | The connection is between an edge router and an interior router.
|===
// Adding this here for now; in the future it might be better to have separate procedures for creating inter-router and route-container connections.
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/aacb11ad/docs/books/user-guide/modules/network-topologies.adoc
----------------------------------------------------------------------
diff --git a/docs/books/user-guide/modules/network-topologies.adoc b/docs/books/user-guide/modules/network-topologies.adoc
new file mode 100644
index 0000000..e18314e
--- /dev/null
+++ b/docs/books/user-guide/modules/network-topologies.adoc
@@ -0,0 +1,26 @@
+////
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License
+////
+
+// Module included in the following assemblies:
+//
+
+[id='network-topologies-{context}']
+= Building Networks of Routers
+
+
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/aacb11ad/docs/books/user-guide/theory_of_operation.adoc
----------------------------------------------------------------------
diff --git a/docs/books/user-guide/theory_of_operation.adoc b/docs/books/user-guide/theory_of_operation.adoc
index 4225029..d3e7a49 100644
--- a/docs/books/user-guide/theory_of_operation.adoc
+++ b/docs/books/user-guide/theory_of_operation.adoc
@@ -66,6 +66,7 @@ Several types of listeners are defined by their role.
| normal | The connection is used for AMQP clients using normal message delivery.
| inter-router | 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 | The connection is a broker or other resource that holds known addresses. The router will use this connection to create links as necessary. The addresses are available for routing only after the remote resource has created a connection.
+| edge | The connection is between an edge router and an interior router.
|===
=== Connector
@@ -86,6 +87,7 @@ Several types of connectors are defined by their role.
| normal | The connection is used for AMQP clients using normal message delivery. On this connector the router will initiate the connection but it will never create any links. Links are to be created by the peer that accepts the connection.
| inter-router | 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 | The connection is to a broker or other resource that holds known addresses. The router will use this connection to create links as necessary. The addresses are available for routing only after the router has created a connection to the remote resource.
+| edge | The connection is between an edge router and an interior router.
|===
== Addresses
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org