You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by mi...@apache.org on 2011/04/12 09:14:12 UTC
svn commit: r1091314 [3/3] - in /zookeeper/trunk: ./ src/contrib/loggraph/
src/contrib/loggraph/src/java/org/apache/zookeeper/graph/
src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/
src/contrib/rest/ src/contrib/rest/src/java/org/apac...
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLRootTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLRootTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLRootTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLRootTest.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.test;
-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;
@@ -27,7 +28,7 @@ import org.junit.Assert;
import org.junit.Test;
public class ACLRootTest extends ClientBase {
- private static final Logger LOG = Logger.getLogger(ACLRootTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ACLRootTest.class);
@Test
public void testRootAcl() throws Exception {
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
@@ -43,7 +44,7 @@ import org.junit.Assert;
import org.junit.Test;
public class ACLTest extends ZKTestCase implements Watcher {
- private static final Logger LOG = Logger.getLogger(ACLTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ACLTest.class);
private static final String HOSTPORT =
"127.0.0.1:" + PortAssignment.unique();
private volatile CountDownLatch startSignal;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import static org.apache.zookeeper.test.
import java.util.LinkedList;
-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.TestableZooKeeper;
@@ -41,7 +42,7 @@ import org.junit.Test;
public class AsyncHammerTest extends ZKTestCase
implements StringCallback, VoidCallback, DataCallback
{
- private static final Logger LOG = Logger.getLogger(AsyncHammerTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncHammerTest.class);
private QuorumBase qb = new QuorumBase();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java Tue Apr 12 07:14:07 2011
@@ -20,7 +20,8 @@ package org.apache.zookeeper.test;
import java.util.concurrent.CountDownLatch;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.test.AsyncOps.ACLCB;
import org.apache.zookeeper.test.AsyncOps.Children2CB;
@@ -34,7 +35,7 @@ import org.junit.Before;
import org.junit.Test;
public class AsyncOpsTest extends ClientBase {
- private static final Logger LOG = Logger.getLogger(AsyncOpsTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncOpsTest.class);
private ZooKeeper zk;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.LinkedList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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;
@@ -47,7 +48,7 @@ import org.junit.Test;
public class AsyncTest extends ZKTestCase
implements StringCallback, VoidCallback, DataCallback
{
- private static final Logger LOG = Logger.getLogger(AsyncTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AsyncTest.class);
private QuorumBase qb = new QuorumBase();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AuthTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AuthTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AuthTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AuthTest.java Tue Apr 12 07:14:07 2011
@@ -146,4 +146,4 @@ public class AuthTest extends ClientBase
zk.close();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java Tue Apr 12 07:14:07 2011
@@ -18,13 +18,14 @@
package org.apache.zookeeper.test;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooDefs.Ids;
public class ChrootAsyncTest extends AsyncOpsTest {
- private static final Logger LOG = Logger.getLogger(ChrootAsyncTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ChrootAsyncTest.class);
@Override
public void setUp() throws Exception {
@@ -43,4 +44,4 @@ public class ChrootAsyncTest extends Asy
zk.close();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java Tue Apr 12 07:14:07 2011
@@ -18,14 +18,15 @@
package org.apache.zookeeper.test;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooDefs.Ids;
import org.junit.Test;
public class ChrootClientTest extends ClientTest {
- private static final Logger LOG = Logger.getLogger(ChrootClientTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ChrootClientTest.class);
@Override
public void setUp() throws Exception {
@@ -50,4 +51,4 @@ public class ChrootClientTest extends Cl
public void testPing() throws Exception {
// not necessary to repeat this, expensive and not chroot related
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootTest.java Tue Apr 12 07:14:07 2011
@@ -133,4 +133,4 @@ public class ChrootTest extends ClientBa
zk2.close();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientBase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientBase.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientBase.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientBase.java Tue Apr 12 07:14:07 2011
@@ -38,8 +38,8 @@ import java.util.concurrent.TimeoutExcep
import javax.management.MBeanServerConnection;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.TestableZooKeeper;
@@ -60,7 +60,7 @@ import com.j2speed.accessor.FieldAccesso
import com.sun.management.UnixOperatingSystemMXBean;
public abstract class ClientBase extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(ClientBase.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ClientBase.class);
public static int CONNECTION_TIMEOUT = 30000;
static final File BASETEST =
@@ -578,15 +578,13 @@ public abstract class ClientBase extends
}
// verify all the servers reporting same number of nodes
+ String logmsg = "node count not consistent{} {}";
for (int i = 1; i < parts.length; i++) {
- int priority = Priority.INFO_INT;
- if (counts[i-1] == counts[i]) {
- priority = Priority.INFO_INT;
+ if (counts[i-1] != counts[i]) {
+ LOG.error(logmsg, Integer.valueOf(counts[i-1]), Integer.valueOf(counts[i]));
} else {
- priority = Priority.ERROR_INT;
+ LOG.info(logmsg, Integer.valueOf(counts[i-1]), Integer.valueOf(counts[i]));
}
- LOG.log(Priority.toPriority(priority),
- "node count not consistent" + counts[i-1] + " " + counts[i]);
}
}
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.io.IOException;
import java.util.Date;
import java.util.List;
-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;
@@ -31,7 +32,7 @@ import org.junit.Assert;
import org.junit.Test;
public class ClientHammerTest extends ClientBase {
- protected static final Logger LOG = Logger.getLogger(ClientHammerTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ClientHammerTest.class);
private static final long HAMMERTHREAD_LATENCY = 5;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java Tue Apr 12 07:14:07 2011
@@ -28,7 +28,8 @@ import java.util.Enumeration;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -42,7 +43,7 @@ import org.junit.Test;
public class ClientPortBindTest extends ZKTestCase implements Watcher {
protected static final Logger LOG =
- Logger.getLogger(ClientPortBindTest.class);
+ LoggerFactory.getLogger(ClientPortBindTest.class);
private volatile CountDownLatch startSignal;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java Tue Apr 12 07:14:07 2011
@@ -28,8 +28,8 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.Priority;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.TestableZooKeeper;
@@ -51,7 +51,7 @@ import org.junit.Test;
import com.sun.management.UnixOperatingSystemMXBean;
public class ClientTest extends ClientBase {
- protected static final Logger LOG = Logger.getLogger(ClientTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ClientTest.class);
/** Verify that pings are sent, keeping the "idle" client alive */
@Test
@@ -106,15 +106,15 @@ public class ClientTest extends ClientBa
public void testTestability() throws Exception {
TestableZooKeeper zk = createClient();
try {
- LOG.info(zk.testableLocalSocketAddress());
- LOG.info(zk.testableRemoteSocketAddress());
- LOG.info(zk.toString());
+ LOG.info("{}",zk.testableLocalSocketAddress());
+ LOG.info("{}",zk.testableRemoteSocketAddress());
+ LOG.info("{}",zk.toString());
} finally {
zk.close();
zk.testableWaitForShutdown(CONNECTION_TIMEOUT);
- LOG.info(zk.testableLocalSocketAddress());
- LOG.info(zk.testableRemoteSocketAddress());
- LOG.info(zk.toString());
+ LOG.info("{}",zk.testableLocalSocketAddress());
+ LOG.info("{}",zk.testableRemoteSocketAddress());
+ LOG.info("{}",zk.toString());
}
}
@@ -729,14 +729,13 @@ public class ClientTest extends ClientBa
// if this Assert.fails it means we are not cleaning up after the closed
// sessions.
long currentCount = unixos.getOpenFileDescriptorCount();
- int priority = Priority.INFO_INT;
- if (currentCount <= initialFdCount + 10) {
- priority = Priority.INFO_INT;
+ final String logmsg = "open fds after test ({}) are not significantly higher than before ({})";
+
+ if (currentCount > initialFdCount + 10) {
+ // consider as error
+ LOG.error(logmsg,Long.valueOf(currentCount),Long.valueOf(initialFdCount));
} else {
- priority= Priority.ERROR_INT;
+ LOG.info(logmsg,Long.valueOf(currentCount),Long.valueOf(initialFdCount));
}
- LOG.log(Priority.toPriority(priority), "open fds after test (" + currentCount
- + ") are not significantly higher than before ("
- + initialFdCount + ")");
}
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java Tue Apr 12 07:14:07 2011
@@ -29,7 +29,8 @@ import java.util.Random;
import java.util.concurrent.TimeUnit;
import java.net.Socket;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.QuorumCnxManager;
@@ -42,7 +43,7 @@ import org.junit.Before;
import org.junit.Test;
public class CnxManagerTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(FLENewEpochTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FLENewEpochTest.class);
protected static final int THRESHOLD = 4;
int count;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.test;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZKTestCase;
@@ -30,7 +31,7 @@ import org.junit.Before;
import org.junit.Test;
public class DataTreeTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(DataTreeTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(DataTreeTest.class);
private DataTree dt;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.util.HashMap;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.FastLeaderElection;
@@ -39,7 +40,7 @@ import org.junit.Before;
import org.junit.Test;
public class FLELostMessageTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(FLELostMessageTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FLELostMessageTest.class);
int count;
@@ -170,4 +171,4 @@ public class FLELostMessageTest extends
cnxManager.recvQueue.take();
cnxManager.toSend(new Long(1), createMsg(ServerState.FOLLOWING.ordinal(), 1, 0, 1));
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.Semaphore;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.FastLeaderElection;
@@ -38,7 +39,7 @@ import org.junit.Before;
import org.junit.Test;
public class FLENewEpochTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(FLENewEpochTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FLENewEpochTest.class);
int count;
HashMap<Long,QuorumServer> peers;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLERestartTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLERestartTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLERestartTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLERestartTest.java Tue Apr 12 07:14:07 2011
@@ -26,7 +26,8 @@ import java.util.HashSet;
import java.util.Random;
import java.util.concurrent.Semaphore;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.FastLeaderElection;
@@ -40,7 +41,7 @@ import org.junit.Before;
import org.junit.Test;
public class FLERestartTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(FLETest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FLETest.class);
static class TestVote {
TestVote(int id, long leader) {
@@ -200,4 +201,4 @@ public class FLERestartTest extends ZKTe
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Random;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.FastLeaderElection;
@@ -39,7 +40,7 @@ import org.junit.Before;
import org.junit.Test;
public class FLETest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(FLETest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FLETest.class);
private FLETest.LEThread leThread;
static class TestVote {
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.HashMap;
import java.util.Properties;
import java.util.Random;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.FastLeaderElection;
@@ -40,7 +41,7 @@ import org.junit.Before;
import org.junit.Test;
public class FLEZeroWeightTest extends ZKTestCase {
- private static final Logger LOG = Logger.getLogger(HierarchicalQuorumTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(HierarchicalQuorumTest.class);
Properties qp;
@@ -179,4 +180,4 @@ public class FLEZeroWeightTest extends Z
}
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java Tue Apr 12 07:14:07 2011
@@ -20,14 +20,15 @@ package org.apache.zookeeper.test;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.TestableZooKeeper;
import org.junit.Assert;
import org.junit.Test;
public class FourLetterWordsQuorumTest extends QuorumBase {
protected static final Logger LOG =
- Logger.getLogger(FourLetterWordsQuorumTest.class);
+ LoggerFactory.getLogger(FourLetterWordsQuorumTest.class);
/** Test the various four letter words */
@Test
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java Tue Apr 12 07:14:07 2011
@@ -20,14 +20,15 @@ package org.apache.zookeeper.test;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.TestableZooKeeper;
import org.junit.Assert;
import org.junit.Test;
public class FourLetterWordsTest extends ClientBase {
protected static final Logger LOG =
- Logger.getLogger(FourLetterWordsTest.class);
+ LoggerFactory.getLogger(FourLetterWordsTest.class);
/** Test the various four letter words */
@Test
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java Tue Apr 12 07:14:07 2011
@@ -26,7 +26,8 @@ import java.util.LinkedHashSet;
import java.util.Properties;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.TestableZooKeeper;
import org.apache.zookeeper.server.quorum.QuorumPeer;
@@ -36,7 +37,7 @@ import org.junit.Assert;
import org.junit.Test;
public class HierarchicalQuorumTest extends ClientBase {
- private static final Logger LOG = Logger.getLogger(QuorumBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumBase.class);
File s1dir, s2dir, s3dir, s4dir, s5dir;
QuorumPeer s1, s2, s3, s4, s5;
@@ -277,4 +278,4 @@ public class HierarchicalQuorumTest exte
public void testHierarchicalQuorum() throws Throwable {
cht.runHammer(5, 10);
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java Tue Apr 12 07:14:07 2011
@@ -35,7 +35,8 @@ import java.io.IOException;
import java.util.Date;
import java.util.HashMap;
-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;
@@ -48,7 +49,7 @@ import org.apache.zookeeper.Watcher.Even
import org.apache.zookeeper.data.Stat;
public class IntegrityCheck implements Watcher, StatCallback, DataCallback {
- private static final Logger LOG = Logger.getLogger(IntegrityCheck.class);
+ private static final Logger LOG = LoggerFactory.getLogger(IntegrityCheck.class);
ZooKeeper zk;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import static org.apache.zookeeper.test.
import java.io.File;
import java.util.concurrent.CountDownLatch;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -38,7 +39,7 @@ import org.junit.Assert;
import org.junit.Test;
public class InvalidSnapshotTest extends ZKTestCase implements Watcher {
- private final static Logger LOG = Logger.getLogger(UpgradeTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(UpgradeTest.class);
private static final String HOSTPORT =
"127.0.0.1:" + PortAssignment.unique();
@@ -96,4 +97,4 @@ public class InvalidSnapshotTest extends
startSignal.countDown();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/JMXEnv.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/JMXEnv.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/JMXEnv.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/JMXEnv.java Tue Apr 12 07:14:07 2011
@@ -36,11 +36,12 @@ import javax.management.remote.JMXServic
import junit.framework.TestCase;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.CommonNames;
public class JMXEnv {
- protected static final Logger LOG = Logger.getLogger(JMXEnv.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(JMXEnv.class);
private static JMXConnectorServer cs;
private static JMXConnector cc;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java Tue Apr 12 07:14:07 2011
@@ -32,7 +32,8 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.ServerCnxnFactory;
@@ -227,7 +228,7 @@ public class LENonTerminateTest extends
}
- protected static final Logger LOG = Logger.getLogger(FLELostMessageTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(FLELostMessageTest.class);
int count;
HashMap<Long,QuorumServer> peers;
@@ -324,7 +325,7 @@ public class LENonTerminateTest extends
try {
mockServer();
} catch (Exception e) {
- LOG.error(e);
+ LOG.error("exception", e);
Assert.fail("Exception when running mocked server " + e);
}
}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LETest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LETest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LETest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LETest.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Random;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.ZKTestCase;
import org.apache.zookeeper.server.quorum.LeaderElection;
@@ -35,7 +36,7 @@ import org.junit.Assert;
import org.junit.Test;
public class LETest extends ZKTestCase {
- private static final Logger LOG = Logger.getLogger(LETest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LETest.class);
volatile Vote votes[];
volatile boolean leaderDies;
volatile long leader = -1;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/NullDataTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/NullDataTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/NullDataTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/NullDataTest.java Tue Apr 12 07:14:07 2011
@@ -72,4 +72,4 @@ public class NullDataTest extends Client
public void processResult(int rc, String path, Object ctx, Stat stat) {
cn.countDown();
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java Tue Apr 12 07:14:07 2011
@@ -17,12 +17,13 @@
package org.apache.zookeeper.test;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.quorum.QuorumPeer;
import org.junit.Test;
public class ObserverHierarchicalQuorumTest extends HierarchicalQuorumTest {
- private static final Logger LOG = Logger.getLogger(QuorumBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumBase.class);
/**
* startServers(true) puts two observers into a 5 peer ensemble
@@ -39,4 +40,4 @@ public class ObserverHierarchicalQuorumT
public void testHierarchicalQuorum() throws Throwable {
cht.runHammer(5, 10);
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java Tue Apr 12 07:14:07 2011
@@ -36,4 +36,4 @@ public class ObserverQuorumHammerTest ex
public void testHammerBasic() throws Throwable {
cht.testHammerBasic();
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import static org.apache.zookeeper.test.
import java.util.concurrent.CountDownLatch;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException.ConnectionLossException;
import org.apache.zookeeper.PortAssignment;
@@ -38,7 +39,7 @@ import org.junit.Test;
public class ObserverTest extends QuorumPeerTestBase implements Watcher{
protected static final Logger LOG =
- Logger.getLogger(ObserverTest.class);
+ LoggerFactory.getLogger(ObserverTest.class);
CountDownLatch latch;
ZooKeeper zk;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/PurgeTxnTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/PurgeTxnTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/PurgeTxnTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/PurgeTxnTest.java Tue Apr 12 07:14:07 2011
@@ -37,7 +37,7 @@ import org.junit.Assert;
import org.junit.Test;
public class PurgeTxnTest extends ZKTestCase implements Watcher {
- //private static final Logger LOG = Logger.getLogger(PurgeTxnTest.class);
+ //private static final Logger LOG = LoggerFactory.getLogger(PurgeTxnTest.class);
private static String HOSTPORT = "127.0.0.1:" + PortAssignment.unique();
private static final int CONNECTION_TIMEOUT = 3000;
/**
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java Tue Apr 12 07:14:07 2011
@@ -27,7 +27,8 @@ import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.TestableZooKeeper;
import org.apache.zookeeper.server.quorum.Election;
@@ -40,7 +41,7 @@ import org.junit.Test;
import com.sun.management.UnixOperatingSystemMXBean;
public class QuorumBase extends ClientBase {
- private static final Logger LOG = Logger.getLogger(QuorumBase.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumBase.class);
File s1dir, s2dir, s3dir, s4dir, s5dir;
QuorumPeer s1, s2, s3, s4, s5;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java Tue Apr 12 07:14:07 2011
@@ -17,13 +17,14 @@
*/
package org.apache.zookeeper.test;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class QuorumHammerTest extends QuorumBase {
- protected static final Logger LOG = Logger.getLogger(QuorumHammerTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(QuorumHammerTest.class);
public static final long CONNECTION_TIMEOUT = ClientTest.CONNECTION_TIMEOUT;
protected final QuorumBase qb = new QuorumBase();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.test;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.Quotas;
import org.apache.zookeeper.StatsTrack;
@@ -31,7 +32,7 @@ import org.junit.Test;
public class QuorumQuotaTest extends QuorumBase {
private static final Logger LOG =
- Logger.getLogger(QuorumQuotaTest.class);
+ LoggerFactory.getLogger(QuorumQuotaTest.class);
@Test
public void testQuotaWithQuorum() throws Exception {
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.util.ArrayList;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
-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;
@@ -42,7 +43,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class QuorumTest extends QuorumBase {
- private static final Logger LOG = Logger.getLogger(QuorumTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumTest.class);
public static final long CONNECTION_TIMEOUT = ClientTest.CONNECTION_TIMEOUT;
private final QuorumBase qb = new QuorumBase();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumUtil.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumUtil.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumUtil.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumUtil.java Tue Apr 12 07:14:07 2011
@@ -28,7 +28,8 @@ import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.server.quorum.Election;
import org.apache.zookeeper.server.quorum.QuorumPeer;
@@ -48,7 +49,7 @@ public class QuorumUtil {
// TODO refactor QuorumBase to be special case of this
- private static final Logger LOG = Logger.getLogger(QuorumUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(QuorumUtil.class);
public class PeerStruct {
public int id;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java Tue Apr 12 07:14:07 2011
@@ -24,7 +24,8 @@ import java.io.File;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
@@ -41,7 +42,7 @@ import org.junit.Assert;
import org.junit.Test;
public class RecoveryTest extends ZKTestCase implements Watcher {
- protected static final Logger LOG = Logger.getLogger(RecoveryTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(RecoveryTest.class);
private static final String HOSTPORT =
"127.0.0.1:" + PortAssignment.unique();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java Tue Apr 12 07:14:07 2011
@@ -65,4 +65,4 @@ public class RepeatStartupTest extends Z
QuorumTest.CONNECTION_TIMEOUT));
System.out.println("Comment: shutting down standalone");
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java Tue Apr 12 07:14:07 2011
@@ -28,7 +28,8 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-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;
@@ -50,7 +51,7 @@ import org.junit.Ignore;
import org.junit.Test;
public class SessionTest extends ZKTestCase {
- protected static final Logger LOG = Logger.getLogger(SessionTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(SessionTest.class);
private static final String HOSTPORT = "127.0.0.1:" +
PortAssignment.unique();
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/StandaloneTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/StandaloneTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/StandaloneTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/StandaloneTest.java Tue Apr 12 07:14:07 2011
@@ -20,7 +20,8 @@ package org.apache.zookeeper.test;
import static org.apache.zookeeper.test.ClientBase.CONNECTION_TIMEOUT;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.server.quorum.QuorumPeerTestBase;
@@ -32,7 +33,7 @@ import org.junit.Test;
*/
public class StandaloneTest extends QuorumPeerTestBase implements Watcher{
protected static final Logger LOG =
- Logger.getLogger(StandaloneTest.class);
+ LoggerFactory.getLogger(StandaloneTest.class);
/**
* Ensure that a single standalone server comes up when misconfigured
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TruncateTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TruncateTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TruncateTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TruncateTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.HashMap;
-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;
@@ -43,7 +44,7 @@ import org.junit.Before;
import org.junit.Test;
public class TruncateTest extends ZKTestCase {
- private static final Logger LOG = Logger.getLogger(TruncateTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TruncateTest.class);
File dataDir1, dataDir2, dataDir3;
final int baseHostPort = 12233;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/UpgradeTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/UpgradeTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/UpgradeTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/UpgradeTest.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.PortAssignment;
import org.apache.zookeeper.WatchedEvent;
@@ -43,7 +44,7 @@ import org.junit.Assert;
import org.junit.Test;
public class UpgradeTest extends ZKTestCase implements Watcher {
- private final static Logger LOG = Logger.getLogger(UpgradeTest.class);
+ private final static Logger LOG = LoggerFactory.getLogger(UpgradeTest.class);
private static String HOSTPORT = "127.0.0.1:" + PortAssignment.unique();
private static final File testData = new File(
@@ -101,4 +102,4 @@ public class UpgradeTest extends ZKTestC
startSignal.countDown();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ClientCnxn;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -41,7 +42,7 @@ import org.junit.Assert;
import org.junit.Test;
public class WatcherTest extends ClientBase {
- protected static final Logger LOG = Logger.getLogger(WatcherTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(WatcherTest.class);
private final class MyStatCallback implements StatCallback {
int rc;
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
@@ -38,7 +39,7 @@ import org.junit.Before;
import org.junit.Test;
public class ZkDatabaseCorruptionTest extends QuorumBase {
- protected static final Logger LOG = Logger.getLogger(ZkDatabaseCorruptionTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ZkDatabaseCorruptionTest.class);
public static final long CONNECTION_TIMEOUT = ClientTest.CONNECTION_TIMEOUT;
private final QuorumBase qb = new QuorumBase();
@@ -129,4 +130,4 @@ public class ZkDatabaseCorruptionTest ex
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java Tue Apr 12 07:14:07 2011
@@ -20,7 +20,8 @@ package org.apache.zookeeper.test;
import java.io.IOException;
-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.Quotas;
@@ -33,7 +34,7 @@ import org.junit.Assert;
import org.junit.Test;
public class ZooKeeperQuotaTest extends ClientBase {
- private static final Logger LOG = Logger.getLogger(
+ private static final Logger LOG = LoggerFactory.getLogger(
ZooKeeperQuotaTest.class);
@Test
Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java Tue Apr 12 07:14:07 2011
@@ -418,4 +418,4 @@ public class ZooKeeperTestClient extends
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java (original)
+++ zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java Tue Apr 12 07:14:07 2011
@@ -35,4 +35,4 @@ public interface LockListener {
* released.
*/
public void lockReleased();
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java (original)
+++ zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java Tue Apr 12 07:14:07 2011
@@ -17,7 +17,8 @@
*/
package org.apache.zookeeper.recipes.lock;
-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;
@@ -37,7 +38,7 @@ import java.util.concurrent.atomic.Atomi
*
*/
class ProtocolSupport {
- private static final Logger LOG = Logger.getLogger(ProtocolSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ProtocolSupport.class);
protected final ZooKeeper zookeeper;
private AtomicBoolean closed = new AtomicBoolean(false);
Modified: zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java (original)
+++ zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java Tue Apr 12 07:14:07 2011
@@ -17,7 +17,8 @@
*/
package org.apache.zookeeper.recipes.lock;
-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;
@@ -40,7 +41,7 @@ import java.util.TreeSet;
*
*/
public class WriteLock extends ProtocolSupport {
- private static final Logger LOG = Logger.getLogger(WriteLock.class);
+ private static final Logger LOG = LoggerFactory.getLogger(WriteLock.class);
private final String dir;
private String id;
Modified: zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java (original)
+++ zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java Tue Apr 12 07:14:07 2011
@@ -17,7 +17,8 @@
*/
package org.apache.zookeeper.recipes.lock;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents an ephemeral znode name which has an ordered sequence number
@@ -28,7 +29,7 @@ class ZNodeName implements Comparable<ZN
private final String name;
private String prefix;
private int sequence = -1;
- private static final Logger LOG = Logger.getLogger(ZNodeName.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZNodeName.class);
public ZNodeName(String name) {
if (name == null) {
Modified: zookeeper/trunk/src/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java (original)
+++ zookeeper/trunk/src/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.NoSuchElementException;
import java.util.TreeMap;
import java.util.concurrent.CountDownLatch;
-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;
@@ -40,7 +41,7 @@ import org.apache.zookeeper.data.Stat;
*/
public class DistributedQueue {
- private static final Logger LOG = Logger.getLogger(DistributedQueue.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DistributedQueue.class);
private final String dir;