Repository: qpid-dispatch Updated Branches: refs/heads/master 7de6ac3b5 -> 7ca30cfcb
DISPATCH-591 Added http=true to all A.conf files to allow serving and connecting by stand-alone console Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/7ca30cfc Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/7ca30cfc Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/7ca30cfc Branch: refs/heads/master Commit: 7ca30cfcb760a9e5b666ff98b30dca057bd0ad1c Parents: 7de6ac3 Author: Ernest Allen <eal...@redhat.com> Authored: Mon Dec 12 13:36:59 2016 -0500 Committer: Ernest Allen <eal...@redhat.com> Committed: Mon Dec 12 13:36:59 2016 -0500 ---------------------------------------------------------------------- tests/config-1/A.conf | 8 ++++++++ tests/config-2-broker/A.conf | 8 ++++++++ tests/config-2/A.conf | 8 ++++++++ tests/config-3-linear/A.conf | 8 ++++++++ tests/config-6/A.conf | 8 ++++++++ tests/config-console/A.conf | 40 +++++---------------------------------- 6 files changed, 45 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7ca30cfc/tests/config-1/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-1/A.conf b/tests/config-1/A.conf index ea3ea7e..a4f25c5 100644 --- a/tests/config-1/A.conf +++ b/tests/config-1/A.conf @@ -33,6 +33,14 @@ listener { saslMechanisms: ANONYMOUS } +listener { + role: normal + host: 0.0.0.0 + port: 5673 + http: true + saslMechanisms: ANONYMOUS +} + fixedAddress { prefix: /closest/ fanout: single http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7ca30cfc/tests/config-2-broker/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-2-broker/A.conf b/tests/config-2-broker/A.conf index f8b8216..f10210b 100644 --- a/tests/config-2-broker/A.conf +++ b/tests/config-2-broker/A.conf @@ -39,6 +39,14 @@ listener { saslMechanisms: ANONYMOUS } +listener { + role: normal + host: 0.0.0.0 + port: 5673 + http: true + saslMechanisms: ANONYMOUS +} + connector { name: broker role: on-demand http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7ca30cfc/tests/config-2/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-2/A.conf b/tests/config-2/A.conf index ff3fb1a..211a2da 100644 --- a/tests/config-2/A.conf +++ b/tests/config-2/A.conf @@ -32,6 +32,14 @@ listener { } listener { + role: normal + host: 0.0.0.0 + port: 5673 + http: true + saslMechanisms: ANONYMOUS +} + +listener { role: inter-router host: 0.0.0.0 port: 20102 http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7ca30cfc/tests/config-3-linear/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-3-linear/A.conf b/tests/config-3-linear/A.conf index 52983f7..dec78ad 100644 --- a/tests/config-3-linear/A.conf +++ b/tests/config-3-linear/A.conf @@ -31,6 +31,14 @@ listener { saslMechanisms: ANONYMOUS } +listener { + role: normal + host: 0.0.0.0 + port: 5673 + http: true + saslMechanisms: ANONYMOUS +} + connector { role: inter-router host: 0.0.0.0 http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7ca30cfc/tests/config-6/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-6/A.conf b/tests/config-6/A.conf index 5f79a1c..b0dd4cc 100644 --- a/tests/config-6/A.conf +++ b/tests/config-6/A.conf @@ -34,6 +34,14 @@ listener { saslMechanisms: ANONYMOUS } +listener { + role: normal + host: 0.0.0.0 + port: 5673 + http: true + saslMechanisms: ANONYMOUS +} + connector { role: inter-router host: 0.0.0.0 http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7ca30cfc/tests/config-console/A.conf ---------------------------------------------------------------------- diff --git a/tests/config-console/A.conf b/tests/config-console/A.conf index 2727ef5..47679bf 100644 --- a/tests/config-console/A.conf +++ b/tests/config-console/A.conf @@ -28,48 +28,18 @@ router { ## Listeners and Connectors ## listener { + role: normal host: 0.0.0.0 - port: 20000 + port: amqp + http: true saslMechanisms: ANONYMOUS } -fixedAddress { - prefix: /closest/ - fanout: single - bias: closest -} - -fixedAddress { - prefix: /spread/ - fanout: single - bias: spread -} - -fixedAddress { - prefix: /multicast/ - fanout: multiple -} - -fixedAddress { - prefix: / - fanout: multiple -} - listener { - name: ProxyListener role: normal host: 0.0.0.0 - port: 20001 + port: 5673 + http: true saslMechanisms: ANONYMOUS } -## Start a websockets proxy with the router -## This assumes you have done: -## sudo npm install --global websockify -console { - listener: ProxyListener - proxy: websockify - args: 5673 $host:$port -# args: [--cert cert.pem [--key key.pem]] [source_addr:]source_port target_addr:target_port -} - --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org