diff options
author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-09-19 15:13:18 +0000 |
---|---|---|
committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2011-09-19 15:13:18 +0000 |
commit | 69ae049561adde6b053c5906d0514c375814cae7 (patch) | |
tree | 11974930517338c66148a246a212c8eb6e00d486 /qpid/java/broker/etc/config.xml | |
parent | 2b6022a4eecaf48f44b5a4031d5b9f25b84adb1f (diff) | |
download | qpid-python-69ae049561adde6b053c5906d0514c375814cae7.tar.gz |
QPID-3346: merge in latest from trunk (r1172628)
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3346@1172657 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/etc/config.xml')
-rw-r--r-- | qpid/java/broker/etc/config.xml | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/qpid/java/broker/etc/config.xml b/qpid/java/broker/etc/config.xml index f4758d77a8..2752274155 100644 --- a/qpid/java/broker/etc/config.xml +++ b/qpid/java/broker/etc/config.xml @@ -30,21 +30,27 @@ <connector> <!-- To enable SSL edit the keystorePath and keystorePassword and set enabled to true. - To disasble Non-SSL port set sslOnly to true --> + To disable Non-SSL port set sslOnly to true --> <ssl> <enabled>false</enabled> + <port>5671</port> <sslOnly>false</sslOnly> <keystorePath>/path/to/keystore.ks</keystorePath> <keystorePassword>keystorepass</keystorePassword> </ssl> <port>5672</port> - <sslport>8672</sslport> <socketReceiveBuffer>262144</socketReceiveBuffer> <socketSendBuffer>262144</socketSendBuffer> </connector> <management> <enabled>true</enabled> - <jmxport>8999</jmxport> + <jmxport> + <registryServer>8999</registryServer> + <!-- + If unspecified, connectorServer defaults to 100 + registryServer port. + <connectorServer>9099</connectionServer> + --> + </jmxport> <ssl> <enabled>false</enabled> <!-- Update below path to your keystore location, or run the bin/create-example-ssl-stores(.sh|.bat) @@ -62,10 +68,8 @@ </advanced> <security> - <principal-databases> - <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed --> + <pd-auth-manager> <principal-database> - <name>passwordfile</name> <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class> <attributes> <attribute> @@ -74,7 +78,7 @@ </attribute> </attributes> </principal-database> - </principal-databases> + </pd-auth-manager> <allow-all /> |