From 1a8c60b6dbb8aec0f12d2e8b9c025bb01d87d9fc Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Fri, 10 Jul 2015 08:36:28 +0000
Subject: [PATCH] updated to log4j2

---
 jeeutil/pom.xml                                    | 12 +++++++-----
 .../shared/jeeutil/AuthenticationFilter.java       |  8 +++++---
 jeeutil/src/main/resources/log4j2.xml              | 14 ++++++++++++++
 3 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 jeeutil/src/main/resources/log4j2.xml

diff --git a/jeeutil/pom.xml b/jeeutil/pom.xml
index 859bfe0..f9236b7 100644
--- a/jeeutil/pom.xml
+++ b/jeeutil/pom.xml
@@ -21,11 +21,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <type>jar</type>
-            <scope>compile</scope>            
-        </dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency> 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+        </dependency>    
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java
index 1d0ea0e..9114753 100644
--- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java
+++ b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java
@@ -14,8 +14,10 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 
 /**
  *
@@ -23,7 +25,7 @@ import org.apache.log4j.Logger;
  */
 public class AuthenticationFilter implements Filter {
 
-    private final static Logger LOGGER = Logger.getLogger(AuthenticationFilter.class);
+    private final static Logger LOGGER = LogManager.getLogger(AuthenticationFilter.class);
     private final static String USER = AuthenticationFilter.class.getName() + "_user";
     private String loginPage;
     private String errorPage;
diff --git a/jeeutil/src/main/resources/log4j2.xml b/jeeutil/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..326f685
--- /dev/null
+++ b/jeeutil/src/main/resources/log4j2.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration>
+    <Appenders>
+        <Console name="STDOUT" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d %-5p [%t] %C{2} (%F:%L) - %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="org.apache.log4j.xml" level="info"/>
+        <Root level="debug">
+            <AppenderRef ref="STDOUT"/>
+        </Root>
+    </Loggers>
+</Configuration>
\ No newline at end of file