Author: aconway
Date: Wed Jan 6 17:02:32 2010
New Revision: 896541
URL: http://svn.apache.org/viewvc?rev=896541&view=rev
Log:
Revert "Make cluster update work out of the box without special authentication
options."
This reverts revision 885870
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp?rev=896541&r1=896540&r2=896541&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp Wed Jan 6 17:02:32
2010
@@ -65,9 +65,9 @@
("cluster-url", optValue(settings.url,"URL"),
"URL of this broker, advertized to the cluster.\n"
"Defaults to a URL listing all the local IP addresses\n")
- ("cluster-username", optValue(settings.username, "USER"),
"Username for connections between brokers")
- ("cluster-password", optValue(settings.password, "PASS"),
"Password for connections between brokers")
- ("cluster-mechanism", optValue(settings.mechanism, "MECH"),
"Authentication mechanism for connections between brokers")
+ ("cluster-username", optValue(settings.username, ""), "Username
for connections between brokers")
+ ("cluster-password", optValue(settings.password, ""), "Password
for connections between brokers")
+ ("cluster-mechanism", optValue(settings.mechanism, ""),
"Authentication mechanism for connections between brokers")
#if HAVE_LIBCMAN_H
("cluster-cman", optValue(settings.quorum), "Integrate with
Cluster Manager (CMAN) cluster.")
#endif
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h?rev=896541&r1=896540&r2=896541&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h Wed Jan 6 17:02:32
2010
@@ -36,7 +36,7 @@
std::string username, password, mechanism;
size_t size;
- ClusterSettings() : quorum(false), readMax(10), mechanism("ANONYMOUS"),
size(1)
+ ClusterSettings() : quorum(false), readMax(10), size(1)
{}
Url getUrl(uint16_t port) const {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
