You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by si...@apache.org on 2012/10/10 12:09:19 UTC
svn commit: r1396531 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
hedwig-client/src/main/cpp/inc/hedwig/client.h
hedwig-client/src/main/cpp/lib/channel.cpp
hedwig-client/src/main/cpp/lib/client.cpp
hedwig-client/src/main/cpp/test/util.h
Author: sijie
Date: Wed Oct 10 10:09:18 2012
New Revision: 1396531
URL: http://svn.apache.org/viewvc?rev=1396531&view=rev
Log:
BOOKKEEPER-413: Hedwig C++ client: Rename RUN_AS_SSL_MODE to SSL_ENABLED (ivank via sijie)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/channel.cpp
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1396531&r1=1396530&r2=1396531&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Oct 10 10:09:18 2012
@@ -188,6 +188,8 @@ Trunk (unreleased changes)
BOOKKEEPER-143: Add SSL support for hedwig cpp client (sijie via ivank)
+ BOOKKEEPER-413: Hedwig C++ client: Rename RUN_AS_SSL_MODE to SSL_ENABLED (ivank via sijie)
+
Release 4.1.0 - 2012-06-07
Non-backward compatible changes:
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h?rev=1396531&r1=1396530&r2=1396531&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h Wed Oct 10 10:09:18 2012
@@ -47,7 +47,7 @@ namespace Hedwig {
static const std::string SYNC_REQUEST_TIMEOUT;
static const std::string SUBSCRIBER_AUTOCONSUME;
static const std::string NUM_DISPATCH_THREADS;
- static const std::string RUN_AS_SSL_MODE;
+ static const std::string SSL_ENABLED;
static const std::string SSL_PEM_FILE;
/**
* The maximum number of messages the hub will queue for subscriptions
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/channel.cpp
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/channel.cpp?rev=1396531&r1=1396530&r2=1396531&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/channel.cpp (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/channel.cpp Wed Oct 10 10:09:18 2012
@@ -806,7 +806,7 @@ DuplexChannelManagerPtr DuplexChannelMan
DuplexChannelManager::DuplexChannelManager(const Configuration& conf,
EventDispatcher& dispatcher)
: conf(conf), dispatcher(dispatcher) {
- sslEnabled = conf.getBool(Configuration::RUN_AS_SSL_MODE, DEFAULT_SSL_ENABLED);
+ sslEnabled = conf.getBool(Configuration::SSL_ENABLED, DEFAULT_SSL_ENABLED);
if (sslEnabled) {
sslCtxFactory = SSLContextFactoryPtr(new SSLContextFactory(conf));
}
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp?rev=1396531&r1=1396530&r2=1396531&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp Wed Oct 10 10:09:18 2012
@@ -39,7 +39,7 @@ const std::string Configuration::SYNC_RE
const std::string Configuration::SUBSCRIBER_AUTOCONSUME = "hedwig.cpp.subscriber_autoconsume";
const std::string Configuration::NUM_DISPATCH_THREADS = "hedwig.cpp.num_dispatch_threads";
const std::string Configuration::SUBSCRIPTION_MESSAGE_BOUND = "hedwig.cpp.subscription_message_bound";
-const std::string Configuration::RUN_AS_SSL_MODE = "hedwig.cpp.ssl_mode";
+const std::string Configuration::SSL_ENABLED = "hedwig.cpp.ssl_enabled";
const std::string Configuration::SSL_PEM_FILE = "hedwig.cpp.ssl_pem";
Client::Client(const Configuration& conf) {
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h?rev=1396531&r1=1396530&r2=1396531&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h Wed Oct 10 10:09:18 2012
@@ -162,7 +162,7 @@ public:
}
virtual bool getBool(const std::string& key, bool defaultVal) const {
- if (key == Configuration::RUN_AS_SSL_MODE) {
+ if (key == Configuration::SSL_ENABLED) {
return isSSL;
}
return defaultVal;