diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/mappers')
7 files changed, 21 insertions, 14 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbImage.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbImage.java index 6fddf76..1f6189d 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbImage.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbImage.java @@ -6,7 +6,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.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.bwlp.thrift.iface.ImagePublishData; @@ -31,7 +32,7 @@ import org.openslx.util.Util; public class DbImage { - private static final Logger LOGGER = Logger.getLogger( DbImage.class ); + private static final Logger LOGGER = LogManager.getLogger( DbImage.class ); private static final ImagePermissions emptyPermissions = new ImagePermissions(); diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbImageBlock.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbImageBlock.java index 155f522..74d2832 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbImageBlock.java +++ b/src/main/java/org/openslx/imagemaster/db/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.filetransfer.FileRange; import org.openslx.filetransfer.util.ChunkStatus; import org.openslx.filetransfer.util.FileChunk; @@ -18,7 +19,7 @@ import org.openslx.imagemaster.db.MysqlStatement; 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/src/main/java/org/openslx/imagemaster/db/mappers/DbOrganization.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbOrganization.java index cf1a20a..4c094fe 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbOrganization.java +++ b/src/main/java/org/openslx/imagemaster/db/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.thrift.iface.Organization; import org.openslx.imagemaster.db.Database; import org.openslx.imagemaster.db.MysqlConnection; @@ -17,7 +18,7 @@ import org.openslx.imagemaster.db.MysqlStatement; */ public class DbOrganization { - private static final Logger LOGGER = Logger.getLogger( DbOrganization.class ); + private static final Logger LOGGER = LogManager.getLogger( DbOrganization.class ); private static final String organizationBaseSql = "SELECT" + " o.organizationid, o.name, o.authmethod, o.publickey" diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbOsVirt.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbOsVirt.java index ee8a39a..259b75a 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbOsVirt.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbOsVirt.java @@ -7,7 +7,8 @@ import java.util.HashMap; 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.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.bwlp.thrift.iface.Virtualizer; import org.openslx.imagemaster.db.Database; @@ -18,7 +19,7 @@ import org.openslx.imagemaster.util.Util; public class DbOsVirt { - private static final Logger LOGGER = Logger.getLogger( DbOsVirt.class ); + private static final Logger LOGGER = LogManager.getLogger( DbOsVirt.class ); public static List<OperatingSystem> getOsList() throws SQLException { diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java index 9ee00ca..03be323 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java @@ -3,7 +3,8 @@ package org.openslx.imagemaster.db.mappers; 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.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.db.Database; import org.openslx.imagemaster.db.MysqlConnection; @@ -15,7 +16,7 @@ import com.google.gson.annotations.SerializedName; public class DbPendingSatellite { - private static final Logger LOGGER = Logger.getLogger( DbPendingSatellite.class ); + private static final Logger LOGGER = LogManager.getLogger( DbPendingSatellite.class ); public static int add( UserInfo user, String displayName, List<String> address, String modulus, String exponent ) throws SQLException diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java index 2f72436..b9fa09a 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java @@ -7,7 +7,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.thrift.iface.Satellite; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.db.Database; @@ -19,7 +20,7 @@ import org.openslx.util.Json; public class DbSatellite { - private static final Logger LOGGER = Logger.getLogger( DbSatellite.class ); + private static final Logger LOGGER = LogManager.getLogger( DbSatellite.class ); public static LocalSatellite get( int satelliteId ) { diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java index 00ec45e..d23cab4 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.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.thrift.iface.Role; import org.openslx.bwlp.thrift.iface.TNotFoundException; import org.openslx.bwlp.thrift.iface.UserInfo; @@ -21,7 +22,7 @@ import org.openslx.imagemaster.util.Sha512Crypt; public class DbUser { - private static final Logger LOGGER = Logger.getLogger( DbUser.class ); + private static final Logger LOGGER = LogManager.getLogger( DbUser.class ); private static final String localUserSql = "SELECT" + " user.userid, user.password, user.organizationid, user.firstname, user.lastname, user.email" |