Skip to content

Remove slf4j & log4j dependency. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove slf4j & log4j dependency. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,6 @@
</exclusions>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/msgpack/rpc/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/msgpack/rpc/dispatcher/StopWatchDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/msgpack/rpc/reflect/JavassistInvokerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/msgpack/rpc/reflect/ReflectionInvokerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/org/msgpack/rpc/DecoratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/org/msgpack/rpc/ServerErrorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/test/java/org/msgpack/rpc/ServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down