You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/06/07 19:00:28 UTC
svn commit: r1490727 - in /zookeeper/bookkeeper/branches/branch-4.2: ./
hedwig-client/src/main/cpp/lib/ hedwig-client/src/main/cpp/scripts/
Author: ivank
Date: Fri Jun 7 17:00:27 2013
New Revision: 1490727
URL: http://svn.apache.org/r1490727
Log:
BOOKKEEPER-603: Support Boost 1.53 for Hedwig Cpp Client (jiannan via ivank)
Modified:
zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/channel.cpp
zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/data.cpp
zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/log4cxx.conf
zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/server-control.sh
Modified: zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt?rev=1490727&r1=1490726&r2=1490727&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/CHANGES.txt Fri Jun 7 17:00:27 2013
@@ -28,6 +28,8 @@ Release 4.2.2 - Unreleased
BOOKKEEPER-598: Fails to compile - RESUBSCRIBE_EXCEPTION conflict (Matthew Farrellee via ivank)
+ BOOKKEEPER-603: Support Boost 1.53 for Hedwig Cpp Client (jiannan via ivank)
+
Release 4.2.1 - 2013-02-19
Backward compatible changes:
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/channel.cpp
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/channel.cpp?rev=1490727&r1=1490726&r2=1490727&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/channel.cpp (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/channel.cpp Fri Jun 7 17:00:27 2013
@@ -702,7 +702,7 @@ void AsioSSLDuplexChannel::sslChannelCon
void AsioSSLDuplexChannel::startHandShake(const OperationCallbackPtr& callback) {
ssl_socket->async_handshake(boost::asio::ssl::stream_base::client,
boost::bind(&AsioSSLDuplexChannel::handleHandshake,
- boost::shared_dynamic_cast<AsioSSLDuplexChannel>(shared_from_this()),
+ boost::dynamic_pointer_cast<AsioSSLDuplexChannel>(shared_from_this()),
callback, boost::asio::placeholders::error));
}
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/data.cpp
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/data.cpp?rev=1490727&r1=1490726&r2=1490727&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/data.cpp (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/lib/data.cpp Fri Jun 7 17:00:27 2013
@@ -24,6 +24,7 @@
#include <log4cxx/logger.h>
#include <iostream>
+#include <boost/thread/locks.hpp>
#define stringify( name ) #name
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/log4cxx.conf
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/log4cxx.conf?rev=1490727&r1=1490726&r2=1490727&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/log4cxx.conf (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/log4cxx.conf Fri Jun 7 17:00:27 2013
@@ -28,9 +28,9 @@ log4j.appender.hedwig.fileName=./testLog
log4j.appender.hedwig.layout=org.apache.log4j.PatternLayout
log4j.appender.hedwig.layout.ConversionPattern=[%d{%H:%M:%S.%l}] %t %p %c - %m%n
-log4j.appender.hedwig=org.apache.log4j.RollingFileAppender
+log4j.appender.hedwigtest=org.apache.log4j.RollingFileAppender
#log4j.appender.hedwigtest=org.apache.log4j.ConsoleAppender
-log4j.appender.hedwig.fileName=./testLog.log
+log4j.appender.hedwigtest.fileName=./testLog.log
log4j.appender.hedwigtest.layout=org.apache.log4j.PatternLayout
log4j.appender.hedwigtest.layout.ConversionPattern=[%d{%H:%M:%S.%l}] %t %p %c - %m%n
Modified: zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/server-control.sh
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/server-control.sh?rev=1490727&r1=1490726&r2=1490727&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/server-control.sh (original)
+++ zookeeper/bookkeeper/branches/branch-4.2/hedwig-client/src/main/cpp/scripts/server-control.sh Fri Jun 7 17:00:27 2013
@@ -107,8 +107,6 @@ log4j.appender.ROLLINGFILE.Threshold=DEB
log4j.appender.ROLLINGFILE.File=/tmp/hedwig-server-$COUNT.log
log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
-# Max log file size of 10MB
-log4j.appender.ROLLINGFILE.MaxFileSize=10MB
# uncomment the next line to limit number of backup files
#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout