You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2011/07/12 12:36:05 UTC

svn commit: r1145532 - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-server/ bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ bookkeeper-server/src/test/resources/ conf/ hedwig-cl...

Author: fpj
Date: Tue Jul 12 10:36:05 2011
New Revision: 1145532

URL: http://svn.apache.org/viewvc?rev=1145532&view=rev
Log:
BOOKKEEPER-30: Test are too noisy (ivank via fpj)


Added:
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/resources/
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/resources/log4j.properties
    zookeeper/bookkeeper/trunk/hedwig-server/src/test/resources/
    zookeeper/bookkeeper/trunk/hedwig-server/src/test/resources/log4j.properties
Removed:
    zookeeper/bookkeeper/trunk/conf/log4j.properties
    zookeeper/bookkeeper/trunk/hedwig-client/src/main/resources/log4j.properties
Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCacheTest.java
    zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java
    zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControl.java
    zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControlDaemon.java
    zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
    zookeeper/bookkeeper/trunk/pom.xml

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue Jul 12 10:36:05 2011
@@ -17,3 +17,6 @@ BUGFIXES:
   BOOKEEPER-22: Exception in LedgerCache causes addEntry request to fail (fpj via fpj)
 
   BOOKEEPER-5: Issue with Netty in BookKeeper (fpj and ivank via fpj)
+
+  BOOKKEEPER-30: Test are too noisy (ivank via fpj)
+

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Tue Jul 12 10:36:05 2011
@@ -52,6 +52,7 @@
       <plugin>
 	<groupId>org.apache.maven.plugins</groupId>
 	<artifactId>maven-surefire-plugin</artifactId>
+	<version>2.9</version>
 	<configuration>
 	  <forkMode>pertest</forkMode>
 	</configuration>

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/Bookie.java Tue Jul 12 10:36:05 2011
@@ -122,12 +122,12 @@ public class Bookie extends Thread {
                 try {
                     ledgerCache.flushLedger(true);
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    LOG.error("Exception flushing Ledger", e);
                 }
                 try {
                     entryLogger.flush();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    LOG.error("Exception flushing entry logger", e);
                 }
                 lastLogMark.rollLog();
             }

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileInfo.java Tue Jul 12 10:36:05 2011
@@ -27,11 +27,15 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
+import org.apache.log4j.Logger;
+
 /**
  * This is the file handle for a ledger's index file that maps entry ids to location.
  * It is used by LedgerCache.
  */
 class FileInfo {
+    static Logger LOG = Logger.getLogger(FileInfo.class);
+
     private FileChannel fc;
     private final File lf;
     /**
@@ -108,7 +112,7 @@ class FileInfo {
             try {
                 fc.close();
             } catch (IOException e) {
-                e.printStackTrace();
+                LOG.error("Error closing file channel", e);
             }
         }
     }

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BaseTestCase.java Tue Jul 12 10:36:05 2011
@@ -119,7 +119,7 @@ public abstract class BaseTestCase exten
         zkc.close();
         bkc = new BookKeeper("127.0.0.1");
         } catch(Exception e) {
-            e.printStackTrace();
+            LOG.error("Error setting up", e);
             throw e;
         }
     }

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java Tue Jul 12 10:36:05 2011
@@ -36,11 +36,14 @@ import org.junit.Before;
 import org.junit.Test;
 
 import junit.framework.TestCase;
+import org.apache.log4j.Logger;
 
 /**
  * Tests writing to concurrent ledgers
  */
 public class ConcurrentLedgerTest extends TestCase {
+    static Logger LOG = Logger.getLogger(ConcurrentLedgerTest.class);
+
     Bookie bookie;
     File txnDir, ledgerDir;
     int recvTimeout = 10000;
@@ -87,7 +90,7 @@ public class ConcurrentLedgerTest extend
             recursiveDelete(txnDir);
             recursiveDelete(ledgerDir);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            LOG.error("Error tearing down", e);
         }
     }
 
@@ -114,17 +117,17 @@ public class ConcurrentLedgerTest extend
         if (System.getProperty("totalwrites") != null) {
             totalwrites = Integer.parseInt(System.getProperty("totalwrites"));
         }
-        System.out.println("Running up to " + iterations + " iterations");
-        System.out.println("Total writes = " + totalwrites);
+        LOG.info("Running up to " + iterations + " iterations");
+        LOG.info("Total writes = " + totalwrites);
         int ledgers;
         for(ledgers = 1; ledgers <= iterations; ledgers += iterationStep) {
             long duration = doWrites(ledgers, size, totalwrites);
-            System.out.println(totalwrites + " on " + ledgers + " took " + duration + " ms");
+            LOG.info(totalwrites + " on " + ledgers + " took " + duration + " ms");
         }
-        System.out.println("ledgers " + ledgers);
+        LOG.info("ledgers " + ledgers);
         for(ledgers = 1; ledgers <= iterations; ledgers += iterationStep) {
             long duration = doReads(ledgers, size, totalwrites);
-            System.out.println(ledgers + " read " + duration + " ms");
+            LOG.info(ledgers + " read " + duration + " ms");
         }
     }
 

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCacheTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCacheTest.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCacheTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/LedgerCacheTest.java Tue Jul 12 10:36:05 2011
@@ -90,7 +90,7 @@ public class LedgerCacheTest extends Tes
             recursiveDelete(txnDir);
             recursiveDelete(ledgerDir);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            LOG.error("Error tearing down", e);
         }
     }
     

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/resources/log4j.properties?rev=1145532&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/resources/log4j.properties (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/resources/log4j.properties Tue Jul 12 10:36:05 2011
@@ -0,0 +1,72 @@
+#
+# 
+# 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.
+# 
+#
+
+#
+# Bookkeeper Logging Configuration
+#
+
+# Format is "<default threshold> (, <appender>)+
+
+# DEFAULT: console appender only
+log4j.rootLogger=OFF, CONSOLE
+
+# Example with rolling log file
+#log4j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE
+
+# Example with rolling log file and tracing
+#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+
+#
+# Log INFO level and above messages to the console
+#
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+#    Log DEBUG level and above messages to a log file
+log4j.appender.ROLLINGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ROLLINGFILE.Threshold=DEBUG
+log4j.appender.ROLLINGFILE.File=bookkeeper-server.log
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+# Max log file size of 10MB
+log4j.appender.ROLLINGFILE.MaxFileSize=10MB
+# uncomment the next line to limit number of backup files
+#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
+
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+
+
+#
+# Add TRACEFILE to rootLogger to get log file output
+#    Log DEBUG level and above messages to a log file
+log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
+log4j.appender.TRACEFILE.Threshold=TRACE
+log4j.appender.TRACEFILE.File=bookkeeper_trace.log
+
+log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
+### Notice we are including log4j's NDC here (%x)
+log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n

Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/ResponseHandler.java Tue Jul 12 10:36:05 2011
@@ -358,7 +358,7 @@ public class ResponseHandler extends Sim
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) {
-        e.getCause().printStackTrace();
+        logger.error("Exception caught on client channel", e.getCause());
         e.getChannel().close();
     }
 

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControl.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControl.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControl.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControl.java Tue Jul 12 10:36:05 2011
@@ -31,8 +31,11 @@ import org.apache.hedwig.server.netty.Pu
 import java.net.ConnectException;
 import java.io.File;
 import java.io.IOException;
+import org.apache.log4j.Logger;
 
 public class ServerControl {
+    static Logger LOG = Logger.getLogger(ServerControl.class);
+
     public class TestException extends Exception {
 	public TestException(String str) {
 	    super(str);
@@ -192,7 +195,6 @@ public class ServerControl {
 	}
 	String journal = createTempDirectory("-bookie-" + port + "-journal");
 	String ledger = createTempDirectory("-bookie-" + port + "-ledger");
-	System.out.println(journal);
 	BookKeeperServer bookie = new BookKeeperServer(port, zookeeperServer, journal, ledger);
 	return bookie;
     }
@@ -216,8 +218,8 @@ public class ServerControl {
 	TestServer hw2 = control.startPubSubServer(12350, "foobar", zk);
 	TestServer hw3 = control.startPubSubServer(12351, "foobar", zk);
 	TestServer hw4 = control.startPubSubServer(12352, "barfoo", zk);
-	System.out.println("Started " + zk.getAddress());
-	System.out.println("Sleeping for 10 seconds");
+	LOG.info("Started " + zk.getAddress());
+	LOG.info("Sleeping for 10 seconds");
 	Thread.sleep(10000);
 	bk3.kill();
 	bk2.kill();

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControlDaemon.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControlDaemon.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControlDaemon.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/ServerControlDaemon.java Tue Jul 12 10:36:05 2011
@@ -76,7 +76,7 @@ public class ServerControlDaemon {
 	    try {
 		t.kill();
 	    } catch (Exception e) {
-		e.printStackTrace();
+		LOG.error("Error killing server", e);
 		// do nothing, should be killed, we won't use it again anyhow
 	    }
 	}
@@ -131,7 +131,7 @@ public class ServerControlDaemon {
 		    ctx.getChannel().write("ERR Bad Command\n");
 		}
 	    } catch (Exception ex) {
-		ex.printStackTrace();
+		LOG.error("Error handling message", ex);
 		ctx.getChannel().write("ERR " + ex.toString() + "\n");
 	    }
 	}

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java Tue Jul 12 10:36:05 2011
@@ -33,6 +33,7 @@ import org.junit.Test;
 
 import org.apache.hedwig.util.FileUtils;
 import org.apache.hedwig.zookeeper.ZooKeeperTestBase;
+import org.apache.log4j.Logger;
 
 /**
  * This is a base class for any tests that require a BookKeeper client/server
@@ -40,6 +41,7 @@ import org.apache.hedwig.zookeeper.ZooKe
  * 
  */
 public class BookKeeperTestBase extends ZooKeeperTestBase {
+    private static Logger logger = Logger.getLogger(BookKeeperTestBase.class);
 
     // BookKeeper Server variables
     private List<BookieServer> bookiesList;
@@ -84,9 +86,9 @@ public class BookKeeperTestBase extends 
             zk.create("/ledgers", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
             zk.create("/ledgers/available", new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
         } catch (KeeperException e) {
-            e.printStackTrace();
+            LOG.error("Error setting up", e);
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            LOG.error("Error setting up", e);
         }
 
         // Create Bookie Servers
@@ -116,7 +118,7 @@ public class BookKeeperTestBase extends 
                 bs.shutdown();
             }
         } catch (InterruptedException e) {
-            e.printStackTrace();
+            LOG.error("Error tearing down", e);
         }
         // Close the BookKeeper client
         bk.halt();

Added: zookeeper/bookkeeper/trunk/hedwig-server/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/resources/log4j.properties?rev=1145532&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/resources/log4j.properties (added)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/resources/log4j.properties Tue Jul 12 10:36:05 2011
@@ -0,0 +1,72 @@
+#
+# 
+# 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.
+# 
+#
+
+#
+# Hedwig Logging Configuration
+#
+
+# Format is "<default threshold> (, <appender>)+
+
+# DEFAULT: console appender only
+log4j.rootLogger=OFF, CONSOLE
+
+# Example with rolling log file
+#log4j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE
+
+# Example with rolling log file and tracing
+#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+
+#
+# Log INFO level and above messages to the console
+#
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+#    Log DEBUG level and above messages to a log file
+log4j.appender.ROLLINGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ROLLINGFILE.Threshold=DEBUG
+log4j.appender.ROLLINGFILE.File=hedwig-server.log
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+# Max log file size of 10MB
+log4j.appender.ROLLINGFILE.MaxFileSize=10MB
+# uncomment the next line to limit number of backup files
+#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
+
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+
+
+#
+# Add TRACEFILE to rootLogger to get log file output
+#    Log DEBUG level and above messages to a log file
+log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
+log4j.appender.TRACEFILE.Threshold=TRACE
+log4j.appender.TRACEFILE.File=hedwig_trace.log
+
+log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
+### Notice we are including log4j's NDC here (%x)
+log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n

Modified: zookeeper/bookkeeper/trunk/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/pom.xml?rev=1145532&r1=1145531&r2=1145532&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/pom.xml Tue Jul 12 10:36:05 2011
@@ -32,6 +32,10 @@
   	<module>bookkeeper-server</module>
   	<module>bookkeeper-benchmark</module>
   </modules>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+  </properties>
   <repositories>
   </repositories>
   <url>http://zookeeper.apache.org/bookkeeper</url>
@@ -45,6 +49,11 @@
           <target>1.6</target>
         </configuration>
       </plugin>
+      <plugin>
+      	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-surefire-plugin</artifactId>
+	<version>2.9</version>
+      </plugin>
     </plugins>
   </build>
   <reporting>