From 047e1fe1d644455a995f99a4209f209b5fc37aab Mon Sep 17 00:00:00 2001
From: markus <markus@markus-MSI>
Date: Sun, 30 Nov 2014 20:21:52 +0100
Subject: [PATCH] added log4j 2 configuration

---
 main/core/src/main/resources/log4j.xml  | 48 -------------------------
 main/core/src/main/resources/log4j2.xml | 30 ++++++++++++++++
 2 files changed, 30 insertions(+), 48 deletions(-)
 delete mode 100644 main/core/src/main/resources/log4j.xml
 create mode 100644 main/core/src/main/resources/log4j2.xml

diff --git a/main/core/src/main/resources/log4j.xml b/main/core/src/main/resources/log4j.xml
deleted file mode 100644
index 9583a53e2..000000000
--- a/main/core/src/main/resources/log4j.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Copyright (c) 2014 Sebastian Stenzel
-  This file is licensed under the terms of the MIT license.
-  See the LICENSE.txt file for more info.
-  
-  Contributors:
-      Sebastian Stenzel - initial API and implementation
--->
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
-	<appender name="console" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.out"/> 
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%16d %-5p [%c{1}:%L] %m%n" />
-		</layout>
-		<filter class="org.apache.log4j.varia.LevelRangeFilter">
-            <param name="LevelMin" value="debug" />
-            <param name="LevelMax" value="info" />
-        </filter>
-	</appender>
-	
-	<appender name="stderr" class="org.apache.log4j.ConsoleAppender">
-		<param name="Target" value="System.err"/>
-		<param name="threshold" value="warn" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%16d %-5p [%c{1}:%L] %m%n" />
-		</layout>
-	</appender>
-
-	<appender name="fileAppender" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="/tmp/webdav.log" />
-		<param name="Append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%16d %-5p [%c{1}:%L] %m%n" />
-		</layout>
-	</appender>
-
-	<root>
-		<priority value="DEBUG" />
-		<appender-ref ref="console" />
-		<appender-ref ref="stderr" />
-	</root>
-	
-	
-</log4j:configuration>
diff --git a/main/core/src/main/resources/log4j2.xml b/main/core/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..249d75093
--- /dev/null
+++ b/main/core/src/main/resources/log4j2.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright (c) 2014 Markus Kreusch
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Markus Kreusch - switched to log4j 2
+-->
+<Configuration status="WARN">
+
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
+		</Console>
+		<Console name="StdErr" target="SYSTEM_ERR">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+		</Console>
+	</Appenders>
+	
+	<Loggers>
+		<Root level="DEBUG">
+			<AppenderRef ref="Console" />
+			<AppenderRef ref="StdErr" />
+		</Root>
+	</Loggers>
+	
+</Configuration>