You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2011/11/17 11:16:36 UTC
svn commit: r1203138 [2/2] - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-benchmark/
bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/
bookkeeper-server/
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/
bookkeeper-server...
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/MessageConsumeCallback.java Thu Nov 17 10:16:32 2011
@@ -19,7 +19,8 @@ package org.apache.hedwig.client.handler
import java.util.TimerTask;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.apache.hedwig.client.data.MessageConsumeData;
@@ -39,7 +40,7 @@ import org.apache.hedwig.util.Callback;
*/
public class MessageConsumeCallback implements Callback<Void> {
- private static Logger logger = Logger.getLogger(MessageConsumeCallback.class);
+ private static Logger logger = LoggerFactory.getLogger(MessageConsumeCallback.class);
private final HedwigClient client;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PubSubCallback.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.client.handlers;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hedwig.client.data.PubSubData;
import org.apache.hedwig.exceptions.PubSubException;
@@ -31,7 +32,7 @@ import org.apache.hedwig.util.Callback;
*/
public class PubSubCallback implements Callback<Void> {
- private static Logger logger = Logger.getLogger(PubSubCallback.class);
+ private static Logger logger = LoggerFactory.getLogger(PubSubCallback.class);
// Private member variables
private PubSubData pubSubData;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/PublishResponseHandler.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.client.handlers;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.apache.hedwig.client.data.PubSubData;
@@ -28,7 +29,7 @@ import org.apache.hedwig.protocol.PubSub
public class PublishResponseHandler {
- private static Logger logger = Logger.getLogger(PublishResponseHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(PublishResponseHandler.class);
private final ResponseHandler responseHandler;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeReconnectCallback.java Thu Nov 17 10:16:32 2011
@@ -19,7 +19,8 @@ package org.apache.hedwig.client.handler
import java.util.TimerTask;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hedwig.client.api.MessageHandler;
import org.apache.hedwig.client.conf.ClientConfiguration;
@@ -40,7 +41,7 @@ import org.apache.hedwig.util.Callback;
*/
public class SubscribeReconnectCallback implements Callback<Void> {
- private static Logger logger = Logger.getLogger(SubscribeReconnectCallback.class);
+ private static Logger logger = LoggerFactory.getLogger(SubscribeReconnectCallback.class);
// Private member variables
private final PubSubData origSubData;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/SubscribeResponseHandler.java Thu Nov 17 10:16:32 2011
@@ -22,7 +22,8 @@ import java.util.LinkedList;
import java.util.Queue;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.apache.hedwig.client.api.MessageHandler;
@@ -40,7 +41,7 @@ import org.apache.hedwig.protocol.PubSub
public class SubscribeResponseHandler {
- private static Logger logger = Logger.getLogger(SubscribeResponseHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(SubscribeResponseHandler.class);
private final ResponseHandler responseHandler;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/handlers/UnsubscribeResponseHandler.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.client.handlers;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.apache.hedwig.client.data.PubSubData;
@@ -29,7 +30,7 @@ import org.apache.hedwig.protocol.PubSub
public class UnsubscribeResponseHandler {
- private static Logger logger = Logger.getLogger(UnsubscribeResponseHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(UnsubscribeResponseHandler.class);
private final ResponseHandler responseHandler;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ConnectCallback.java Thu Nov 17 10:16:32 2011
@@ -20,7 +20,8 @@ package org.apache.hedwig.client.netty;
import java.net.InetSocketAddress;
import java.util.LinkedList;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
@@ -33,7 +34,7 @@ import org.apache.hedwig.util.HedwigSock
public class ConnectCallback implements ChannelFutureListener {
- private static Logger logger = Logger.getLogger(ConnectCallback.class);
+ private static Logger logger = LoggerFactory.getLogger(ConnectCallback.class);
// Private member variables
private PubSubData pubSubData;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClient.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClient.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClient.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClient.java Thu Nov 17 10:16:32 2011
@@ -27,7 +27,8 @@ import java.util.concurrent.ConcurrentMa
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.bootstrap.ClientBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFactory;
@@ -48,7 +49,7 @@ import org.apache.hedwig.exceptions.PubS
*/
public class HedwigClient {
- private static final Logger logger = Logger.getLogger(HedwigClient.class);
+ private static final Logger logger = LoggerFactory.getLogger(HedwigClient.class);
// Global counter used for generating unique transaction ID's for
// publish and subscribe requests
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigPublisher.java Thu Nov 17 10:16:32 2011
@@ -21,7 +21,8 @@ import java.net.InetSocketAddress;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
@@ -46,7 +47,7 @@ import org.apache.hedwig.util.Callback;
*/
public class HedwigPublisher implements Publisher {
- private static Logger logger = Logger.getLogger(HedwigPublisher.class);
+ private static Logger logger = LoggerFactory.getLogger(HedwigPublisher.class);
// Concurrent Map to store the mappings for a given Host (Hostname:Port) to
// the Channel that has been established for it previously. This channel
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigSubscriber.java Thu Nov 17 10:16:32 2011
@@ -22,7 +22,8 @@ import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
@@ -57,7 +58,7 @@ import org.apache.hedwig.util.Callback;
*/
public class HedwigSubscriber implements Subscriber {
- private static Logger logger = Logger.getLogger(HedwigSubscriber.class);
+ private static Logger logger = LoggerFactory.getLogger(HedwigSubscriber.class);
// Concurrent Map to store the cached Channel connections on the client side
// to a server host for a given Topic + SubscriberId combination. For each
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java Thu Nov 17 10:16:32 2011
@@ -22,7 +22,8 @@ import java.util.LinkedList;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
@@ -51,7 +52,7 @@ import org.apache.hedwig.util.HedwigSock
@ChannelPipelineCoverage("all")
public class ResponseHandler extends SimpleChannelHandler {
- private static Logger logger = Logger.getLogger(ResponseHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(ResponseHandler.class);
// Concurrent Map to store for each async PubSub request, the txn ID
// and the corresponding PubSub call's data which stores the VoidCallback to
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/WriteCallback.java Thu Nov 17 10:16:32 2011
@@ -20,7 +20,8 @@ package org.apache.hedwig.client.netty;
import java.net.InetSocketAddress;
import java.util.LinkedList;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
@@ -32,7 +33,7 @@ import org.apache.hedwig.util.HedwigSock
public class WriteCallback implements ChannelFutureListener {
- private static Logger logger = Logger.getLogger(WriteCallback.class);
+ private static Logger logger = LoggerFactory.getLogger(WriteCallback.class);
// Private member variables
private PubSubData pubSubData;
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/CallbackUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/CallbackUtils.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/CallbackUtils.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/CallbackUtils.java Thu Nov 17 10:16:32 2011
@@ -20,8 +20,8 @@ package org.apache.hedwig.util;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hedwig.exceptions.PubSubException;
import org.apache.hedwig.exceptions.PubSubException.CompositeException;
@@ -42,8 +42,6 @@ public class CallbackUtils {
* @param ctx
* @param logger
* May be null.
- * @param level
- * Required iff logger != null.
* @param successMsg
* If not null, then this is logged on success.
* @param failureMsg
@@ -56,7 +54,7 @@ public class CallbackUtils {
* @return
*/
public static Callback<Void> multiCallback(final int expected, final Callback<Void> cb, final Object ctx,
- final Logger logger, final Level level, final Object successMsg, final Object failureMsg,
+ final Logger logger, final String successMsg, final String failureMsg,
Runnable eagerErrorHandler) {
if (expected == 0) {
cb.operationFinished(ctx, null);
@@ -80,7 +78,7 @@ public class CallbackUtils {
@Override
public void operationFailed(Object ctx, PubSubException exception) {
if (logger != null && failureMsg != null)
- logger.log(level, failureMsg, exception);
+ logger.error(failureMsg, exception);
exceptions.add(exception);
tick();
}
@@ -88,7 +86,7 @@ public class CallbackUtils {
@Override
public void operationFinished(Object ctx, Void resultOfOperation) {
if (logger != null && successMsg != null)
- logger.log(level, successMsg);
+ logger.info(successMsg);
tick();
}
@@ -101,15 +99,15 @@ public class CallbackUtils {
* then fail the final callback with a composite exception.
*/
public static Callback<Void> multiCallback(int expected, Callback<Void> cb, Object ctx) {
- return multiCallback(expected, cb, ctx, null, null, null, null, null);
+ return multiCallback(expected, cb, ctx, null, null, null, null);
}
/**
* A callback that waits for all of a number of events to fire. If any fail,
* then fail the final callback with a composite exception.
*/
- public static Callback<Void> multiCallback(int expected, Callback<Void> cb, Object ctx, Runnable eagerErrorHandler) {
- return multiCallback(expected, cb, ctx, null, null, null, null, eagerErrorHandler);
+ public static Callback<Void> multinCallback(int expected, Callback<Void> cb, Object ctx, Runnable eagerErrorHandler) {
+ return multiCallback(expected, cb, ctx, null, null, null, eagerErrorHandler);
}
private static Callback<Void> nop = new Callback<Void>() {
@@ -134,20 +132,20 @@ public class CallbackUtils {
/**
* Logs what happened before continuing the callback chain.
*/
- public static <T> Callback<T> logger(final Logger logger, final Level successLevel, final Level failureLevel, final Object successMsg,
- final Object failureMsg, final Callback<T> cont) {
+ public static <T> Callback<T> logger(final Logger logger, final String successMsg,
+ final String failureMsg, final Callback<T> cont) {
return new Callback<T>() {
@Override
public void operationFailed(Object ctx, PubSubException exception) {
- logger.log(failureLevel, failureMsg, exception);
+ logger.error(failureMsg, exception);
if (cont != null)
cont.operationFailed(ctx, exception);
}
@Override
public void operationFinished(Object ctx, T resultOfOperation) {
- logger.log(successLevel, successMsg);
+ logger.info(successMsg);
if (cont != null)
cont.operationFinished(ctx, resultOfOperation);
}
@@ -158,8 +156,8 @@ public class CallbackUtils {
/**
* Logs what happened (no continuation).
*/
- public static Callback<Void> logger(Logger logger, Level successLevel, Level failureLevel, Object successMsg, Object failureMsg) {
- return logger(logger, successLevel, failureLevel, successMsg, failureMsg, nop());
+ public static Callback<Void> logger(Logger logger, String successMsg, String failureMsg) {
+ return logger(logger, successMsg, failureMsg, nop());
}
/**
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/util/FileUtils.java Thu Nov 17 10:16:32 2011
@@ -22,12 +22,13 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class FileUtils {
static DirDeleterThred dirDeleterThread;
- static Logger log = Logger.getLogger(FileUtils.class);
+ static Logger log = LoggerFactory.getLogger(FileUtils.class);
static {
dirDeleterThread = new DirDeleterThred();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/pom.xml?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/pom.xml Thu Nov 17 10:16:32 2011
@@ -38,6 +38,17 @@
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.bookkeeper</groupId>
<artifactId>hedwig-client</artifactId>
<version>${project.parent.version}</version>
@@ -69,6 +80,36 @@
<scope>compile</scope>
<type>jar</type>
</dependency>
+ <!--
+ Annoying dependency we need to include because
+ zookeeper uses log4j and so we transatively do, but
+ log4j has some dependencies which aren't in the
+ default maven repositories
+ //-->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/AbstractBenchmark.java Thu Nov 17 10:16:32 2011
@@ -22,13 +22,14 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hedwig.util.ConcurrencyUtils;
public abstract class AbstractBenchmark {
- static final Logger logger = Logger.getLogger(AbstractBenchmark.class);
+ static final Logger logger = LoggerFactory.getLogger(AbstractBenchmark.class);
AtomicLong totalLatency = new AtomicLong();
LinkedBlockingQueue<Boolean> doneSignalQueue = new LinkedBlockingQueue<Boolean>();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookieBenchmark.java Thu Nov 17 10:16:32 2011
@@ -23,7 +23,8 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import org.apache.bookkeeper.client.BKException;
import org.apache.bookkeeper.proto.BookieClient;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
import org.apache.bookkeeper.util.OrderedSafeExecutor;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -33,7 +34,7 @@ import org.jboss.netty.channel.socket.ni
public class BookieBenchmark extends AbstractBenchmark {
- static final Logger logger = Logger.getLogger(BookkeeperBenchmark.class);
+ static final Logger logger = LoggerFactory.getLogger(BookkeeperBenchmark.class);
BookieClient bkc;
InetSocketAddress addr;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookkeeperBenchmark.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookkeeperBenchmark.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookkeeperBenchmark.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/BookkeeperBenchmark.java Thu Nov 17 10:16:32 2011
@@ -24,11 +24,12 @@ import org.apache.bookkeeper.client.Book
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.AsyncCallback.AddCallback;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BookkeeperBenchmark extends AbstractBenchmark {
- static final Logger logger = Logger.getLogger(BookkeeperBenchmark.class);
+ static final Logger logger = LoggerFactory.getLogger(BookkeeperBenchmark.class);
BookKeeper bk;
LedgerHandle[] lh;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/benchmark/FakeBookie.java Thu Nov 17 10:16:32 2011
@@ -20,7 +20,8 @@ package org.apache.hedwig.server.benchma
import java.net.InetSocketAddress;
import java.util.concurrent.Executors;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.channel.ChannelHandlerContext;
@@ -40,7 +41,7 @@ import org.jboss.netty.logging.Log4JLogg
@ChannelPipelineCoverage("all")
public class FakeBookie extends SimpleChannelHandler implements
ChannelPipelineFactory {
- static final Logger logger = Logger.getLogger(FakeBookie.class);
+ static final Logger logger = LoggerFactory.getLogger(FakeBookie.class);
ServerSocketChannelFactory serverChannelFactory = new NioServerSocketChannelFactory(
Executors.newCachedThreadPool(), Executors.newCachedThreadPool());
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/TerminateJVMExceptionHandler.java Thu Nov 17 10:16:32 2011
@@ -17,14 +17,15 @@
*/
package org.apache.hedwig.server.common;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TerminateJVMExceptionHandler implements Thread.UncaughtExceptionHandler {
- static Logger logger = Logger.getLogger(TerminateJVMExceptionHandler.class);
+ static Logger logger = LoggerFactory.getLogger(TerminateJVMExceptionHandler.class);
@Override
public void uncaughtException(Thread t, Throwable e) {
- logger.fatal("Uncaught exception in thread " + t.getName(), e);
+ logger.error("Uncaught exception in thread " + t.getName(), e);
System.exit(1);
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/delivery/FIFODeliveryManager.java Thu Nov 17 10:16:32 2011
@@ -29,7 +29,8 @@ import java.util.concurrent.ConcurrentLi
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.protobuf.ByteString;
import org.apache.hedwig.client.data.TopicSubscriber;
@@ -49,7 +50,7 @@ import org.apache.hedwig.server.subscrip
public class FIFODeliveryManager implements Runnable, DeliveryManager {
- protected static final Logger logger = Logger.getLogger(FIFODeliveryManager.class);
+ protected static final Logger logger = LoggerFactory.getLogger(FIFODeliveryManager.class);
protected interface DeliveryManagerRequest {
public void performRequest();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/handlers/SubscribeHandler.java Thu Nov 17 10:16:32 2011
@@ -19,7 +19,8 @@ package org.apache.hedwig.server.handler
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFutureListener;
@@ -43,7 +44,7 @@ import org.apache.hedwig.server.topics.T
import org.apache.hedwig.util.Callback;
public class SubscribeHandler extends BaseHandler implements ChannelDisconnectListener {
- static Logger logger = Logger.getLogger(SubscribeHandler.class);
+ static Logger logger = LoggerFactory.getLogger(SubscribeHandler.class);
private DeliveryManager deliveryMgr;
private PersistenceManager persistenceMgr;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/PubSubServer.java Thu Nov 17 10:16:32 2011
@@ -33,7 +33,8 @@ import java.util.concurrent.TimeUnit;
import org.apache.bookkeeper.client.BookKeeper;
import org.apache.bookkeeper.client.BKException;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -80,7 +81,7 @@ import org.apache.hedwig.zookeeper.SafeA
public class PubSubServer {
- static Logger logger = Logger.getLogger(PubSubServer.class);
+ static Logger logger = LoggerFactory.getLogger(PubSubServer.class);
// Netty related variables
ServerSocketChannelFactory serverChannelFactory;
@@ -157,7 +158,7 @@ public class PubSubServer {
});
// wait until connection is effective
if (!signalZkReady.await(conf.getZkTimeout()*2, TimeUnit.MILLISECONDS)) {
- logger.fatal("Could not establish connection with ZooKeeper after zk_timeout*2 = " +
+ logger.error("Could not establish connection with ZooKeeper after zk_timeout*2 = " +
conf.getZkTimeout()*2 + " ms. (Default value for zk_timeout is 2000).");
throw new Exception("Could not establish connection with ZooKeeper after zk_timeout*2 = " +
conf.getZkTimeout()*2 + " ms. (Default value for zk_timeout is 2000).");
@@ -343,7 +344,7 @@ public class PubSubServer {
* : code to exit with
*/
public static void errorMsgAndExit(String msg, Throwable t, int rc) {
- logger.fatal(msg, t);
+ logger.error(msg, t);
System.err.println(msg);
System.exit(rc);
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/netty/UmbrellaHandler.java Thu Nov 17 10:16:32 2011
@@ -20,7 +20,8 @@ package org.apache.hedwig.server.netty;
import java.io.IOException;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
@@ -45,7 +46,7 @@ import org.apache.hedwig.server.handlers
@ChannelPipelineCoverage("all")
public class UmbrellaHandler extends SimpleChannelHandler {
- static Logger logger = Logger.getLogger(UmbrellaHandler.class);
+ static Logger logger = LoggerFactory.getLogger(UmbrellaHandler.class);
private Map<OperationType, Handler> handlers;
private ChannelGroup allChannels;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/BookkeeperPersistenceManager.java Thu Nov 17 10:16:32 2011
@@ -30,7 +30,8 @@ import org.apache.bookkeeper.client.Book
import org.apache.bookkeeper.client.LedgerEntry;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.BookKeeper.DigestType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs;
@@ -71,7 +72,7 @@ import org.apache.hedwig.zookeeper.ZkUti
*/
public class BookkeeperPersistenceManager implements PersistenceManagerWithRangeScan, TopicOwnershipChangeListener {
- static Logger logger = Logger.getLogger(BookkeeperPersistenceManager.class);
+ static Logger logger = LoggerFactory.getLogger(BookkeeperPersistenceManager.class);
static byte[] passwd = "sillysecret".getBytes();
private BookKeeper bk;
private ZooKeeper zk;
@@ -391,7 +392,7 @@ public class BookkeeperPersistenceManage
+ (localSeqId - topicInfo.currentLedgerRange.startSeqIdIncluded)
+ " but it instead assigned entry-id: " + entryId + " topic: "
+ topic.toStringUtf8() + "ledger: " + lh.getId();
- logger.fatal(msg);
+ logger.error(msg);
throw new UnexpectedError(msg);
}
@@ -482,7 +483,7 @@ public class BookkeeperPersistenceManage
ranges = LedgerRanges.parseFrom(data);
} catch (InvalidProtocolBufferException e) {
String msg = "Ledger ranges for topic:" + topic.toStringUtf8() + " could not be deserialized";
- logger.fatal(msg, e);
+ logger.error(msg, e);
cb.operationFailed(ctx, new PubSubException.UnexpectedConditionException(msg));
return;
}
@@ -507,7 +508,7 @@ public class BookkeeperPersistenceManage
if (lrIterator.hasNext()) {
String msg = "Ledger-id: " + range.getLedgerId() + " for topic: " + topic.toStringUtf8()
+ " is not the last one but still does not have an end seq-id";
- logger.fatal(msg);
+ logger.error(msg);
cb.operationFailed(ctx, new PubSubException.UnexpectedConditionException(msg));
return;
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/CacheValue.java Thu Nov 17 10:16:32 2011
@@ -20,7 +20,8 @@ package org.apache.hedwig.server.persist
import java.util.LinkedList;
import java.util.Queue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hedwig.protocol.PubSubProtocol.Message;
import org.apache.hedwig.server.common.UnexpectedError;
@@ -32,7 +33,7 @@ import org.apache.hedwig.server.common.U
*/
public class CacheValue {
- static Logger logger = Logger.getLogger(ReadAheadCache.class);
+ static Logger logger = LoggerFactory.getLogger(ReadAheadCache.class);
Queue<ScanCallbackWithContext> callbacks = new LinkedList<ScanCallbackWithContext>();
Message message;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/LocalDBPersistenceManager.java Thu Nov 17 10:16:32 2011
@@ -30,7 +30,8 @@ import java.util.concurrent.ConcurrentMa
import javax.sql.rowset.serial.SerialBlob;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.protobuf.ByteString;
import org.apache.hedwig.exceptions.PubSubException.ServiceDownException;
@@ -43,7 +44,7 @@ import org.apache.hedwig.util.Callback;
import org.apache.hedwig.util.FileUtils;
public class LocalDBPersistenceManager implements PersistenceManagerWithRangeScan {
- static Logger logger = Logger.getLogger(LocalDBPersistenceManager.class);
+ static Logger logger = LoggerFactory.getLogger(LocalDBPersistenceManager.class);
static String connectionURL;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/persistence/ReadAheadCache.java Thu Nov 17 10:16:32 2011
@@ -31,7 +31,8 @@ import java.util.TreeSet;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.protobuf.ByteString;
import org.apache.hedwig.exceptions.PubSubException;
@@ -45,7 +46,7 @@ import org.apache.hedwig.util.Callback;
public class ReadAheadCache implements PersistenceManager, Runnable {
- static Logger logger = Logger.getLogger(ReadAheadCache.class);
+ static Logger logger = LoggerFactory.getLogger(ReadAheadCache.class);
protected interface CacheRequest {
public void performRequest();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/HedwigProxy.java Thu Nov 17 10:16:32 2011
@@ -26,7 +26,8 @@ import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import org.apache.commons.configuration.ConfigurationException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.channel.group.DefaultChannelGroup;
@@ -44,7 +45,7 @@ import org.apache.hedwig.server.netty.Pu
import org.apache.hedwig.server.netty.UmbrellaHandler;
public class HedwigProxy {
- static final Logger logger = Logger.getLogger(HedwigProxy.class);
+ static final Logger logger = LoggerFactory.getLogger(HedwigProxy.class);
HedwigClient client;
ServerSocketChannelFactory serverSocketChannelFactory;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyConsumeHandler.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.server.proxy;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.apache.hedwig.client.api.Subscriber;
@@ -29,7 +30,7 @@ import org.apache.hedwig.server.netty.Um
public class ProxyConsumeHandler implements Handler {
- static final Logger logger = Logger.getLogger(ProxyConsumeHandler.class);
+ static final Logger logger = LoggerFactory.getLogger(ProxyConsumeHandler.class);
Subscriber subscriber;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStartDeliveryHandler.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.server.proxy;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ChannelFutureListener;
@@ -39,7 +40,7 @@ import org.apache.hedwig.util.Callback;
public class ProxyStartDeliveryHandler implements Handler {
- static final Logger logger = Logger.getLogger(ProxyStartDeliveryHandler.class);
+ static final Logger logger = LoggerFactory.getLogger(ProxyStartDeliveryHandler.class);
Subscriber subscriber;
ChannelTracker tracker;
@@ -116,7 +117,7 @@ public class ProxyStartDeliveryHandler i
} catch (ClientNotSubscribedException e) {
// This should not happen, since we already checked the correct
// channel and so on
- logger.fatal("Unexpected: No subscription when attempting to start delivery", e);
+ logger.error("Unexpected: No subscription when attempting to start delivery", e);
throw new RuntimeException(e);
}
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxyStopDeliveryHandler.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.server.proxy;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import com.google.protobuf.ByteString;
@@ -30,7 +31,7 @@ import org.apache.hedwig.server.netty.Um
public class ProxyStopDeliveryHandler implements Handler {
- static final Logger logger = Logger.getLogger(ProxyStopDeliveryHandler.class);
+ static final Logger logger = LoggerFactory.getLogger(ProxyStopDeliveryHandler.class);
Subscriber subscriber;
ChannelTracker tracker;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/proxy/ProxySubscribeHandler.java Thu Nov 17 10:16:32 2011
@@ -17,7 +17,8 @@
*/
package org.apache.hedwig.server.proxy;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.jboss.netty.channel.Channel;
import org.apache.hedwig.client.api.Subscriber;
import org.apache.hedwig.client.data.TopicSubscriber;
@@ -33,7 +34,7 @@ import org.apache.hedwig.util.Callback;
public class ProxySubscribeHandler implements Handler, ChannelDisconnectListener {
- static final Logger logger = Logger.getLogger(ProxySubscribeHandler.class);
+ static final Logger logger = LoggerFactory.getLogger(ProxySubscribeHandler.class);
Subscriber subscriber;
ChannelTracker tracker;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/regions/RegionManager.java Thu Nov 17 10:16:32 2011
@@ -20,8 +20,10 @@ package org.apache.hedwig.server.regions
import java.util.ArrayList;
import java.util.concurrent.ScheduledExecutorService;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooKeeper;
import com.google.protobuf.ByteString;
@@ -44,7 +46,7 @@ import org.apache.hedwig.util.HedwigSock
public class RegionManager implements SubscriptionEventListener {
- protected static final Logger LOGGER = Logger.getLogger(RegionManager.class);
+ protected static final Logger LOGGER = LoggerFactory.getLogger(RegionManager.class);
private final ByteString mySubId;
private final PersistenceManager pm;
@@ -69,8 +71,9 @@ public class RegionManager implements Su
queue.pushAndMaybeRun(topic, queue.new AsynchronousOp<Void>(topic, cb, null) {
@Override
public void run() {
- Callback<Void> postCb = synchronous ? cb : CallbackUtils.logger(LOGGER, Level.DEBUG, Level.ERROR,
- "all cross-region subscriptions succeeded", "at least one cross-region subscription failed");
+ Callback<Void> postCb = synchronous ? cb : CallbackUtils.logger(LOGGER,
+ "all cross-region subscriptions succeeded",
+ "at least one cross-region subscription failed");
final Callback<Void> mcb = CallbackUtils.multiCallback(clients.size(), postCb, ctx);
for (final HedwigHubClient client : clients) {
final HedwigSubscriber sub = client.getSubscriber();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/AbstractSubscriptionManager.java Thu Nov 17 10:16:32 2011
@@ -25,7 +25,8 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.protobuf.ByteString;
import org.apache.hedwig.exceptions.PubSubException;
@@ -47,7 +48,7 @@ public abstract class AbstractSubscripti
ServerConfiguration cfg;
ConcurrentHashMap<ByteString, Map<ByteString, InMemorySubscriptionState>> top2sub2seq = new ConcurrentHashMap<ByteString, Map<ByteString, InMemorySubscriptionState>>();
- static Logger logger = Logger.getLogger(AbstractSubscriptionManager.class);
+ static Logger logger = LoggerFactory.getLogger(AbstractSubscriptionManager.class);
TopicOpQueuer queuer;
private final ArrayList<SubscriptionEventListener> listeners = new ArrayList<SubscriptionEventListener>();
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/ZkSubscriptionManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/ZkSubscriptionManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/ZkSubscriptionManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/subscriptions/ZkSubscriptionManager.java Thu Nov 17 10:16:32 2011
@@ -24,7 +24,8 @@ import java.util.concurrent.ScheduledExe
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
@@ -47,7 +48,7 @@ public class ZkSubscriptionManager exten
ZooKeeper zk;
- protected final static Logger logger = Logger.getLogger(ZkSubscriptionManager.class);
+ protected final static Logger logger = LoggerFactory.getLogger(ZkSubscriptionManager.class);
public ZkSubscriptionManager(ZooKeeper zk, TopicManager topicMgr, PersistenceManager pm, ServerConfiguration cfg,
ScheduledExecutorService scheduler) {
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/AbstractTopicManager.java Thu Nov 17 10:16:32 2011
@@ -25,7 +25,8 @@ import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.protobuf.ByteString;
import org.apache.hedwig.exceptions.PubSubException;
@@ -55,7 +56,7 @@ public abstract class AbstractTopicManag
protected ServerConfiguration cfg;
protected ScheduledExecutorService scheduler;
- private static final Logger logger = Logger.getLogger(AbstractTopicManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractTopicManager.class);
private class GetOwnerOp extends TopicOpQueuer.AsynchronousOp<HedwigSocketAddress> {
public boolean shouldClaim;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/topics/ZkTopicManager.java Thu Nov 17 10:16:32 2011
@@ -23,7 +23,8 @@ import java.util.Random;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.SynchronousQueue;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
@@ -51,7 +52,7 @@ import org.apache.hedwig.zookeeper.SafeA
*/
public class ZkTopicManager extends AbstractTopicManager implements TopicManager {
- static Logger logger = Logger.getLogger(ZkTopicManager.class);
+ static Logger logger = LoggerFactory.getLogger(ZkTopicManager.class);
Random rand = new Random();
/**
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/zookeeper/ZkUtils.java Thu Nov 17 10:16:32 2011
@@ -19,7 +19,8 @@ package org.apache.hedwig.zookeeper;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.AsyncCallback;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -31,7 +32,7 @@ import org.apache.hedwig.util.PathUtils;
public class ZkUtils {
- static Logger logger = Logger.getLogger(ZkUtils.class);
+ static Logger logger = LoggerFactory.getLogger(ZkUtils.class);
public static void createFullPathOptimistic(final ZooKeeper zk, final String originalPath, final byte[] data,
final List<ACL> acl, final CreateMode createMode, final AsyncCallback.StringCallback callback,
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigHubTestBase.java Thu Nov 17 10:16:32 2011
@@ -22,7 +22,8 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
@@ -37,7 +38,7 @@ import org.apache.hedwig.server.persiste
*/
public abstract class HedwigHubTestBase extends TestCase {
- protected static Logger logger = Logger.getLogger(HedwigHubTestBase.class);
+ protected static Logger logger = LoggerFactory.getLogger(HedwigHubTestBase.class);
// BookKeeper variables
// Default number of bookie servers to setup. Extending classes can
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/HedwigRegionTestBase.java Thu Nov 17 10:16:32 2011
@@ -24,7 +24,8 @@ import java.util.Map;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
@@ -43,7 +44,7 @@ import org.apache.hedwig.util.HedwigSock
*/
public abstract class HedwigRegionTestBase extends TestCase {
- protected static Logger logger = Logger.getLogger(HedwigRegionTestBase.class);
+ protected static Logger logger = LoggerFactory.getLogger(HedwigRegionTestBase.class);
// BookKeeper variables
// Default number of bookie servers to setup. Extending classes
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/PubSubServerStandAloneTestBase.java Thu Nov 17 10:16:32 2011
@@ -19,7 +19,8 @@ package org.apache.hedwig.server;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
@@ -31,7 +32,7 @@ import org.apache.hedwig.server.netty.Pu
*/
public abstract class PubSubServerStandAloneTestBase extends TestCase {
- protected static Logger logger = Logger.getLogger(PubSubServerStandAloneTestBase.class);
+ protected static Logger logger = LoggerFactory.getLogger(PubSubServerStandAloneTestBase.class);
protected class StandAloneServerConfiguration extends ServerConfiguration {
@Override
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/TestPubSubServerStartup.java Thu Nov 17 10:16:32 2011
@@ -28,7 +28,8 @@ import junit.framework.Assert;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.hedwig.server.common.ServerConfiguration;
import org.apache.hedwig.server.netty.PubSubServer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.ZooKeeper;
@@ -39,7 +40,7 @@ import org.junit.Test;
public class TestPubSubServerStartup {
- private static Logger logger = Logger.getLogger(TestPubSubServerStartup.class);
+ private static Logger logger = LoggerFactory.getLogger(TestPubSubServerStartup.class);
/**
* Start-up zookeeper + pubsubserver reading from a config URL. Then stop
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java Thu Nov 17 10:16:32 2011
@@ -33,7 +33,8 @@ import org.junit.Test;
import org.apache.hedwig.util.FileUtils;
import org.apache.hedwig.zookeeper.ZooKeeperTestBase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This is a base class for any tests that require a BookKeeper client/server
@@ -41,7 +42,7 @@ import org.apache.log4j.Logger;
*
*/
public class BookKeeperTestBase extends ZooKeeperTestBase {
- private static Logger LOG = Logger.getLogger(BookKeeperTestBase.class);
+ private static Logger LOG = LoggerFactory.getLogger(BookKeeperTestBase.class);
// BookKeeper Server variables
private List<BookieServer> bookiesList;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/TestPersistenceManagerBlackBox.java Thu Nov 17 10:16:32 2011
@@ -25,7 +25,8 @@ import java.util.concurrent.TimeUnit;
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import com.google.protobuf.ByteString;
@@ -39,7 +40,7 @@ public abstract class TestPersistenceMan
protected PersistenceManager persistenceManager;
protected int NUM_MESSAGES_TO_TEST = 5;
protected int NUM_TOPICS_TO_TEST = 5;
- static Logger logger = Logger.getLogger(TestPersistenceManagerBlackBox.class);
+ static Logger logger = LoggerFactory.getLogger(TestPersistenceManagerBlackBox.class);
TestCallback testCallback = new TestCallback();
RuntimeException failureException;
Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java?rev=1203138&r1=1203137&r2=1203138&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/topics/TestZkTopicManager.java Thu Nov 17 10:16:32 2011
@@ -36,11 +36,12 @@ import org.apache.hedwig.util.Either;
import org.apache.hedwig.util.HedwigSocketAddress;
import org.apache.hedwig.util.Pair;
import org.apache.hedwig.zookeeper.ZooKeeperTestBase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TestZkTopicManager extends ZooKeeperTestBase {
- static Logger LOG = Logger.getLogger(TestZkTopicManager.class);
+ static Logger LOG = LoggerFactory.getLogger(TestZkTopicManager.class);
protected ZkTopicManager tm;