[SERVER] Update log4j because of the CVE-2021-44228 security flaw

51 files changed, 180 insertions, 107 deletions

diff --git a/dozentenmodulserver/README.md b/dozentenmodulserver/README.md
index 7905d5e2..4f1ede74 100644
--- a/dozentenmodulserver/README.md
+++ b/dozentenmodulserver/README.md
@@ -58,7 +58,7 @@ If logging configurations other than the defaults are required, the configuratio
 The custom configuration file is specified by execute the bwLehrpool-Server application with the following command line call where `<CONFIG>` is an absolute path to the custom configuration file and `<APP>` is a path to the built bwLehrpool-Server application (Java archive file):
 
 ```shell
-java -Dlog4j.configuration=file:<CONFIG> -jar <APP>
+java -Dlog4j.configurationFile=<CONFIG> -jar <APP>
 ```
 
 
diff --git a/dozentenmodulserver/pom.xml b/dozentenmodulserver/pom.xml
index cbe6e34f..815dc7de 100644
--- a/dozentenmodulserver/pom.xml
+++ b/dozentenmodulserver/pom.xml
@@ -254,6 +254,18 @@
 			<version>2.3</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>[2.0,3.0)</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>[2.0,3.0)</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 </project>
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
index f41fe666..b63c0fa0 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/App.java
@@ -9,9 +9,10 @@ import java.util.Set;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.BasicConfigurator;
-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.apache.logging.log4j.core.config.DefaultConfiguration;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.Updater;
@@ -39,7 +40,7 @@ import org.openslx.util.QuickTimer;
 
 public class App {
 
-	private static Logger LOGGER = Logger.getLogger(App.class);
+	private static Logger LOGGER = LogManager.getLogger(App.class);
 
 	private static final String NAME = "bwLehrpool-Server";
 
@@ -49,8 +50,8 @@ public class App {
 			KeyManagementException
 	{
 		// setup basic logging appender to log output on console if no external appender (log4j.properties) is configured
-		if (LogManager.getRootLogger().getAllAppenders() == null) {
-			BasicConfigurator.configure();
+		if (org.apache.logging.log4j.core.Logger.class.cast(LogManager.getRootLogger()).getAppenders().isEmpty()) {
+			Configurator.initialize(new DefaultConfiguration());
 		}
 
 		AppUtil.logHeader(LOGGER, App.NAME, App.class.getPackage().getImplementationVersion());
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/StorageUseCheck.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/StorageUseCheck.java
index 2a5f1b1a..b430db09 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/StorageUseCheck.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/StorageUseCheck.java
@@ -6,7 +6,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.util.Configuration;
 import org.openslx.bwlp.sat.util.FileSystem;
 import org.openslx.util.QuickTimer.Task;
@@ -19,7 +20,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class StorageUseCheck extends Task {
 
-	private static final Logger LOGGER = Logger.getLogger(StorageUseCheck.class);
+	private static final Logger LOGGER = LogManager.getLogger(StorageUseCheck.class);
 
 	private final String uuid = UUID.randomUUID().toString();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
index 76565f37..79bba7df 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Database.java
@@ -10,12 +10,13 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

 import java.util.concurrent.ConcurrentLinkedQueue;

 

-import org.apache.log4j.Logger;

+import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

 import org.openslx.bwlp.sat.util.Configuration;

 

 public class Database {

 

-	private static final Logger LOGGER = Logger.getLogger(Database.class);

+	private static final Logger LOGGER = LogManager.getLogger(Database.class);

 	/**

 	 * Pool of available connections.

 	 */

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlConnection.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlConnection.java
index d27cd949..71b6e603 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlConnection.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/MysqlConnection.java
@@ -5,11 +5,12 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class MysqlConnection implements AutoCloseable {
 
-	private static final Logger LOGGER = Logger.getLogger(MysqlConnection.class);
+	private static final Logger LOGGER = LogManager.getLogger(MysqlConnection.class);
 
 	private static final int CONNECTION_TIMEOUT_MS = 5 * 60 * 1000;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Updater.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Updater.java
index df75e64c..bcbc39c2 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Updater.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/Updater.java
@@ -3,11 +3,12 @@ package org.openslx.bwlp.sat.database;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Updater {
 
-	private static final Logger LOGGER = Logger.getLogger(Updater.class);
+	private static final Logger LOGGER = LogManager.getLogger(Updater.class);
 
 	public static void updateDatabase() throws SQLException {
 		addLocationPrivateField();
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
index 84df8685..fe887dff 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbConfiguration.java
@@ -15,7 +15,8 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 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.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -28,7 +29,7 @@ import org.openslx.util.Json;
 
 public class DbConfiguration {
 
-	private static final Logger LOGGER = Logger.getLogger(DbConfiguration.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbConfiguration.class);
 
 	private static final String KEY_CERTIFICATE = "certstore";
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
index 9c39078c..6064e800 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImage.java
@@ -1,7 +1,9 @@
 package org.openslx.bwlp.sat.database.mappers;
 
 import com.google.gson.JsonObject;
-import org.apache.log4j.Logger;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.RuntimeConfig;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
@@ -28,7 +30,7 @@ import java.util.*;
 
 public class DbImage {
 
-	private static final Logger LOGGER = Logger.getLogger(DbImage.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbImage.class);
 
 	/**
 	 * Get list of all images visible to the given user, optionally filtered by
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImageBlock.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImageBlock.java
index 56685c12..68e5259c 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImageBlock.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImageBlock.java
@@ -7,7 +7,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -19,7 +20,7 @@ import org.openslx.filetransfer.util.FileChunk;
 
 public class DbImageBlock {
 
-	private static final Logger LOGGER = Logger.getLogger(DbImageBlock.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbImageBlock.class);
 
 	private static AsyncThread asyncBlockUpdate = null;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
index 76a8ad3f..a505db9d 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbImagePermissions.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -14,7 +15,7 @@ import org.openslx.bwlp.thrift.iface.ImagePermissions;
 
 public class DbImagePermissions {
 
-	private static final Logger LOGGER = Logger.getLogger(DbImagePermissions.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbImagePermissions.class);
 
 	/**
 	 * Build an instance of {@link ImagePermissions} by reading the given
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
index 9689a857..7fde3310 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecture.java
@@ -9,7 +9,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -39,7 +40,7 @@ import com.google.gson.JsonParseException;
 
 public class DbLecture {
 
-	private static final Logger LOGGER = Logger.getLogger(DbLecture.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLecture.class);
 
 	static {
 		Json.registerThriftClass(NetRule.class);
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java
index 2f21af99..8232f9ae 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureFilter.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -15,7 +16,7 @@ import org.openslx.util.Util;
 
 public class DbLectureFilter {
 
-	private static final Logger LOGGER = Logger.getLogger(DbLectureFilter.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLectureFilter.class);
 	
 	private static MysqlStatement getLdapFilterStatement(MysqlConnection connection, String lectureId) throws SQLException {
 		MysqlStatement stmt = connection.prepareStatement(
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
index 0e132712..6c808a90 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetshare.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -15,7 +16,7 @@ import org.openslx.util.Util;
 
 public class DbLectureNetshare {
 
-	private static final Logger LOGGER = Logger.getLogger(DbLectureNetshare.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLectureNetshare.class);
 
 	public static void writeForLecture(MysqlConnection connection, String lectureId, List<NetShare> shares)
 			throws SQLException {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetworkRules.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetworkRules.java
index 61b0c50d..e922b057 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetworkRules.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLectureNetworkRules.java
@@ -6,7 +6,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -16,7 +17,7 @@ import org.openslx.util.Json;
 
 public class DbLectureNetworkRules {
 	
-	private static final Logger LOGGER = Logger.getLogger(DbLectureNetworkRules.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLectureNetworkRules.class);
 
 	public static void writeLectureNetworkExceptions(MysqlConnection connection, String lectureId,
 			List<Integer> ruleIds) throws SQLException {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecturePermissions.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecturePermissions.java
index 7955308e..f2786319 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecturePermissions.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLecturePermissions.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -14,7 +15,7 @@ import org.openslx.bwlp.thrift.iface.LecturePermissions;
 
 public class DbLecturePermissions {
 
-	private static final Logger LOGGER = Logger.getLogger(DbLecturePermissions.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLecturePermissions.class);
 
 	/**
 	 * Build an instance of {@link LecturePermissions} by reading the given
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java
index 2f6ba4bb..f723948e 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLocation.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -15,7 +16,7 @@ import org.openslx.util.Util;
 
 public class DbLocation {
 
-	private static final Logger LOGGER = Logger.getLogger(DbLocation.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLocation.class);
 
 	public static final List<Location> getLocations() throws SQLException {
 		List<Location> list = new ArrayList<>();
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLog.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLog.java
index 69cd5a3d..27240582 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLog.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbLog.java
@@ -2,7 +2,8 @@ package org.openslx.bwlp.sat.database.mappers;
 
 import java.sql.SQLException;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -13,7 +14,7 @@ import org.openslx.util.Util;
 
 public class DbLog {
 
-	private static final Logger LOGGER = Logger.getLogger(DbLog.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbLog.class);
 
 	/**
 	 * Add entry to logging table.
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbMailQueue.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbMailQueue.java
index 0b3df621..479392dc 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbMailQueue.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbMailQueue.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -13,7 +14,7 @@ import org.openslx.bwlp.sat.mail.Mail;
 
 public class DbMailQueue {
 
-	private static final Logger LOGGER = Logger.getLogger(DbMailQueue.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbMailQueue.class);
 
 	public static void queue(Mail mail) throws SQLException {
 		try (MysqlConnection connection = Database.getConnection()) {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java
index f208f2c2..7261b189 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOrganization.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -14,7 +15,7 @@ import org.openslx.bwlp.thrift.iface.Organization;
 
 public class DbOrganization {
 
-	private static final Logger LOGGER = Logger.getLogger(DbOrganization.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbOrganization.class);
 
 	/**
 	 * Store the given list of organizations (coming from the master server) to
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOsVirt.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOsVirt.java
index 9c083efe..c505f703 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOsVirt.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbOsVirt.java
@@ -8,7 +8,8 @@ import java.util.List;
 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;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -17,7 +18,7 @@ import org.openslx.bwlp.thrift.iface.Virtualizer;
 
 public class DbOsVirt {
 
-	private static final Logger LOGGER = Logger.getLogger(DbOsVirt.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbOsVirt.class);
 
 	public static void storeOsList(List<OperatingSystem> list) throws SQLException {
 		try (MysqlConnection connection = Database.getConnection()) {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbRunScript.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbRunScript.java
index 20df4299..b242eb62 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbRunScript.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbRunScript.java
@@ -5,7 +5,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
@@ -14,7 +15,7 @@ import org.openslx.util.Util;
 
 public class DbRunScript {
 
-	private static final Logger LOGGER = Logger.getLogger(DbRunScript.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbRunScript.class);
 	
 	public static void writeLectureRunScripts(MysqlConnection connection, String lectureId, List<Integer> scripts)
 			throws SQLException {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbSoftwareTag.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbSoftwareTag.java
index 44e50090..cf4cf01e 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbSoftwareTag.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbSoftwareTag.java
@@ -5,14 +5,15 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
 import org.openslx.bwlp.sat.database.MysqlStatement;
 
 public class DbSoftwareTag {
 
-	private static final Logger LOGGER = Logger.getLogger(DbSoftwareTag.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbSoftwareTag.class);
 
 	/**
 	 * Get list of software installed in a certain image version.
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
index 7e31a04a..852695d3 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database/mappers/DbUser.java
@@ -7,7 +7,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.RuntimeConfig;
 import org.openslx.bwlp.sat.database.Database;
 import org.openslx.bwlp.sat.database.MysqlConnection;
@@ -36,7 +37,7 @@ public class DbUser {
 		}
 	}
 
-	private static final Logger LOGGER = Logger.getLogger(DbUser.class);
+	private static final Logger LOGGER = LogManager.getLogger(DbUser.class);
 
 	private static Map<String, User> userCache = new TimeoutHashMap<>(TimeUnit.MINUTES.toMillis(15));
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
index b1466b5c..85f459c9 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/FileServer.java
@@ -15,7 +15,8 @@ import java.util.concurrent.TimeUnit;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.models.LocalImageVersion;
 import org.openslx.bwlp.sat.util.Constants;
@@ -35,7 +36,7 @@ import org.openslx.util.PrioThreadFactory;
 
 public class FileServer implements IncomingEvent {
 
-	private static final Logger LOGGER = Logger.getLogger(FileServer.class);
+	private static final Logger LOGGER = LogManager.getLogger(FileServer.class);
 
 	/**
 	 * Listener for incoming unencrypted connections
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
index e29d2ac8..fe521691 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/IncomingDataTransfer.java
@@ -15,7 +15,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.RuntimeConfig;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbImageBlock;
@@ -44,7 +45,7 @@ import org.openslx.virtualization.disk.DiskImageException;
 
 public class IncomingDataTransfer extends IncomingTransferBase {
 
-	private static final Logger LOGGER = Logger.getLogger(IncomingDataTransfer.class);
+	private static final Logger LOGGER = LogManager.getLogger(IncomingDataTransfer.class);
 
 	private static final long MIN_FREE_SPACE_BYTES = FileChunk.CHUNK_SIZE * (2 + Constants.MAX_UPLOADS);
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
index 37510270..0cc0e6ae 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/OutgoingDataTransfer.java
@@ -6,7 +6,8 @@ import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.ExecutorService;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.sat.util.Configuration;
 import org.openslx.bwlp.thrift.iface.TInvalidTokenException;
@@ -17,7 +18,7 @@ import org.openslx.thrifthelper.ThriftManager;
 
 public class OutgoingDataTransfer extends OutgoingTransferBase {
 
-	private static final Logger LOGGER = Logger.getLogger(OutgoingDataTransfer.class);
+	private static final Logger LOGGER = LogManager.getLogger(OutgoingDataTransfer.class);
 
 	private final TransferInformation masterTransferInfo;
 	
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java
index cf3bddf2..e8bdc83a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/fileserv/SyncTransferHandler.java
@@ -11,7 +11,8 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbImageBlock;
@@ -41,7 +42,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class SyncTransferHandler {
 
-	private static final Logger LOGGER = Logger.getLogger(SyncTransferHandler.class);
+	private static final Logger LOGGER = LogManager.getLogger(SyncTransferHandler.class);
 
 	private static final GrowingThreadPoolExecutor transferPool = new GrowingThreadPoolExecutor(1,
 			Constants.MAX_MASTER_UPLOADS + Constants.MAX_MASTER_DOWNLOADS, 1, TimeUnit.MINUTES,
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java
index 68e4f641..cd11aff6 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailGenerator.java
@@ -9,7 +9,8 @@ import java.util.Locale;
 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;
 import org.openslx.bwlp.sat.database.mappers.DbConfiguration;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbImagePermissions;
@@ -33,7 +34,7 @@ import org.openslx.util.Util;
 
 public class MailGenerator {
 
-	private static final Logger LOGGER = Logger.getLogger(MailGenerator.class);
+	private static final Logger LOGGER = LogManager.getLogger(MailGenerator.class);
 
 	/**
 	 * Called when an image has been updated, and linked lectures will be moved
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java
index 799d9487..569cff44 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/MailQueue.java
@@ -13,7 +13,8 @@ import java.util.concurrent.TimeUnit;
 
 import javax.security.auth.login.LoginException;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbConfiguration;
 import org.openslx.bwlp.sat.database.mappers.DbMailQueue;
 import org.openslx.bwlp.sat.database.mappers.DbUser;
@@ -40,7 +41,7 @@ public class MailQueue {
 		public String serverName;
 	}
 
-	private static final Logger LOGGER = Logger.getLogger(MailQueue.class);
+	private static final Logger LOGGER = LogManager.getLogger(MailQueue.class);
 
 	private static final int BATCH_SIZE = 25;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java
index 51ad5b19..d7859f3c 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/mail/SmtpMailer.java
@@ -17,13 +17,14 @@ import org.apache.commons.net.smtp.AuthenticatingSMTPClient;
 import org.apache.commons.net.smtp.AuthenticatingSMTPClient.AUTH_METHOD;
 import org.apache.commons.net.smtp.SMTPReply;
 import org.apache.commons.net.smtp.SimpleSMTPHeader;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.util.Util;
 
 public class SmtpMailer {
 
 	// TODO Logging
-	private static final Logger LOGGER = Logger.getLogger(SmtpMailer.class);
+	private static final Logger LOGGER = LogManager.getLogger(SmtpMailer.class);
 
 	public enum EncryptionMode {
 		NONE,
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java
index c535dbb4..bd46b7f3 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java
@@ -6,7 +6,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTime;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbImage.DeleteState;
@@ -23,7 +24,7 @@ import org.openslx.util.Util;
  */
 public class DeleteOldImages implements Runnable {
 
-	private static final Logger LOGGER = Logger.getLogger(DeleteOldImages.class);
+	private static final Logger LOGGER = LogManager.getLogger(DeleteOldImages.class);
 
 	private static final DeleteOldImages instance = new DeleteOldImages();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java
index 9c70b699..c3a1da57 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldUsers.java
@@ -4,7 +4,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTime;
 import org.openslx.bwlp.sat.database.mappers.DbLog;
 import org.openslx.bwlp.sat.database.mappers.DbUser;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class DeleteOldUsers implements Runnable {
 
-	private static final Logger LOGGER = Logger.getLogger(DeleteOldUsers.class);
+	private static final Logger LOGGER = LogManager.getLogger(DeleteOldUsers.class);
 
 	private static final DeleteOldUsers instance = new DeleteOldUsers();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/ImageValidCheck.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/ImageValidCheck.java
index b544a708..9a1114ba 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/ImageValidCheck.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/ImageValidCheck.java
@@ -15,7 +15,8 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbImageBlock;
 import org.openslx.bwlp.sat.database.models.ImageVersionMeta;
@@ -64,7 +65,7 @@ public class ImageValidCheck implements Runnable {
 		REJECTED_BY_SCHEDULER,
 	}
 
-	private static final Logger LOGGER = Logger.getLogger(ImageValidCheck.class);
+	private static final Logger LOGGER = LogManager.getLogger(ImageValidCheck.class);
 	
 	private static final int MAX_CONCURRENT_CHECKS = 1;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/MailFlusher.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/MailFlusher.java
index 61a18ca1..8384db3a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/MailFlusher.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/MailFlusher.java
@@ -2,14 +2,15 @@ package org.openslx.bwlp.sat.maintenance;
 
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.mail.MailQueue;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
 public class MailFlusher implements Runnable {
 
-	private static final Logger LOGGER = Logger.getLogger(MailFlusher.class);
+	private static final Logger LOGGER = LogManager.getLogger(MailFlusher.class);
 
 	private static final MailFlusher instance = new MailFlusher();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/Maintenance.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/Maintenance.java
index e459852b..767c7531 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/Maintenance.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/Maintenance.java
@@ -5,11 +5,12 @@ import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 public class Maintenance extends Thread {
 
-	private static final Logger LOGGER = Logger.getLogger(Maintenance.class);
+	private static final Logger LOGGER = LogManager.getLogger(Maintenance.class);
 
 	private static Set<Maintenance> workers = new HashSet<>();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
index db1baa36..2bfb0508 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/SendExpireWarning.java
@@ -4,7 +4,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTime;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.database.mappers.DbLecture;
@@ -18,7 +19,7 @@ import org.openslx.util.Util;
 
 public class SendExpireWarning implements Runnable {
 
-	private static final Logger LOGGER = Logger.getLogger(SendExpireWarning.class);
+	private static final Logger LOGGER = LogManager.getLogger(SendExpireWarning.class);
 
 	private static final SendExpireWarning instance = new SendExpireWarning();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
index bfc75b0e..fd8cf3c1 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/BinaryListener.java
@@ -9,7 +9,8 @@ import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLServerSocketFactory;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.server.THsHaServer;
 import org.apache.thrift.server.TServer;
@@ -25,7 +26,7 @@ import org.openslx.bwlp.thrift.iface.SatelliteServer;
 import org.openslx.thrifthelper.TBinaryProtocolSafe;
 
 public class BinaryListener implements Runnable {
-	private static final Logger log = Logger.getLogger(BinaryListener.class);
+	private static final Logger log = LogManager.getLogger(BinaryListener.class);
 
 	private static final int MAX_MSG_LEN = 30 * 1000 * 1000;
 	private static final int MINWORKERTHREADS = 2;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
index 181baef5..8382390a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/ServerHandler.java
@@ -6,7 +6,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.sat.RuntimeConfig;
 import org.openslx.bwlp.sat.SupportedFeatures;
@@ -80,7 +81,7 @@ import org.openslx.util.Util;
 
 public class ServerHandler implements SatelliteServer.Iface {
 
-	private static final Logger LOGGER = Logger.getLogger(ServerHandler.class);
+	private static final Logger LOGGER = LogManager.getLogger(ServerHandler.class);
 
 	private static final FileServer fileServer = FileServer.instance();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
index ede5bdea..d4a98737 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/SessionManager.java
@@ -6,7 +6,8 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbUser;
 import org.openslx.bwlp.sat.permissions.User;
 import org.openslx.bwlp.sat.util.Formatter;
@@ -26,7 +27,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class SessionManager {
 
-	private static final Logger LOGGER = Logger.getLogger(SessionManager.class);
+	private static final Logger LOGGER = LogManager.getLogger(SessionManager.class);
 
 	private static class Entry {
 		private static final long SESSION_TIMEOUT = TimeUnit.DAYS.toMillis(1);
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java
index b4ca77f6..1efc72d4 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/CacheBase.java
@@ -1,6 +1,7 @@
 package org.openslx.bwlp.sat.thrift.cache;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 
 /**
@@ -12,7 +13,7 @@ import org.apache.thrift.TException;
  */
 public abstract class CacheBase<T> {
 
-	private static final Logger LOGGER = Logger.getLogger(CacheBase.class);
+	private static final Logger LOGGER = LogManager.getLogger(CacheBase.class);
 
 	private static final int TIMEOUT = 10 * 60 * 1000;
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
index 2f6bbdbc..f84ae3c2 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OperatingSystemList.java
@@ -3,7 +3,8 @@ package org.openslx.bwlp.sat.thrift.cache;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.mappers.DbOsVirt;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class OperatingSystemList extends CacheBase<List<OperatingSystem>> {
 
-	private static final Logger LOGGER = Logger.getLogger(OperatingSystemList.class);
+	private static final Logger LOGGER = LogManager.getLogger(OperatingSystemList.class);
 
 	private static final OperatingSystemList instance = new OperatingSystemList();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
index 3f144f15..9e8ccaf9 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/OrganizationList.java
@@ -3,7 +3,8 @@ package org.openslx.bwlp.sat.thrift.cache;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.mappers.DbOrganization;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class OrganizationList extends CacheBase<List<Organization>> {
 
-	private static final Logger LOGGER = Logger.getLogger(OrganizationList.class);
+	private static final Logger LOGGER = LogManager.getLogger(OrganizationList.class);
 
 	private static final OrganizationList instance = new OrganizationList();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java
index 28463e6b..72a29f63 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/thrift/cache/VirtualizerList.java
@@ -3,7 +3,8 @@ package org.openslx.bwlp.sat.thrift.cache;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TException;
 import org.apache.thrift.transport.TTransportException;
 import org.openslx.bwlp.sat.database.mappers.DbOsVirt;
@@ -18,7 +19,7 @@ import org.openslx.util.QuickTimer.Task;
  */
 public class VirtualizerList extends CacheBase<List<Virtualizer>> {
 
-	private static final Logger LOGGER = Logger.getLogger(VirtualizerList.class);
+	private static final Logger LOGGER = LogManager.getLogger(VirtualizerList.class);
 
 	private static final VirtualizerList instance = new VirtualizerList();
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
index 58134cfc..3842abee 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Configuration.java
@@ -10,14 +10,15 @@ import java.util.Properties;
 
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.openslx.util.Util;
 
 public class Configuration {
 
-	private static final Logger LOGGER = Logger.getLogger(Configuration.class);
+	private static final Logger LOGGER = LogManager.getLogger(Configuration.class);
 	private static final DateTimeFormatter subdirDate = DateTimeFormat.forPattern("yy-MM");
 
 	private static final String DEFAULT_WEBSERVER_BIND_ADDRESS_LOCAL = "127.0.0.1";
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Constants.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Constants.java
index a48faed1..ee1da84e 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Constants.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Constants.java
@@ -4,12 +4,13 @@ import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.filetransfer.util.FileChunk;
 
 public class Constants {
 
-	private static final Logger LOGGER = Logger.getLogger(Constants.class);
+	private static final Logger LOGGER = LogManager.getLogger(Constants.class);
 
 	public static final String INCOMPLETE_UPLOAD_SUFFIX = ".upload.partial";
 	public static final int MAX_UPLOADS;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
index dc0cec2d..69f6d6da 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/FileSystem.java
@@ -3,14 +3,15 @@ package org.openslx.bwlp.sat.util;
 import java.io.File;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.models.LocalImageVersion;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
 public class FileSystem {
 
-	private static final Logger LOGGER = Logger.getLogger(FileSystem.class);
+	private static final Logger LOGGER = LogManager.getLogger(FileSystem.class);
 
 	public static String getRelativePath(File absolutePath, File parentDir) {
 		String file;
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Identity.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Identity.java
index c288fcab..ed1505c1 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Identity.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/util/Identity.java
@@ -17,14 +17,15 @@ import javax.net.ssl.KeyManager;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbConfiguration;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
 
 public class Identity {
 
-	private static final Logger LOGGER = Logger.getLogger(Identity.class);
+	private static final Logger LOGGER = LogManager.getLogger(Identity.class);
 
 	private static final String ALIAS = "dozmod";
 
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java
index 3a6f39ad..380c27fa 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebRpc.java
@@ -21,7 +21,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 import javax.security.auth.login.LoginException;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.openslx.bwlp.sat.database.mappers.DbConfiguration;
 import org.openslx.bwlp.sat.database.mappers.DbImage;
 import org.openslx.bwlp.sat.mail.MailTemplate;
@@ -42,7 +43,7 @@ import fi.iki.elonen.NanoHTTPD.Response;
 
 public class WebRpc {
 
-	private static final Logger LOGGER = Logger.getLogger(WebRpc.class);
+	private static final Logger LOGGER = LogManager.getLogger(WebRpc.class);
 
 	public static Response handle(String uri, Map<String, String> params) {
 		if (uri.equals("mailtest")) {
diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
index 43e56137..088cf5b0 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/web/WebServer.java
@@ -16,7 +16,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPOutputStream;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.kamranzafar.jtar.TarEntry;
 import org.kamranzafar.jtar.TarHeader;
 import org.kamranzafar.jtar.TarOutputStream;
@@ -40,7 +41,7 @@ import fi.iki.elonen.NanoHTTPD;
 
 public class WebServer extends NanoHTTPD {
 
-	private static final Logger LOGGER = Logger.getLogger(WebServer.class);
+	private static final Logger LOGGER = LogManager.getLogger(WebServer.class);
 
 	private static final ThreadPoolExecutor tpe = new GrowingThreadPoolExecutor(1, 8, 1, TimeUnit.MINUTES,
 			new LinkedBlockingQueue<Runnable>(16));
diff --git a/dozentenmodulserver/src/main/properties/log4j2.properties b/dozentenmodulserver/src/main/properties/log4j2.properties
index 0973166a..563fe8df 100644
--- a/dozentenmodulserver/src/main/properties/log4j2.properties
+++ b/dozentenmodulserver/src/main/properties/log4j2.properties
@@ -1,9 +1,21 @@
+status=error
+name=log4j2PropertiesConfig
+
+#
 # root level logging configuration
-log4j.rootLogger=ALL, console
+#
+rootLogger.level=all
+rootLogger.appenderRefs=stdout
+rootLogger.appenderRef.stdout.ref=logToConsole
 
+#
 # configuration for console output
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=[%t] %-5p %F - %m%n
-log4j.appender.console.encoding=UTF-8
-log4j.appender.console.Threshold=INFO
+#
+appenders=console
+
+appender.console.type=Console
+appender.console.name=logToConsole
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%t] %-5p %F - %m%n
+appender.console.filter.threshold.type=ThresholdFilter
+appender.console.filter.threshold.level=info