You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2015/03/06 23:40:39 UTC
svn commit: r1664746 - in /qpid/dispatch/trunk: etc/ tests/ tests/config-1/
tests/config-2-broker/ tests/config-2/ tests/config-3-linear/ tests/config-6/
Author: aconway
Date: Fri Mar 6 22:40:39 2015
New Revision: 1664746
URL: http://svn.apache.org/r1664746
Log:
NO-JIRA: Change all configuration file examples to camelCase, consistent with management.
Modified:
qpid/dispatch/trunk/etc/qdrouterd.conf
qpid/dispatch/trunk/tests/config-1/A.conf
qpid/dispatch/trunk/tests/config-2-broker/A.conf
qpid/dispatch/trunk/tests/config-2-broker/B.conf
qpid/dispatch/trunk/tests/config-2/A.conf
qpid/dispatch/trunk/tests/config-2/B.conf
qpid/dispatch/trunk/tests/config-3-linear/A.conf
qpid/dispatch/trunk/tests/config-3-linear/B.conf
qpid/dispatch/trunk/tests/config-3-linear/C.conf
qpid/dispatch/trunk/tests/config-6/A.conf
qpid/dispatch/trunk/tests/config-6/B.conf
qpid/dispatch/trunk/tests/config-6/C.conf
qpid/dispatch/trunk/tests/config-6/D.conf
qpid/dispatch/trunk/tests/config-6/X.conf
qpid/dispatch/trunk/tests/config-6/Y.conf
qpid/dispatch/trunk/tests/system_test.py
qpid/dispatch/trunk/tests/system_tests_broker.py
qpid/dispatch/trunk/tests/system_tests_management.py
qpid/dispatch/trunk/tests/threads4.conf
Modified: qpid/dispatch/trunk/etc/qdrouterd.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/etc/qdrouterd.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/etc/qdrouterd.conf (original)
+++ qpid/dispatch/trunk/etc/qdrouterd.conf Fri Mar 6 22:40:39 2015
@@ -21,70 +21,70 @@
# file's format and options.
container {
- worker-threads: 4
- container-name: Qpid.Dispatch.Router.A
+ workerThreads: 4
+ containerName: Qpid.Dispatch.Router.A
}
-ssl-profile {
- name: ssl-profile-name
+sslProfile {
+ name: sslProfileName
}
listener {
addr: 0.0.0.0
port: amqp
- allow-no-sasl: yes
- sasl-mechanisms: ANONYMOUS
- max-frame-size: 16384
+ allowNoSasl: yes
+ saslMechanisms: ANONYMOUS
+ maxFrameSize: 16384
}
router {
mode: standalone
- router-id: Router.A
+ routerId: Router.A
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /queue/
phase: 0
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /queue/
phase: 1
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /unicast
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /exclusive
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /broadcast
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
Modified: qpid/dispatch/trunk/tests/config-1/A.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-1/A.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-1/A.conf (original)
+++ qpid/dispatch/trunk/tests/config-1/A.conf Fri Mar 6 22:40:39 2015
@@ -23,28 +23,28 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
- ## process message traffic and other application work (timers, non-amqp
+ ## workerThreads - The number of threads that will be created to
+ ## process message traffic and other application work (timers, nonAmqp
## file descriptors, etc.)
##
## The number of threads should be related to the number of available
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: Qpid.Dispatch.Router.A
+ containerName: Qpid.Dispatch.Router.A
}
router {
mode: standalone
- router-id: QDR
+ routerId: QDR
}
@@ -54,27 +54,27 @@ router {
listener {
addr: 0.0.0.0
port: 20000
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /spread/
fanout: single
bias: spread
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
Modified: qpid/dispatch/trunk/tests/config-2-broker/A.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2-broker/A.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2-broker/A.conf (original)
+++ qpid/dispatch/trunk/tests/config-2-broker/A.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: Qpid.Dispatch.Router.A
+ containerName: Qpid.Dispatch.Router.A
}
@@ -49,19 +49,19 @@ container {
listener {
addr: 0.0.0.0
port: amqp
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
listener {
role: inter-router
addr: 0.0.0.0
port: 20102
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.A
+ routerId: QDR.A
}
connector {
@@ -69,7 +69,7 @@ connector {
role: on-demand
addr: 127.0.0.1
port: 11000
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
linkRoutePattern {
@@ -87,24 +87,24 @@ linkRoutePattern {
connector: broker
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /spread/
fanout: single
bias: spread
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
Modified: qpid/dispatch/trunk/tests/config-2-broker/B.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2-broker/B.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2-broker/B.conf (original)
+++ qpid/dispatch/trunk/tests/config-2-broker/B.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: Qpid.Dispatch.Router.B
+ containerName: Qpid.Dispatch.Router.B
}
@@ -49,19 +49,19 @@ container {
listener {
addr: 0.0.0.0
port: 20101
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 127.0.0.1
port: 20102
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.B
+ routerId: QDR.B
}
linkRoutePattern {
@@ -76,24 +76,24 @@ linkRoutePattern {
prefix: qmf.
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /spread/
fanout: single
bias: spread
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
Modified: qpid/dispatch/trunk/tests/config-2/A.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/A.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/A.conf (original)
+++ qpid/dispatch/trunk/tests/config-2/A.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: Qpid.Dispatch.Router.A
+ containerName: Qpid.Dispatch.Router.A
}
@@ -49,39 +49,39 @@ container {
listener {
addr: 0.0.0.0
port: 20100
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
listener {
role: inter-router
addr: 0.0.0.0
port: 20102
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.A
+ routerId: QDR.A
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /spread/
fanout: single
bias: spread
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
Modified: qpid/dispatch/trunk/tests/config-2/B.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/B.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/B.conf (original)
+++ qpid/dispatch/trunk/tests/config-2/B.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: Qpid.Dispatch.Router.B
+ containerName: Qpid.Dispatch.Router.B
}
@@ -49,39 +49,39 @@ container {
listener {
addr: 0.0.0.0
port: 20101
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20102
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.B
+ routerId: QDR.B
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
}
-fixed-address {
+fixedAddress {
prefix: /spread/
fanout: single
bias: spread
}
-fixed-address {
+fixedAddress {
prefix: /multicast/
fanout: multiple
}
-fixed-address {
+fixedAddress {
prefix: /
fanout: multiple
}
Modified: qpid/dispatch/trunk/tests/config-3-linear/A.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-3-linear/A.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-3-linear/A.conf (original)
+++ qpid/dispatch/trunk/tests/config-3-linear/A.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: QDR.A
+ containerName: QDR.A
}
@@ -49,19 +49,19 @@ container {
listener {
addr: 0.0.0.0
port: 20001
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20002
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.A
+ routerId: QDR.A
}
log {
Modified: qpid/dispatch/trunk/tests/config-3-linear/B.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-3-linear/B.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-3-linear/B.conf (original)
+++ qpid/dispatch/trunk/tests/config-3-linear/B.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: QDR.B
+ containerName: QDR.B
}
@@ -50,20 +50,20 @@ listener {
role: inter-router
addr: 0.0.0.0
port: 20002
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20003
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.B
+ routerId: QDR.B
}
log {
Modified: qpid/dispatch/trunk/tests/config-3-linear/C.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-3-linear/C.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-3-linear/C.conf (original)
+++ qpid/dispatch/trunk/tests/config-3-linear/C.conf Fri Mar 6 22:40:39 2015
@@ -23,7 +23,7 @@
##
container {
##
- ## worker-threads - The number of threads that will be created to
+ ## workerThreads - The number of threads that will be created to
## process message traffic and other application work (timers, non-amqp
## file descriptors, etc.)
##
@@ -31,15 +31,15 @@ container {
## processor cores. To fully utilize a quad-core system, set the
## number of threads to 4.
##
- worker-threads: 4
+ workerThreads: 4
##
- ## container-name - The name of the AMQP container. If not specified,
+ ## containerName - The name of the AMQP container. If not specified,
## the container name will be set to a value of the container's
## choosing. The automatically assigned container name is not
## guaranteed to be persistent across restarts of the container.
##
- container-name: QDR.C
+ containerName: QDR.C
}
@@ -50,13 +50,13 @@ listener {
role: inter-router
addr: 0.0.0.0
port: 20003
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
- router-id: QDR.C
+ routerId: QDR.C
}
log {
Modified: qpid/dispatch/trunk/tests/config-6/A.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-6/A.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-6/A.conf (original)
+++ qpid/dispatch/trunk/tests/config-6/A.conf Fri Mar 6 22:40:39 2015
@@ -22,8 +22,8 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
- container-name: QDR.A
+ workerThreads: 4
+ containerName: QDR.A
}
@@ -34,37 +34,37 @@ listener {
role: inter-router
addr: 0.0.0.0
port: 20001
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20002
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20003
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20004
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
area: A
- router-id: QDR.A
+ routerId: QDR.A
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
Modified: qpid/dispatch/trunk/tests/config-6/B.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-6/B.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-6/B.conf (original)
+++ qpid/dispatch/trunk/tests/config-6/B.conf Fri Mar 6 22:40:39 2015
@@ -22,8 +22,8 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
- container-name: QDR.B
+ workerThreads: 4
+ containerName: QDR.B
}
@@ -34,30 +34,30 @@ listener {
role: inter-router
addr: 0.0.0.0
port: 20002
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20003
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20004
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
area: A
- router-id: QDR.B
+ routerId: QDR.B
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
Modified: qpid/dispatch/trunk/tests/config-6/C.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-6/C.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-6/C.conf (original)
+++ qpid/dispatch/trunk/tests/config-6/C.conf Fri Mar 6 22:40:39 2015
@@ -22,8 +22,8 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
- container-name: QDR.C
+ workerThreads: 4
+ containerName: QDR.C
}
@@ -34,23 +34,23 @@ listener {
role: inter-router
addr: 0.0.0.0
port: 20003
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20004
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
area: A
- router-id: QDR.C
+ routerId: QDR.C
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
Modified: qpid/dispatch/trunk/tests/config-6/D.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-6/D.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-6/D.conf (original)
+++ qpid/dispatch/trunk/tests/config-6/D.conf Fri Mar 6 22:40:39 2015
@@ -22,8 +22,8 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
- container-name: QDR.D
+ workerThreads: 4
+ containerName: QDR.D
}
@@ -34,16 +34,16 @@ listener {
role: inter-router
addr: 0.0.0.0
port: 20004
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
area: A
- router-id: QDR.D
+ routerId: QDR.D
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
Modified: qpid/dispatch/trunk/tests/config-6/X.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-6/X.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-6/X.conf (original)
+++ qpid/dispatch/trunk/tests/config-6/X.conf Fri Mar 6 22:40:39 2015
@@ -22,8 +22,8 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
- container-name: QDR.X
+ workerThreads: 4
+ containerName: QDR.X
}
@@ -33,30 +33,30 @@ container {
listener {
addr: 0.0.0.0
port: amqp
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20001
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20002
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
area: A
- router-id: QDR.X
+ routerId: QDR.X
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
Modified: qpid/dispatch/trunk/tests/config-6/Y.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-6/Y.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-6/Y.conf (original)
+++ qpid/dispatch/trunk/tests/config-6/Y.conf Fri Mar 6 22:40:39 2015
@@ -22,8 +22,8 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
- container-name: QDR.Y
+ workerThreads: 4
+ containerName: QDR.Y
}
@@ -33,30 +33,30 @@ container {
listener {
addr: 0.0.0.0
port: 20005
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20003
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
connector {
role: inter-router
addr: 0.0.0.0
port: 20004
- sasl-mechanisms: ANONYMOUS
+ saslMechanisms: ANONYMOUS
}
router {
mode: interior
area: A
- router-id: QDR.Y
+ routerId: QDR.Y
}
-fixed-address {
+fixedAddress {
prefix: /closest/
fanout: single
bias: closest
Modified: qpid/dispatch/trunk/tests/system_test.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_test.py?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_test.py (original)
+++ qpid/dispatch/trunk/tests/system_test.py Fri Mar 6 22:40:39 2015
@@ -295,8 +295,8 @@ class Qdrouterd(Process):
"""
DEFAULTS = {
- 'listener':{'addr':'0.0.0.0', 'sasl-mechanisms':'ANONYMOUS'},
- 'connector':{'addr':'127.0.0.1', 'sasl-mechanisms':'ANONYMOUS', 'role':'on-demand'},
+ 'listener':{'addr':'0.0.0.0', 'saslMechanisms':'ANONYMOUS'},
+ 'connector':{'addr':'127.0.0.1', 'saslMechanisms':'ANONYMOUS', 'role':'on-demand'},
'container':{'debugDump':"qddebug.txt"}
}
Modified: qpid/dispatch/trunk/tests/system_tests_broker.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_broker.py?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_broker.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_broker.py Fri Mar 6 22:40:39 2015
@@ -52,8 +52,8 @@ class DistributedQueueTest(system_test.T
def common_router_conf(self, name, mode='standalone'):
"""Common router configuration for the tests"""
return Qdrouterd.Config([
- ('container', {'container-name':name}),
- ('router', {'mode': mode, 'router-id': name})
+ ('container', {'containerName':name}),
+ ('router', {'mode': mode, 'routerId': name})
])
def verify_equal_spread(self, send_addresses, receive_addresses):
Modified: qpid/dispatch/trunk/tests/system_tests_management.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_management.py?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_management.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_management.py Fri Mar 6 22:40:39 2015
@@ -81,7 +81,7 @@ class ManagementTest(system_test.TestCas
])
cls._routers = [cls.tester.qdrouterd(config=c, wait=False) for c in [conf0, conf1, conf2]]
- # Stand-alone router for logging tests (avoid interfering with logging for other tests.)
+ # Standalone router for logging tests (avoid interfering with logging for other tests.)
conflog=Qdrouterd.Config([
('router', { 'mode': 'standalone', 'routerId': 'logrouter'}),
('listener', {'port':cls.get_port(), 'role':'normal'}),
Modified: qpid/dispatch/trunk/tests/threads4.conf
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/threads4.conf?rev=1664746&r1=1664745&r2=1664746&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/threads4.conf (original)
+++ qpid/dispatch/trunk/tests/threads4.conf Fri Mar 6 22:40:39 2015
@@ -22,7 +22,7 @@
## Container section - Configures the general operation of the AMQP container.
##
container {
- worker-threads: 4
+ workerThreads: 4
}
log {
module: DEFAULT
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org