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 [1/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...
Author: michim
Date: Tue Apr 12 07:14:07 2011
New Revision: 1091314
URL: http://svn.apache.org/viewvc?rev=1091314&view=rev
Log:
ZOOKEEPER-850: Switch from log4j to slf4j (Olaf Krische via michim)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/ivy.xml
zookeeper/trunk/src/contrib/loggraph/ivy.xml
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java
zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java
zookeeper/trunk/src/contrib/rest/ivy.xml
zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java
zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java
zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java
zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java
zookeeper/trunk/src/contrib/zooinspector/ivy.xml
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java
zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java
zookeeper/trunk/src/docs/src/documentation/content/xdocs/bookkeeperStarted.xml
zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperInternals.xml
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/CreateMode.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/client/StaticHostProvider.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/common/PathTrie.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ConnectionBean.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/LogFormatter.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NIOServerCnxnFactory.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxn.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/NettyServerCnxnFactory.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PrepRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/PurgeTxnLog.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Request.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SessionTrackerImpl.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/Stats.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/SyncRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/WatchManager.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZKDatabase.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooKeeperServerMain.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ZooTrace.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/DigestAuthenticationProvider.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/auth/ProviderRegistry.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileSnap.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnLog.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/FileTxnSnapLog.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/SnapShot.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/persistence/Util.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AckRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/AuthFastLeaderElection.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/CommitProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Election.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Follower.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/FollowerZooKeeperServer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Leader.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LeaderElection.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Learner.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/LearnerHandler.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ObserverZooKeeperServer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/ProposalRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerConfig.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/QuorumPeerMain.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/SendAckRequestProcessor.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/Vote.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumHierarchical.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumMaj.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/quorum/flexible/QuorumVerifier.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/DataTreeV1.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeMain.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShot.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/upgrade/UpgradeSnapShotV1.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/Profiler.java
zookeeper/trunk/src/java/main/org/apache/zookeeper/server/util/SerializeUtils.java
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/GenerateLoad.java
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceContainer.java
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/InstanceManager.java
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/QuorumPeerInstance.java
zookeeper/trunk/src/java/systest/org/apache/zookeeper/test/system/SimpleSysTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/JUnit4ZKTestRunner.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/PortAssignment.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/ZKTestCase.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/CRCTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/DeserializationPerfTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/InvalidSnapshotTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/SerializationPerfTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/ZooKeeperServerMainTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerTestBase.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLRootTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ACLTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncHammerTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncOpsTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AsyncTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/AuthTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootAsyncTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootClientTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ChrootTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientBase.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientHammerTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ClientTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/DataTreeTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLERestartTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsQuorumTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FourLetterWordsTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/HierarchicalQuorumTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/IntegrityCheck.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/InvalidSnapshotTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/JMXEnv.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LENonTerminateTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/LETest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/NullDataTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverHierarchicalQuorumTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverQuorumHammerTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ObserverTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/PurgeTxnTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumBase.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumHammerTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumQuotaTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/QuorumUtil.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RecoveryTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/RepeatStartupTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/SessionTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/StandaloneTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/TruncateTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/UpgradeTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/WatcherTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZkDatabaseCorruptionTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperQuotaTest.java
zookeeper/trunk/src/java/test/org/apache/zookeeper/test/ZooKeeperTestClient.java
zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/LockListener.java
zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ProtocolSupport.java
zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/WriteLock.java
zookeeper/trunk/src/recipes/lock/src/java/org/apache/zookeeper/recipes/lock/ZNodeName.java
zookeeper/trunk/src/recipes/queue/src/java/org/apache/zookeeper/recipes/queue/DistributedQueue.java
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Tue Apr 12 07:14:07 2011
@@ -272,6 +272,8 @@ IMPROVEMENTS:
ZOOKEEPER-1030: Increase default for maxClientCnxns
(Todd Lipcon via breed/mahadev/phunt)
+ ZOOKEEPER-850: Switch from log4j to slf4j (Olaf Krische via michim)
+
NEW FEATURES:
ZOOKEEPER-729. Java client API to recursively delete a subtree.
(Kay Kay via henry)
Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Tue Apr 12 07:14:07 2011
@@ -37,6 +37,9 @@
</publications>
<dependencies>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
<dependency org="log4j" name="log4j" rev="1.2.15" transitive="false" conf="default"/>
<dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
Modified: zookeeper/trunk/src/contrib/loggraph/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/ivy.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/loggraph/ivy.xml Tue Apr 12 07:14:07 2011
@@ -31,6 +31,9 @@
</configurations>
<dependencies>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
<dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
<dependency org="org.eclipse.jetty" name="jetty-server" rev="7.0.1.v20091125" />
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterOp.java Tue Apr 12 07:14:07 2011
@@ -72,4 +72,4 @@ public abstract class FilterOp {
}
return op + ")";
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/FilterParser.java Tue Apr 12 07:14:07 2011
@@ -128,4 +128,4 @@ public class FilterParser {
System.out.println(new FilterParser("(or (and (= session foobar) (= session barfoo)) (= session sdfs))").parse());
}
}
-};
\ No newline at end of file
+};
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JEntry.java Tue Apr 12 07:14:07 2011
@@ -37,4 +37,4 @@ public class Log4JEntry extends LogEntry
}
public Type getType() { return LogEntry.Type.LOG4J; }
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/Log4JSource.java Tue Apr 12 07:14:07 2011
@@ -37,10 +37,11 @@ import java.io.FileNotFoundException;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Log4JSource implements LogSource {
- private static final Logger LOG = Logger.getLogger(Log4JSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Log4JSource.class);
private static final int skipN = 10000;
private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss,SSS";
@@ -377,4 +378,4 @@ public class Log4JSource implements LogS
public int getServerId() {
return serverid;
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogIterator.java Tue Apr 12 07:14:07 2011
@@ -23,4 +23,4 @@ import java.io.IOException;
public interface LogIterator extends Iterator<LogEntry>, Closeable {
long size() throws IOException;;
-};
\ No newline at end of file
+};
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogServer.java Tue Apr 12 07:14:07 2011
@@ -63,4 +63,4 @@ public class LogServer extends ServletCo
e.printStackTrace();
}
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/LogSkipList.java Tue Apr 12 07:14:07 2011
@@ -21,7 +21,8 @@ import java.util.List;
import java.util.LinkedList;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
Generic skip list for holding a rough index of a log file. When the log file is loaded, this
@@ -30,7 +31,7 @@ from the file, a point at most n-1 entri
*/
public class LogSkipList {
- private static final Logger LOG = Logger.getLogger(LogSkipList.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LogSkipList.class);
private LinkedList<Mark> marks;
@@ -91,4 +92,4 @@ public class LogSkipList {
return last;
}
-};
\ No newline at end of file
+};
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MeasureThroughput.java Tue Apr 12 07:14:07 2011
@@ -100,4 +100,4 @@ public class MeasureThroughput {
ps_min.close();
ps_hour.close();
}
-};
\ No newline at end of file
+};
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/MergedLogSource.java Tue Apr 12 07:14:07 2011
@@ -53,10 +53,11 @@ import java.util.Iterator;
import java.util.Collections;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class MergedLogSource implements LogSource {
- private static final Logger LOG = Logger.getLogger(MergedLogSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MergedLogSource.class);
private Vector<LogSource> sources = null;
private long starttime = 0;
private long endtime = 0;
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/RandomAccessFileReader.java Tue Apr 12 07:14:07 2011
@@ -28,10 +28,11 @@ import java.io.DataInputStream;
import java.io.ByteArrayInputStream;
import java.io.DataInput;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RandomAccessFileReader extends Reader implements DataInput {
- private static final Logger LOG = Logger.getLogger(RandomAccessFileReader.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RandomAccessFileReader.class);
private RandomAccessFile file;
private byte[] buffer;
private int buffersize;
@@ -324,4 +325,4 @@ public class RandomAccessFileReader exte
f.seek(pos2);
System.out.println(f.readLine());
}
-};
\ No newline at end of file
+};
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TransactionEntry.java Tue Apr 12 07:14:07 2011
@@ -56,4 +56,4 @@ public class TransactionEntry extends Lo
}
public Type getType() { return LogEntry.Type.TXN; }
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/TxnLogSource.java Tue Apr 12 07:14:07 2011
@@ -52,10 +52,11 @@ import java.io.FileNotFoundException;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class TxnLogSource implements LogSource {
- private static final Logger LOG = Logger.getLogger(TxnLogSource.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TxnLogSource.class);
private LogSkipList skiplist = null;
private static final int skipN = 10000;
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/FileLoader.java Tue Apr 12 07:14:07 2011
@@ -57,4 +57,4 @@ public class FileLoader extends JsonServ
return JSONValue.toJSONString(o);
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Fs.java Tue Apr 12 07:14:07 2011
@@ -66,4 +66,4 @@ public class Fs extends JsonServlet
}
return JSONValue.toJSONString(filelist);
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/GraphData.java Tue Apr 12 07:14:07 2011
@@ -34,11 +34,12 @@ import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.apache.zookeeper.graph.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class GraphData extends JsonServlet
{
- private static final Logger LOG = Logger.getLogger(GraphData.class);
+ private static final Logger LOG = LoggerFactory.getLogger(GraphData.class);
private static final int DEFAULT_PERIOD = 1000;
private LogSource source = null;
@@ -81,4 +82,4 @@ public class GraphData extends JsonServl
source.iterator(starttime, endtime, fo) : source.iterator(starttime, endtime);
return new JsonGenerator(iterator).toString();
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/NumEvents.java Tue Apr 12 07:14:07 2011
@@ -34,12 +34,13 @@ import java.util.regex.Pattern;
import java.util.regex.Matcher;
import org.apache.zookeeper.graph.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class NumEvents extends JsonServlet
{
- private static final Logger LOG = Logger.getLogger(NumEvents.class);
+ private static final Logger LOG = LoggerFactory.getLogger(NumEvents.class);
private static final int DEFAULT_PERIOD = 1000;
private LogSource source = null;
Modified: zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java (original)
+++ zookeeper/trunk/src/contrib/loggraph/src/java/org/apache/zookeeper/graph/servlets/Throughput.java Tue Apr 12 07:14:07 2011
@@ -27,7 +27,8 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import org.apache.zookeeper.graph.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
Modified: zookeeper/trunk/src/contrib/rest/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/ivy.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/rest/ivy.xml Tue Apr 12 07:14:07 2011
@@ -31,6 +31,9 @@
</configurations>
<dependencies>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
<dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
<dependency org="asm" name="asm" rev="3.1" />
Modified: zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/RestMain.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.io.IOException;
import java.net.URISyntaxException;
import java.net.URL;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.jersey.cfg.Credentials;
import org.apache.zookeeper.server.jersey.cfg.Endpoint;
import org.apache.zookeeper.server.jersey.cfg.RestCfg;
@@ -39,7 +40,7 @@ import com.sun.jersey.spi.container.serv
*/
public class RestMain {
- private static Logger LOG = Logger.getLogger(RestMain.class);
+ private static Logger LOG = LoggerFactory.getLogger(RestMain.class);
private GrizzlyWebServer gws;
private RestCfg cfg;
Modified: zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/ZooKeeperService.java Tue Apr 12 07:14:07 2011
@@ -26,7 +26,8 @@ import java.util.Timer;
import java.util.TimerTask;
import java.util.TreeSet;
-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.ZooKeeper;
@@ -39,7 +40,7 @@ import org.apache.zookeeper.server.jerse
*/
public class ZooKeeperService {
- private static Logger LOG = Logger.getLogger(ZooKeeperService.class);
+ private static Logger LOG = LoggerFactory.getLogger(ZooKeeperService.class);
/** Map base uri to ZooKeeper host:port parameters */
private static Map<String, Endpoint> contextMap = new HashMap<String, Endpoint>();
Modified: zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/java/org/apache/zookeeper/server/jersey/resources/SessionsResource.java Tue Apr 12 07:14:07 2011
@@ -38,7 +38,8 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.jersey.ZooKeeperService;
import org.apache.zookeeper.server.jersey.jaxb.ZError;
import org.apache.zookeeper.server.jersey.jaxb.ZSession;
@@ -48,7 +49,7 @@ import com.sun.jersey.api.json.JSONWithP
@Path("sessions/v1/{session: .*}")
public class SessionsResource {
- private static Logger LOG = Logger.getLogger(SessionsResource.class);
+ private static Logger LOG = LoggerFactory.getLogger(SessionsResource.class);
private String contextPath;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/Base.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.io.ByteArrayInputStream;
import junit.framework.TestCase;
-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;
@@ -39,7 +40,7 @@ import com.sun.jersey.api.client.WebReso
*
*/
public class Base extends TestCase {
- protected static final Logger LOG = Logger.getLogger(Base.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(Base.class);
protected static final String CONTEXT_PATH = "/zk";
protected static final int GRIZZLY_PORT = 10104;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/CreateTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.Collection;
import javax.ws.rs.core.MediaType;
-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.data.Stat;
@@ -44,7 +45,7 @@ import com.sun.jersey.api.client.WebReso
*/
@RunWith(Parameterized.class)
public class CreateTest extends Base {
- protected static final Logger LOG = Logger.getLogger(CreateTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(CreateTest.class);
private String accept;
private String path;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/DeleteTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.Collection;
import javax.ws.rs.core.MediaType;
-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;
@@ -43,7 +44,7 @@ import com.sun.jersey.api.client.ClientR
*/
@RunWith(Parameterized.class)
public class DeleteTest extends Base {
- protected static final Logger LOG = Logger.getLogger(DeleteTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(DeleteTest.class);
private String zpath;
private ClientResponse.Status expectedStatus;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/ExistsTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.Collection;
import javax.ws.rs.core.MediaType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -38,7 +39,7 @@ import com.sun.jersey.api.client.ClientR
*/
@RunWith(Parameterized.class)
public class ExistsTest extends Base {
- protected static final Logger LOG = Logger.getLogger(ExistsTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(ExistsTest.class);
private String path;
private ClientResponse.Status expectedStatus;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetChildrenTest.java Tue Apr 12 07:14:07 2011
@@ -25,7 +25,8 @@ import java.util.List;
import javax.ws.rs.core.MediaType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.server.jersey.jaxb.ZChildren;
@@ -44,7 +45,7 @@ import com.sun.jersey.api.client.ClientR
*/
@RunWith(Parameterized.class)
public class GetChildrenTest extends Base {
- protected static final Logger LOG = Logger.getLogger(GetChildrenTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(GetChildrenTest.class);
private String accept;
private String path;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/GetTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.Collection;
import javax.ws.rs.core.MediaType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.jersey.jaxb.ZStat;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -39,7 +40,7 @@ import com.sun.jersey.api.client.ClientR
*/
@RunWith(Parameterized.class)
public class GetTest extends Base {
- protected static final Logger LOG = Logger.getLogger(GetTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(GetTest.class);
private String accept;
private String path;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/RootTest.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.util.Arrays;
import javax.ws.rs.core.MediaType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.jersey.jaxb.ZPath;
import org.junit.Test;
@@ -37,7 +38,7 @@ import com.sun.jersey.api.client.WebReso
*
*/
public class RootTest extends Base {
- protected static final Logger LOG = Logger.getLogger(RootTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(RootTest.class);
@Test
public void testCreate() throws Exception {
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SessionTest.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.io.IOException;
import javax.ws.rs.core.MediaType;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat;
@@ -36,7 +37,7 @@ import com.sun.jersey.api.client.WebReso
import com.sun.jersey.api.client.WebResource.Builder;
public class SessionTest extends Base {
- protected static final Logger LOG = Logger.getLogger(SessionTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(SessionTest.class);
private ZSession createSession() {
return createSession("30");
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/SetTest.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.util.Collection;
import javax.ws.rs.core.MediaType;
-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;
@@ -46,7 +47,7 @@ import com.sun.jersey.api.client.WebReso
*/
@RunWith(Parameterized.class)
public class SetTest extends Base {
- protected static final Logger LOG = Logger.getLogger(SetTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(SetTest.class);
private String accept;
private String path;
Modified: zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java (original)
+++ zookeeper/trunk/src/contrib/rest/src/test/org/apache/zookeeper/server/jersey/WadlTest.java Tue Apr 12 07:14:07 2011
@@ -18,7 +18,8 @@
package org.apache.zookeeper.server.jersey;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.junit.Test;
import com.sun.jersey.api.client.WebResource;
@@ -30,7 +31,7 @@ import com.sun.jersey.core.header.MediaT
*
*/
public class WadlTest extends Base {
- protected static final Logger LOG = Logger.getLogger(WadlTest.class);
+ protected static final Logger LOG = LoggerFactory.getLogger(WadlTest.class);
@Test
public void testApplicationWadl() {
Modified: zookeeper/trunk/src/contrib/zooinspector/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/ivy.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/ivy.xml (original)
+++ zookeeper/trunk/src/contrib/zooinspector/ivy.xml Tue Apr 12 07:14:07 2011
@@ -32,6 +32,9 @@
</configurations>
<dependencies>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+
<dependency org="log4j" name="log4j" rev="1.2.15" transitive="false"/>
<dependency org="junit" name="junit" rev="4.7" conf="test->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
Modified: zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java (original)
+++ zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/logger/LoggerFactory.java Tue Apr 12 07:14:07 2011
@@ -17,20 +17,18 @@
*/
package org.apache.zookeeper.inspector.logger;
-import org.apache.log4j.Logger;
-
/**
* Provides a {@link Logger} for use across the entire application
*
*/
public class LoggerFactory
{
- private static final Logger logger = Logger.getLogger("org.apache.zookeeper.inspector"); //$NON-NLS-1$
+ private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger("org.apache.zookeeper.inspector"); //$NON-NLS-1$
/**
* @return {@link Logger} for ZooInspector
*/
- public static Logger getLogger()
+ public static org.slf4j.Logger getLogger()
{
return logger;
}
Modified: zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java (original)
+++ zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorNodeTreeManager.java Tue Apr 12 07:14:07 2011
@@ -1,43 +1,43 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.zookeeper.inspector.manager;
-
-/**
- * A Manager for all interactions between the application and the node tree in a
- * Zookeeper instance
- */
-public interface ZooInspectorNodeTreeManager extends
- ZooInspectorReadOnlyManager {
-
- /**
- * @param parent
- * - the parent node path for the node to add
- * @param nodeName
- * - the name of the new node
- * @return true if the node was successfully created
- */
- public abstract boolean createNode(String parent, String nodeName);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return true if the node was successfully deleted
- */
- public abstract boolean deleteNode(String nodePath);
-
-}
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.zookeeper.inspector.manager;
+
+/**
+ * A Manager for all interactions between the application and the node tree in a
+ * Zookeeper instance
+ */
+public interface ZooInspectorNodeTreeManager extends
+ ZooInspectorReadOnlyManager {
+
+ /**
+ * @param parent
+ * - the parent node path for the node to add
+ * @param nodeName
+ * - the name of the new node
+ * @return true if the node was successfully created
+ */
+ public abstract boolean createNode(String parent, String nodeName);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return true if the node was successfully deleted
+ */
+ public abstract boolean deleteNode(String nodePath);
+
+}
Modified: zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java (original)
+++ zookeeper/trunk/src/contrib/zooinspector/src/java/org/apache/zookeeper/inspector/manager/ZooInspectorReadOnlyManager.java Tue Apr 12 07:14:07 2011
@@ -1,99 +1,99 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.zookeeper.inspector.manager;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * A Manager for all read only interactions between the application and a node
- * in a Zookeeper instance
- */
-public interface ZooInspectorReadOnlyManager {
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return the data for the node
- */
- public abstract String getData(String nodePath);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return the metaData for the node
- */
- public abstract Map<String, String> getNodeMeta(String nodePath);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return the ACLs set on the node
- */
- public abstract List<Map<String, String>> getACLs(String nodePath);
-
- /**
- * @return the metaData for the current session
- */
- public abstract Map<String, String> getSessionMeta();
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return true if the node has children
- */
- public abstract boolean hasChildren(String nodePath);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return the index of the node within its siblings
- */
- public abstract int getNodeIndex(String nodePath);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return the number of children of the node
- */
- public abstract int getNumChildren(String nodePath);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @param childIndex
- * - the index to the node in the list of node children
- * @return the path to the node for the child of the nodePath at childIndex
- */
- public abstract String getNodeChild(String nodePath, int childIndex);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return true if the node allows children nodes
- */
- public abstract boolean isAllowsChildren(String nodePath);
-
- /**
- * @param nodePath
- * - the path to the node to delete
- * @return a {@link List} of the children of the node
- */
- public abstract List<String> getChildren(String nodePath);
-
-}
\ No newline at end of file
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.zookeeper.inspector.manager;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * A Manager for all read only interactions between the application and a node
+ * in a Zookeeper instance
+ */
+public interface ZooInspectorReadOnlyManager {
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return the data for the node
+ */
+ public abstract String getData(String nodePath);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return the metaData for the node
+ */
+ public abstract Map<String, String> getNodeMeta(String nodePath);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return the ACLs set on the node
+ */
+ public abstract List<Map<String, String>> getACLs(String nodePath);
+
+ /**
+ * @return the metaData for the current session
+ */
+ public abstract Map<String, String> getSessionMeta();
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return true if the node has children
+ */
+ public abstract boolean hasChildren(String nodePath);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return the index of the node within its siblings
+ */
+ public abstract int getNodeIndex(String nodePath);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return the number of children of the node
+ */
+ public abstract int getNumChildren(String nodePath);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @param childIndex
+ * - the index to the node in the list of node children
+ * @return the path to the node for the child of the nodePath at childIndex
+ */
+ public abstract String getNodeChild(String nodePath, int childIndex);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return true if the node allows children nodes
+ */
+ public abstract boolean isAllowsChildren(String nodePath);
+
+ /**
+ * @param nodePath
+ * - the path to the node to delete
+ * @return a {@link List} of the children of the node
+ */
+ public abstract List<String> getChildren(String nodePath);
+
+}
Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/bookkeeperStarted.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/bookkeeperStarted.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/bookkeeperStarted.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/bookkeeperStarted.xml Tue Apr 12 07:14:07 2011
@@ -88,7 +88,7 @@
<para><computeroutput>
java -cp .:./zookeeper-<version>-bookkeeper.jar:./zookeeper-<version>.jar\
- :../log4j/apache-log4j-1.2.15/log4j-1.2.15.jar -Dlog4j.configuration=log4j.properties\
+ :lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar -Dlog4j.configuration=log4j.properties\
org.apache.bookkeeper.proto.BookieServer 3181 127.0.0.1:2181 /path_to_log_device/\
/path_to_ledger_device/
</computeroutput></para>
Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperAdmin.xml Tue Apr 12 07:14:07 2011
@@ -198,7 +198,7 @@ server.3=zoo3:2888:3888</programlisting>
<para>If your configuration file is set up, you can start a
ZooKeeper server:</para>
- <para><computeroutput>$ java -cp zookeeper.jar:lib/log4j-1.2.15.jar:conf \
+ <para><computeroutput>$ java -cp zookeeper.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar:conf \
org.apache.zookeeper.server.quorum.QuorumPeerMain zoo.cfg
</computeroutput></para>
@@ -224,7 +224,7 @@ server.3=zoo3:2888:3888</programlisting>
<para>In Java, you can run the following command to execute
simple operations:</para>
- <para><computeroutput>$ java -cp zookeeper.jar:src/java/lib/log4j-1.2.15.jar:conf:src/java/lib/jline-0.9.94.jar \
+ <para><computeroutput>$ java -cp zookeeper.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar:conf:src/java/lib/jline-0.9.94.jar \
org.apache.zookeeper.ZooKeeperMain -server 127.0.0.1:2181</computeroutput></para>
</listitem>
@@ -480,7 +480,7 @@ server.3=zoo3:2888:3888</programlisting>
can be run as a cron job on the ZooKeeper server machines to
clean up the logs daily.</para>
- <programlisting> java -cp zookeeper.jar:log4j.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></programlisting>
+ <programlisting> java -cp zookeeper.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.15.jar:conf org.apache.zookeeper.server.PurgeTxnLog <dataDir> <snapDir> -n <count></programlisting>
</section>
Modified: zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperInternals.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperInternals.xml?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperInternals.xml (original)
+++ zookeeper/trunk/src/docs/src/documentation/content/xdocs/zookeeperInternals.xml Tue Apr 12 07:14:07 2011
@@ -396,28 +396,35 @@ hierarchy of groups.
<section id="sc_logging">
<title>Logging</title>
-
<para>
-ZooKeeper uses
-<ulink url="http://logging.apache.org/log4j">log4j</ulink>
-version 1.2 as its logging infrastructure. For information on configuring log4j for
+Zookeeper uses
+<ulink url="http://www.slf4j.org/index.html">slf4j</ulink> as an abstraction layer for logging.
+<ulink url="http://logging.apache.org/log4j">log4j</ulink> in version 1.2 is chosen as the final logging implementation for now.
+For better embedding support, it is planned in the future to leave the decision of choosing the final logging implementation to the end user.
+Therefore, always use the slf4j api to write log statements in the code, but configure log4j for how to log at runtime.
+Note that slf4j has no FATAL level, former messages at FATAL level have been moved to ERROR level.
+For information on configuring log4j for
ZooKeeper, see the <ulink url="zookeeperAdmin.html#sc_logging">Logging</ulink> section
of the <ulink url="zookeeperAdmin.html">ZooKeeper Administrator's Guide.</ulink>
+
</para>
<section id="sc_developerGuidelines"><title>Developer Guidelines</title>
-<para>Please follow these guidelines when submitting code. Patch reviewers will look for the following:</para>
+<para>Please follow the
+<ulink url="http://www.slf4j.org/manual.html">slf4j manual</ulink> when creating log statements within code.
+Also read the
+<ulink url="http://www.slf4j.org/faq.html#logging_performance">FAQ on performance</ulink>
+, when creating log statements. Patch reviewers will look for the following:</para>
<section id="sc_rightLevel"><title>Logging at the Right Level</title>
<para>
-There are <ulink url="http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/Level.html#FATAL">6 levels of logging in log4j</ulink>.
+There are several levels of logging in slf4j.
It's important to pick the right one. In order of higher to lower severity:</para>
<orderedlist>
- <listitem><para> FATAL level designates very severe error events that will presumably lead the application to abort</para></listitem>
<listitem><para>ERROR level designates error events that might still allow the application to continue running.</para></listitem>
<listitem><para>WARN level designates potentially harmful situations.</para></listitem>
<listitem><para>INFO level designates informational messages that highlight the progress of the application at coarse-grained level.</para></listitem>
- <listitem><para>EBUG Level designates fine-grained informational events that are most useful to debug an application.</para></listitem>
+ <listitem><para>DEBUG Level designates fine-grained informational events that are most useful to debug an application.</para></listitem>
<listitem><para>TRACE Level designates finer-grained informational events than the DEBUG.</para></listitem>
</orderedlist>
@@ -428,35 +435,31 @@ severity and higher (more severe) are ou
</section>
-<section id="sc_log4jIdioms"><title>Use of Standard log4j Idioms</title>
+<section id="sc_slf4jIdioms"><title>Use of Standard slf4j Idioms</title>
<para><emphasis>Static Message Logging</emphasis></para>
<programlisting>
LOG.debug("process completed successfully!");
</programlisting>
-<para>However when creating a message from a number of components (string
-concatenation), the log call should be wrapped with a "isXEnabled()" call. this
-eliminates the string concatenation overhead when debug level logging is not enabled.
+<para>
+However when creating parameterized messages are required, use formatting anchors.
</para>
<programlisting>
-if (LOG.isDebugEnabled()) {
- LOG.debug("got " + count + " messages in " + time + " minutes");
-}
+LOG.debug("got {} messages in {} minutes",new Object[]{count,time});
</programlisting>
+
<para><emphasis>Naming</emphasis></para>
<para>
-Loggers should be named after the class in which they are used. (See the
-<ulink url="http://logging.apache.org/log4j/1.2/faq.html#2.4">log4j faq</ulink>
-for reasons why this is a good idea.)
+Loggers should be named after the class in which they are used.
</para>
<programlisting>
public class Foo {
- private static final Logger LOG = Logger.getLogger(Foo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(Foo.class);
....
public Foo() {
LOG.info("constructing Foo");
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java Tue Apr 12 07:14:07 2011
@@ -33,7 +33,8 @@ import java.util.concurrent.LinkedBlocki
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.AsyncCallback.ACLCallback;
import org.apache.zookeeper.AsyncCallback.Children2Callback;
import org.apache.zookeeper.AsyncCallback.ChildrenCallback;
@@ -72,7 +73,7 @@ import org.apache.zookeeper.server.ZooTr
*
*/
public class ClientCnxn {
- private static final Logger LOG = Logger.getLogger(ClientCnxn.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClientCnxn.class);
/** This controls whether automatic watch resetting is enabled.
* Clients automatically reset watches during session reconnect, this
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocket.java Tue Apr 12 07:14:07 2011
@@ -26,7 +26,8 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.jute.BinaryInputArchive;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ClientCnxn.Packet;
import org.apache.zookeeper.proto.ConnectResponse;
import org.apache.zookeeper.server.ByteBufferInputStream;
@@ -40,7 +41,7 @@ import org.apache.zookeeper.server.ByteB
*
*/
abstract class ClientCnxnSocket {
- private static final Logger LOG = Logger.getLogger(ClientCnxnSocket.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ClientCnxnSocket.class);
protected boolean initialized;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxnSocketNIO.java Tue Apr 12 07:14:07 2011
@@ -29,14 +29,15 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.ClientCnxn.EndOfStreamException;
import org.apache.zookeeper.ClientCnxn.Packet;
import org.apache.zookeeper.ZooDefs.OpCode;
import org.apache.zookeeper.ZooKeeper.States;
public class ClientCnxnSocketNIO extends ClientCnxnSocket {
- private static final Logger LOG = Logger
+ private static final Logger LOG = LoggerFactory
.getLogger(ClientCnxnSocketNIO.class);
private final Selector selector = Selector.open();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/CreateMode.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/CreateMode.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/CreateMode.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/CreateMode.java Tue Apr 12 07:14:07 2011
@@ -17,7 +17,8 @@
*/
package org.apache.zookeeper;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
/***
@@ -44,7 +45,7 @@ public enum CreateMode {
*/
EPHEMERAL_SEQUENTIAL (3, true, true);
- private static final Logger LOG = Logger.getLogger(CreateMode.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CreateMode.class);
private boolean ephemeral;
private boolean sequential;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/Environment.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provide insight into the runtime environment.
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ServerAdminClient.java Tue Apr 12 07:14:07 2011
@@ -26,12 +26,13 @@ import java.net.Socket;
import java.nio.ByteBuffer;
import java.util.StringTokenizer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.server.ZooTrace;
public class ServerAdminClient {
- private static final Logger LOG = Logger.getLogger(ServerAdminClient.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ServerAdminClient.class);
private static long getMask(String mask) {
long retv = 0;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java Tue Apr 12 07:14:07 2011
@@ -29,7 +29,8 @@ import java.util.List;
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.AsyncCallback.ACLCallback;
import org.apache.zookeeper.AsyncCallback.Children2Callback;
import org.apache.zookeeper.AsyncCallback.ChildrenCallback;
@@ -111,7 +112,7 @@ public class ZooKeeper {
public static final String ZOOKEEPER_CLIENT_CNXN_SOCKET = "zookeeper.clientCnxnSocket";
static {
- LOG = Logger.getLogger(ZooKeeper.class);
+ LOG = LoggerFactory.getLogger(ZooKeeper.class);
Environment.logEnv("Client environment:", LOG);
}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeperMain.java Tue Apr 12 07:14:07 2011
@@ -33,7 +33,8 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.AsyncCallback.DataCallback;
import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.data.ACL;
@@ -45,7 +46,7 @@ import org.apache.zookeeper.data.Stat;
*
*/
public class ZooKeeperMain {
- private static final Logger LOG = Logger.getLogger(ZooKeeperMain.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ZooKeeperMain.class);
protected static final Map<String,String> commandMap = new HashMap<String,String>( );
protected MyCommandOptions cl = new MyCommandOptions();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/client/StaticHostProvider.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/client/StaticHostProvider.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/client/StaticHostProvider.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/client/StaticHostProvider.java Tue Apr 12 07:14:07 2011
@@ -26,15 +26,18 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Most simple HostProvider, resolves only on instantiation.
*
*/
public final class StaticHostProvider implements HostProvider {
- private static final Logger LOG = Logger
+ private static final Logger LOG = LoggerFactory
.getLogger(StaticHostProvider.class);
+
private final List<InetSocketAddress> serverAddresses = new ArrayList<InetSocketAddress>(
5);
@@ -95,4 +98,4 @@ public final class StaticHostProvider im
public void onConnected() {
lastIndex = currentIndex;
}
-}
\ No newline at end of file
+}
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/common/PathTrie.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/common/PathTrie.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/common/PathTrie.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/common/PathTrie.java Tue Apr 12 07:14:07 2011
@@ -22,7 +22,8 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* a class that implements prefix matching for
@@ -43,7 +44,7 @@ public class PathTrie {
/**
* the logger for this class
*/
- private static final Logger LOG = Logger.getLogger(PathTrie.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PathTrie.class);
/**
* the root node of PathTrie
@@ -233,7 +234,7 @@ public class PathTrie {
return;
}
parent = parent.getChild(part);
- LOG.info(parent);
+ LOG.info("{}",parent);
}
TrieNode realParent = parent.getParent();
realParent.deleteChild(part);
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/jmx/MBeanRegistry.java Tue Apr 12 07:14:07 2011
@@ -27,7 +27,8 @@ import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class provides a unified interface for registering/unregistering of
@@ -36,7 +37,7 @@ import org.apache.log4j.Logger;
* will be stored in the zookeeper data tree instance as a virtual data tree.
*/
public class MBeanRegistry {
- private static final Logger LOG = Logger.getLogger(MBeanRegistry.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MBeanRegistry.class);
private static MBeanRegistry instance=new MBeanRegistry();
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ConnectionBean.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ConnectionBean.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ConnectionBean.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/ConnectionBean.java Tue Apr 12 07:14:07 2011
@@ -26,7 +26,8 @@ import java.util.Date;
import javax.management.ObjectName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.jmx.MBeanRegistry;
import org.apache.zookeeper.jmx.ZKMBeanInfo;
@@ -34,7 +35,7 @@ import org.apache.zookeeper.jmx.ZKMBeanI
* Implementation of connection MBean interface.
*/
public class ConnectionBean implements ConnectionMXBean, ZKMBeanInfo {
- private static final Logger LOG = Logger.getLogger(ConnectionBean.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ConnectionBean.class);
private final ServerCnxn connection;
private final Stats stats;
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/DataTree.java Tue Apr 12 07:14:07 2011
@@ -33,7 +33,8 @@ import org.apache.jute.Index;
import org.apache.jute.InputArchive;
import org.apache.jute.OutputArchive;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Quotas;
import org.apache.zookeeper.StatsTrack;
@@ -67,7 +68,7 @@ import org.apache.zookeeper.txn.TxnHeade
* through the hashtable. The tree is traversed only when serializing to disk.
*/
public class DataTree {
- private static final Logger LOG = Logger.getLogger(DataTree.class);
+ private static final Logger LOG = LoggerFactory.getLogger(DataTree.class);
/**
* This hashtable provides a fast lookup to the datanodes. The tree is the
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java?rev=1091314&r1=1091313&r2=1091314&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java (original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/server/FinalRequestProcessor.java Tue Apr 12 07:14:07 2011
@@ -23,7 +23,8 @@ import java.nio.ByteBuffer;
import java.util.List;
import org.apache.jute.Record;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.KeeperException.Code;
@@ -63,7 +64,7 @@ import org.apache.zookeeper.txn.ErrorTxn
* outstandingRequests member of ZooKeeperServer.
*/
public class FinalRequestProcessor implements RequestProcessor {
- private static final Logger LOG = Logger.getLogger(FinalRequestProcessor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(FinalRequestProcessor.class);
ZooKeeperServer zks;
@@ -155,7 +156,7 @@ public class FinalRequestProcessor imple
}
if (LOG.isDebugEnabled()) {
- LOG.debug(request);
+ LOG.debug("{}",request);
}
switch (request.type) {
case OpCode.ping: {