From 2de5c3226d9f9bbe836eae4236dfb2b173783c2e Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Tue, 18 Jan 2011 18:08:45 +0100
Subject: [PATCH] using logback instead of log4j

---
 scm-webapp/pom.xml                            | 24 ++++++----
 .../src/main/resources/log4j.properties       | 46 -------------------
 scm-webapp/src/main/resources/logback.xml     | 28 +++++++++++
 3 files changed, 43 insertions(+), 55 deletions(-)
 delete mode 100644 scm-webapp/src/main/resources/log4j.properties
 create mode 100644 scm-webapp/src/main/resources/logback.xml

diff --git a/scm-webapp/pom.xml b/scm-webapp/pom.xml
index fc1f86e751..48dcded173 100644
--- a/scm-webapp/pom.xml
+++ b/scm-webapp/pom.xml
@@ -84,15 +84,9 @@
     </dependency>
 
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>${slf4j.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.27</version>
     </dependency>
 
     <dependency>
@@ -131,6 +125,12 @@
       <groupId>org.sonatype.aether</groupId>
       <artifactId>aether-connector-wagon</artifactId>
       <version>${aether.version}</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>xbean-reflect</artifactId>
+          <groupId>org.apache.xbean</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -166,6 +166,12 @@
       <artifactId>scm-test</artifactId>
       <version>1.0-M7-SNAPSHOT</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-simple</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
   </dependencies>
diff --git a/scm-webapp/src/main/resources/log4j.properties b/scm-webapp/src/main/resources/log4j.properties
deleted file mode 100644
index 031665ca5d..0000000000
--- a/scm-webapp/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (c) 2010, Sebastian Sdorra
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-# 3. Neither the name of SCM-Manager; nor the names of its
-#    contributors may be used to endorse or promote products derived from this
-#    software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# http://bitbucket.org/sdorra/scm-manager
-#
-#
-
-log4j.rootLogger=WARN, SoniaConsole
-
-log4j.category.sonia.scm = DEBUG
-log4j.category.sonia.scm.util.ServiceUtil = WARN
-
-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
diff --git a/scm-webapp/src/main/resources/logback.xml b/scm-webapp/src/main/resources/logback.xml
new file mode 100644
index 0000000000..a16642c7dd
--- /dev/null
+++ b/scm-webapp/src/main/resources/logback.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : logback.xml
+    Created on : January 18, 2011, 5:46 PM
+    Author     : sdorra
+    Description:
+        Purpose of the document follows.
+-->
+
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <!-- encoders are  by default assigned the type
+         ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <logger name="sonia.scm" level="DEBUG" />
+  <logger name="sonia.scm.util.ServiceUtil" level="WARN" />
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
+</configuration>
\ No newline at end of file