BOOKKEEPER-125: log4j still used in some places (ivank)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1207996 13f79535-47bb-0310-9956-ffa450edef68

Author: ivankelly

CHANGES.txt

@@ -84,6 +84,8 @@ BUGFIXES:
 
   BOOKKEEPER-39: Bookie server failed to restart because of too many ledgers (more than ~50,000 ledgers) (Sijie via ivank)
 
+  BOOKKEEPER-125: log4j still used in some places (ivank)
+
  hedwig-server/
 
   BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed)

bookkeeper-server/src/main/java/org/apache/bookkeeper/meta/AbstractZkLedgerManager.java

@@ -27,7 +27,9 @@
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.GenericCallback;
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.MultiCallback;
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.Processor;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.zookeeper.AsyncCallback;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
@@ -38,7 +40,7 @@
  */
 abstract class AbstractZkLedgerManager implements LedgerManager {
 
-    static Logger LOG = Logger.getLogger(AbstractZkLedgerManager.class);
+    static Logger LOG = LoggerFactory.getLogger(AbstractZkLedgerManager.class);
 
     // Ledger Node Prefix
     static public final String LEDGER_NODE_PREFIX = "L";

bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieLayoutVersionTest.java

@@ -30,13 +30,14 @@
 import org.junit.*;
 import static org.junit.Assert.*;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.bookkeeper.client.BookKeeper.DigestType;
 
 import org.apache.bookkeeper.test.BaseTestCase;
 
 public class BookieLayoutVersionTest extends BaseTestCase {
-    static Logger LOG = Logger.getLogger(BookieLayoutVersionTest.class);
+    static Logger LOG = LoggerFactory.getLogger(BookieLayoutVersionTest.class);
 
     final int BOOKIE_PORT = 3181;
 

bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java

@@ -35,14 +35,15 @@
 import org.apache.bookkeeper.client.BookKeeper.DigestType;
 import org.apache.bookkeeper.test.BaseTestCase;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This unit test tests ledger fencing;
  *
  */
 public class TestFencing extends BaseTestCase {
-    static Logger LOG = Logger.getLogger(TestFencing.class);
+    static Logger LOG = LoggerFactory.getLogger(TestFencing.class);
 
     DigestType digestType;
 

bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieJournalRollingTest.java

@@ -31,7 +31,10 @@
 import org.apache.bookkeeper.client.LedgerHandle;
 import org.apache.bookkeeper.client.BookKeeper.DigestType;
 import org.apache.bookkeeper.proto.BookieServer;
-import org.apache.log4j.Logger;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.junit.Assert;
 import org.junit.After;
 import org.junit.Before;
@@ -41,7 +44,7 @@
  * This class tests that bookie rolling journals
  */
 public class BookieJournalRollingTest extends BaseTestCase {
-    static Logger LOG = Logger.getLogger(BookieJournalRollingTest.class);
+    static Logger LOG = LoggerFactory.getLogger(BookieJournalRollingTest.class);
 
     DigestType digestType;