WIP: Re-applying log4j2 update

pom.xml

@@ -125,16 +125,22 @@
 			-->
 			<version>2.9.0</version>
 		</dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
-            <version>2.2.1.GA</version>
-        </dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
-		</dependency>
+    <dependency>
+        <groupId>org.jboss.resteasy</groupId>
+        <artifactId>resteasy-jaxrs</artifactId>
+        <version>2.2.1.GA</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <version>2.12.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.12.1</version>
+    </dependency>
 
 	</dependencies>
 </project>

src/main/java/com/redhat/sso/ninja/Backup.java

@@ -10,10 +10,11 @@
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Backup {
-  private static final Logger log = Logger.getLogger(Backup.class);
+  private static final Logger log=LogManager.getLogger(Backup.class);
   private static Timer t;
 
   public static void main(String[] asd){

src/main/java/com/redhat/sso/ninja/Config.java

@@ -16,7 +16,8 @@
 import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.map.JsonMappingException;
@@ -26,7 +27,7 @@
 import com.redhat.sso.ninja.utils.MapBuilder;
 
 public class Config {
-  private static final Logger log=Logger.getLogger(Config.class);
+  private static final Logger log=LogManager.getLogger(Config.class);
   public static final File STORAGE=new File("target/ninja-persistence", "config.json");
   private static Config instance;
   private List<Map<String,Object>> scripts=null;

src/main/java/com/redhat/sso/ninja/Database2.java

@@ -16,7 +16,8 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.annotate.JsonIgnore;
@@ -26,7 +27,7 @@
 import com.redhat.sso.ninja.utils.Json;
 
 public class Database2{
-  private static final Logger log=Logger.getLogger(Database2.class);
+  private static final Logger log=LogManager.getLogger(Database2.class);
   public static final String STORAGE="target/ninja-persistence/database2.json";
   public static final File STORAGE_AS_FILE=new File(STORAGE);
   public static Integer MAX_EVENT_ENTRIES=1000;

src/main/java/com/redhat/sso/ninja/GoogleDrive2.java

@@ -16,7 +16,8 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -25,7 +26,7 @@
 import com.redhat.sso.ninja.utils.DownloadFile;
 
 public class GoogleDrive2 {
-  private static Logger log=Logger.getLogger(GoogleDrive2.class);
+  private static Logger log=LogManager.getLogger(GoogleDrive2.class);
 
   public static final String DEFAULT_EXECUTABLE="/home/%s/drive_linux";
 //  public static final String DEFAULT_PULL_COMMAND=DEFAULT_EXECUTABLE+" pull -export xls -quiet=true --id %s"; //worked with 0.3.1

src/main/java/com/redhat/sso/ninja/Heartbeat2.java

@@ -30,7 +30,8 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.mortbay.log.Log;
 
 import com.google.common.collect.Lists;
@@ -46,7 +47,7 @@
 import com.redhat.sso.ninja.utils.Tuple;
 
 public class Heartbeat2 {
-  private static final Logger log = Logger.getLogger(Heartbeat2.class);
+  private static final Logger log=LogManager.getLogger(Heartbeat2.class);
   private static Timer t;
   private static Timer tRunOnce;
 //  private static final long delay=30000l;

src/main/java/com/redhat/sso/ninja/ManagementController.java

@@ -27,8 +27,9 @@
 import javax.ws.rs.core.Response;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 import org.codehaus.jackson.map.ObjectMapper;
@@ -45,7 +46,7 @@
 
 @Path("/")
 public class ManagementController {
-  private static final Logger log=Logger.getLogger(ManagementController.class);
+  private static final Logger log=LogManager.getLogger(ManagementController.class);
 
   public static void main(String[] asd) throws JsonGenerationException, JsonMappingException, IOException{
     System.out.println(java.sql.Date.valueOf(LocalDate.now()));

src/main/java/com/redhat/sso/ninja/TasksController.java

@@ -22,7 +22,8 @@
 import javax.ws.rs.core.Response;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.map.JsonMappingException;
 
@@ -33,7 +34,7 @@
 
 @Path("/")
 public class TasksController {
-  private static final Logger log= Logger.getLogger(TasksController.class);
+  private static final Logger log=LogManager.getLogger(TasksController.class);
 
 
 

src/main/java/com/redhat/sso/ninja/TrelloSync.java

@@ -11,7 +11,8 @@
 import java.util.regex.Pattern;
 
 import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.jayway.restassured.specification.RequestSpecification;
 import com.redhat.sso.ninja.utils.MapBuilder;
@@ -27,7 +28,7 @@
  */
 
 public class TrelloSync extends ScriptBase{
-  private static final Logger log=Logger.getLogger(TrelloSync.class);
+  private static final Logger log=LogManager.getLogger(TrelloSync.class);
 
   /*
    * 

src/main/java/com/redhat/sso/ninja/utils/DownloadFile.java

@@ -8,10 +8,11 @@
 import java.nio.file.attribute.PosixFilePermission;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class DownloadFile{
-  private Logger log=Logger.getLogger(this.getClass());
+  private Logger log=LogManager.getLogger(this.getClass());
 
   public String get(String remoteLocation, String localDestination, PosixFilePermission... permissions) throws IOException{
     return get(remoteLocation, new File(localDestination), permissions);

src/main/java/com/redhat/sso/ninja/utils/Http.java

@@ -8,12 +8,11 @@
 import java.net.URL;
 import java.util.Map;
 import java.util.Map.Entry;
-
-import org.apache.log4j.Logger;
-
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Http{
-	private static final Logger log = Logger.getLogger(Http.class);
+	private static final Logger log=LogManager.getLogger(Http.class);
 
 	public static class Response{
 		public Response(int responseCode, String response){

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{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Logger name="com.redhat.sso.ninja" level="debug" />
+        <Root level="info">
+            <AppenderRef ref="STDOUT"/>
+        </Root>
+    </Loggers>
+</Configuration>