From ecb96edda80668893e95068aceed80e2a80a7de2 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Sat, 16 Oct 2010 11:20:54 +0200
Subject: [PATCH] use log4j for logging configuration

---
 scm-webapp/pom.xml                            |  8 ++++++-
 .../main/java/sonia/scm/ContextListener.java  | 24 -------------------
 .../src/main/resources/log4j.properties       | 17 +++++++++++++
 3 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 scm-webapp/src/main/resources/log4j.properties

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index 51b18334b2..c1c2b501e1 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -87,10 +87,16 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
+      <artifactId>slf4j-log4j12</artifactId>
       <version>1.6.1</version>
     </dependency>
 
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.16</version>
+    </dependency>
+
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache-core</artifactId>
diff --git a/scm-webapp/src/main/java/sonia/scm/ContextListener.java b/scm-webapp/src/main/java/sonia/scm/ContextListener.java
index 7ef59639ef..3076f0710c 100644
--- a/scm-webapp/src/main/java/sonia/scm/ContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ContextListener.java
@@ -25,10 +25,6 @@ import sonia.scm.web.ScmWebPluginContext;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-import java.util.logging.Logger;
 
 import javax.servlet.ServletContextEvent;
 
@@ -67,8 +63,6 @@ public class ContextListener extends GuiceServletContextListener
   @Override
   public void contextInitialized(ServletContextEvent servletContextEvent)
   {
-
-    enableDebugLogging();
     webPluginContext =
       new ScmWebPluginContext(servletContextEvent.getServletContext());
 
@@ -112,24 +106,6 @@ public class ContextListener extends GuiceServletContextListener
     return injector;
   }
 
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  private void enableDebugLogging()
-  {
-    Logger logger = LogManager.getLogManager().getLogger("");
-
-    logger.setLevel(Level.FINEST);
-
-    ConsoleHandler handler = new ConsoleHandler();
-
-    handler.setLevel(Level.FINEST);
-    logger.addHandler(handler);
-  }
-
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
diff --git a/scm-webapp/src/main/resources/log4j.properties b/scm-webapp/src/main/resources/log4j.properties
new file mode 100644
index 0000000000..a75932a830
--- /dev/null
+++ b/scm-webapp/src/main/resources/log4j.properties
@@ -0,0 +1,17 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+log4j.rootLogger=WARN, SoniaConsole
+
+log4j.category.sonia.scm = DEBUG
+
+log4j.appender.SoniaConsole=org.apache.log4j.ConsoleAppender
+log4j.appender.SoniaConsole.layout=org.apache.log4j.PatternLayout
+log4j.appender.SoniaConsole.layout.ConversionPattern=%d %-5p [%c] - %m%n
+
+log4j.appender.SoniaFile=org.apache.log4j.RollingFileAppender
+log4j.appender.SoniaFile.layout=org.apache.log4j.PatternLayout
+log4j.appender.SoniaFile.layout.ConversionPattern=%d %-5p [%c] - %m%n
+log4j.appender.SoniaFile.maxFileSize=10MB
+log4j.appender.SoniaFile.MaxBackupIndex=20
+log4j.appender.SoniaFile.File=/sonia/scm/logs/scm.log