diff --git a/pom.xml b/pom.xml index ede0210..c8d206c 100644 --- a/pom.xml +++ b/pom.xml @@ -124,16 +124,6 @@ compile - - org.slf4j - slf4j-api - 1.6.1 - - - org.slf4j - slf4j-log4j12 - 1.6.1 - junit junit diff --git a/src/main/java/org/msgpack/rpc/Server.java b/src/main/java/org/msgpack/rpc/Server.java index ba027d5..8113cc1 100644 --- a/src/main/java/org/msgpack/rpc/Server.java +++ b/src/main/java/org/msgpack/rpc/Server.java @@ -36,12 +36,12 @@ import org.msgpack.rpc.transport.MessageSendable; import org.msgpack.rpc.loop.EventLoop; import org.msgpack.rpc.error.RPCError; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.jboss.netty.logging.InternalLogger; +import org.jboss.netty.logging.InternalLoggerFactory; public class Server extends SessionPool { - private final static Logger logger = LoggerFactory.getLogger(Server.class); + private final static InternalLogger logger = InternalLoggerFactory.getInstance(Server.class); private Dispatcher dp; private ServerTransport stran; diff --git a/src/main/java/org/msgpack/rpc/dispatcher/StopWatchDispatcher.java b/src/main/java/org/msgpack/rpc/dispatcher/StopWatchDispatcher.java index 39ff87f..2b7242e 100644 --- a/src/main/java/org/msgpack/rpc/dispatcher/StopWatchDispatcher.java +++ b/src/main/java/org/msgpack/rpc/dispatcher/StopWatchDispatcher.java @@ -1,8 +1,8 @@ package org.msgpack.rpc.dispatcher; import org.msgpack.rpc.Request; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.jboss.netty.logging.InternalLogger; +import org.jboss.netty.logging.InternalLoggerFactory; /** * For debug. @@ -15,7 +15,7 @@ public class StopWatchDispatcher implements Dispatcher { Dispatcher innerDispatcher; - private final static Logger logger = LoggerFactory.getLogger(StopWatchDispatcher.class); + private final static InternalLogger logger = InternalLoggerFactory.getInstance(StopWatchDispatcher.class); private boolean verbose = true; diff --git a/src/main/java/org/msgpack/rpc/reflect/JavassistInvokerBuilder.java b/src/main/java/org/msgpack/rpc/reflect/JavassistInvokerBuilder.java index 2a32e21..7f3dbf5 100644 --- a/src/main/java/org/msgpack/rpc/reflect/JavassistInvokerBuilder.java +++ b/src/main/java/org/msgpack/rpc/reflect/JavassistInvokerBuilder.java @@ -38,11 +38,11 @@ import org.msgpack.rpc.Request; import org.msgpack.rpc.reflect.ReflectionInvokerBuilder.ReflectionArgumentEntry; import org.msgpack.template.TemplateRegistry; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.jboss.netty.logging.InternalLogger; +import org.jboss.netty.logging.InternalLoggerFactory; public class JavassistInvokerBuilder extends InvokerBuilder { - private static Logger LOG = LoggerFactory.getLogger(JavassistInvokerBuilder.class); + private static final InternalLogger LOG = InternalLoggerFactory.getInstance(JavassistInvokerBuilder.class); protected abstract static class AbstractInvoker implements Invoker { diff --git a/src/main/java/org/msgpack/rpc/reflect/ReflectionInvokerBuilder.java b/src/main/java/org/msgpack/rpc/reflect/ReflectionInvokerBuilder.java index 2c403f2..f6371bf 100644 --- a/src/main/java/org/msgpack/rpc/reflect/ReflectionInvokerBuilder.java +++ b/src/main/java/org/msgpack/rpc/reflect/ReflectionInvokerBuilder.java @@ -24,12 +24,12 @@ import org.msgpack.rpc.*; import org.msgpack.type.Value; import org.msgpack.unpacker.Converter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.jboss.netty.logging.InternalLogger; +import org.jboss.netty.logging.InternalLoggerFactory; public class ReflectionInvokerBuilder extends InvokerBuilder { - private static final Logger logger = LoggerFactory.getLogger(ReflectionInvokerBuilder.class); + private static final InternalLogger logger = InternalLoggerFactory.getInstance(ReflectionInvokerBuilder.class); protected MessagePack messagePack; public ReflectionInvokerBuilder(MessagePack messagePack){ this.messagePack = messagePack; diff --git a/src/test/java/org/msgpack/rpc/DecoratorTest.java b/src/test/java/org/msgpack/rpc/DecoratorTest.java index c055c15..4e80a2e 100644 --- a/src/test/java/org/msgpack/rpc/DecoratorTest.java +++ b/src/test/java/org/msgpack/rpc/DecoratorTest.java @@ -1,7 +1,6 @@ package org.msgpack.rpc; import junit.framework.TestCase; -import org.apache.log4j.BasicConfigurator; import org.junit.Test; import org.msgpack.MessageTypeException; import org.msgpack.rpc.builder.StopWatchDispatcherBuilder; @@ -33,7 +32,6 @@ public String throwError(String errorMessage) throws Exception{ @Test public void testDecorateStopWatch() throws Exception { - BasicConfigurator.configure(); EventLoop loop = EventLoop.start(); Server svr = new Server(loop); svr.setDispatcherBuilder( diff --git a/src/test/java/org/msgpack/rpc/ServerErrorTest.java b/src/test/java/org/msgpack/rpc/ServerErrorTest.java index 40a37c7..163ceec 100644 --- a/src/test/java/org/msgpack/rpc/ServerErrorTest.java +++ b/src/test/java/org/msgpack/rpc/ServerErrorTest.java @@ -1,7 +1,6 @@ package org.msgpack.rpc; import junit.framework.TestCase; -import org.apache.log4j.BasicConfigurator; import org.junit.Test; import org.msgpack.MessageTypeException; import org.msgpack.rpc.builder.StopWatchDispatcherBuilder; @@ -49,7 +48,6 @@ static interface CallFunc{ void call( CallFunc func) throws Exception{ - BasicConfigurator.configure(); EventLoop loop = EventLoop.start(); Server svr = new Server(loop); Client c = new Client("127.0.0.1", 19850, loop); diff --git a/src/test/java/org/msgpack/rpc/ServerTest.java b/src/test/java/org/msgpack/rpc/ServerTest.java index 2676d02..e2c8df4 100644 --- a/src/test/java/org/msgpack/rpc/ServerTest.java +++ b/src/test/java/org/msgpack/rpc/ServerTest.java @@ -17,7 +17,6 @@ // package org.msgpack.rpc; -import org.apache.log4j.BasicConfigurator; import org.msgpack.*; import org.msgpack.rpc.*; import org.msgpack.rpc.builder.StopWatchDispatcherBuilder;