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

---
 util/pom.xml                                           | 10 +++++++---
 .../java/de/muehlencord/shared/util/StringUtil.java    |  8 +++++---
 .../java/de/muehlencord/shared/util/file/FileUtil.java |  5 +++--
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/util/pom.xml b/util/pom.xml
index af489a2..e03459c 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -26,9 +26,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <type>jar</type>
         </dependency>
     </dependencies>
     <name>shared-util</name>
diff --git a/util/src/main/java/de/muehlencord/shared/util/StringUtil.java b/util/src/main/java/de/muehlencord/shared/util/StringUtil.java
index eab326a..d1c274a 100644
--- a/util/src/main/java/de/muehlencord/shared/util/StringUtil.java
+++ b/util/src/main/java/de/muehlencord/shared/util/StringUtil.java
@@ -2,7 +2,9 @@ package de.muehlencord.shared.util;
 
 import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  *
@@ -11,7 +13,7 @@ import org.apache.log4j.Logger;
 public abstract class StringUtil {
 
     /** the logging object */
-    private static final Logger LOGGER = Logger.getLogger(StringUtil.class);
+    private static final Logger LOGGER = LogManager.getLogger(StringUtil.class);
 
     /**
      * returns the given string in ISO-8859-1 encoding
@@ -26,7 +28,7 @@ public abstract class StringUtil {
             byte[] b = input.getBytes("UTF-8");
             return new String(b, "ISO-8859-1");
         } catch (UnsupportedEncodingException ex) {
-            LOGGER.debug(getStackTraceString(ex));
+            LOGGER.log (Level.DEBUG, ex.toString(), ex); 
             throw new StringEncodingException("Cannot convert string from UTF-8 to ISO-8859-1. Reason: " + ex.getMessage(), ex);
         }
     }
diff --git a/util/src/main/java/de/muehlencord/shared/util/file/FileUtil.java b/util/src/main/java/de/muehlencord/shared/util/file/FileUtil.java
index db02a83..94d13c5 100644
--- a/util/src/main/java/de/muehlencord/shared/util/file/FileUtil.java
+++ b/util/src/main/java/de/muehlencord/shared/util/file/FileUtil.java
@@ -19,7 +19,8 @@ import java.text.Format;
 import static java.util.Arrays.asList;
 import java.util.LinkedList;
 import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  *
@@ -30,7 +31,7 @@ public abstract class FileUtil {
     /**
      * the logging object
      */
-    private static final Logger LOGGER = Logger.getLogger(FileUtil.class);
+    private static final Logger LOGGER = LogManager.getLogger(FileUtil.class);
 
     /**
      * returns a list of files found by the given regexp in the given folder