qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r885870 - in /qpid/trunk/qpid/cpp/src/qpid/cluster: ClusterPlugin.cpp ClusterSettings.h
Date Tue, 01 Dec 2009 19:04:41 GMT
Author: aconway
Date: Tue Dec  1 19:04:40 2009
New Revision: 885870

URL: http://svn.apache.org/viewvc?rev=885870&view=rev
Log:
Make cluster update work out of the box without special authentication options.

Changed the default --cluster-mechanism to ANONYMOUS.

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=885870&r1=885869&r2=885870&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp Tue Dec  1 19:04:40 2009
@@ -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, ""), "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")
+            ("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")
 #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=885870&r1=885869&r2=885870&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h Tue Dec  1 19:04:40 2009
@@ -36,7 +36,7 @@
     std::string username, password, mechanism;
     size_t size;
 
-    ClusterSettings() : quorum(false), readMax(10), size(1)
+    ClusterSettings() : quorum(false), readMax(10), mechanism("ANONYMOUS"), size(1)
     {}
   
     Url getUrl(uint16_t port) const {



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message