diff options
Diffstat (limited to 'dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/database')
20 files changed, 61 insertions, 40 deletions
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)); |