diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/thrift')
9 files changed, 25 insertions, 17 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java index 07146ead..4ec27aad 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/GuiErrorCallback.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.thrift; import java.awt.Frame; -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.thrift.iface.AuthorizationError; @@ -16,7 +17,7 @@ import org.openslx.thrifthelper.ThriftManager.ErrorCallback; public class GuiErrorCallback implements ErrorCallback { - private static final Logger LOGGER = Logger.getLogger(GuiErrorCallback.class); + private static final Logger LOGGER = LogManager.getLogger(GuiErrorCallback.class); private final Frame parent; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ImageLocalDetailsActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ImageLocalDetailsActions.java index 0bf1bfcb..6acf7bfe 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ImageLocalDetailsActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ImageLocalDetailsActions.java @@ -4,7 +4,8 @@ import java.awt.Frame; import java.nio.ByteBuffer; 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.thrift.iface.ImageBaseWrite; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; @@ -24,7 +25,7 @@ import org.openslx.util.QuickTimer.Task; public class ImageLocalDetailsActions implements ImageDetailsActions { - private final static Logger LOGGER = Logger.getLogger(ImageLocalDetailsActions.class); + private final static Logger LOGGER = LogManager.getLogger(ImageLocalDetailsActions.class); private final Frame parent; public ImageLocalDetailsActions(final Frame parent) { this.parent = parent; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java index cf2468b3..fd3920cc 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/Session.java @@ -3,7 +3,8 @@ package org.openslx.dozmod.thrift; import java.util.HashSet; import java.util.Set; -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.thrift.iface.ImagePermissions; import org.openslx.bwlp.thrift.iface.LecturePermissions; @@ -14,7 +15,7 @@ import org.openslx.thrifthelper.ThriftManager; public class Session { - private static final Logger LOGGER = Logger.getLogger(Session.class); + private static final Logger LOGGER = LogManager.getLogger(Session.class); private static WhoamiInfo data = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java index 7d0fde5f..d8efa252 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftActions.java @@ -12,7 +12,8 @@ import java.util.Map; import javax.swing.JFileChooser; -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.thrift.iface.*; @@ -45,7 +46,7 @@ import org.openslx.util.QuickTimer.Task; public class ThriftActions { - private static final Logger LOGGER = Logger.getLogger(ThriftActions.class); + private static final Logger LOGGER = LogManager.getLogger(ThriftActions.class); private static final long SIZE_CHECK_EXTRA_DL = 50l * 1024l * 1024l; /* ******************************************************************************* diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java index dd69d55c..1da7e835 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/ThriftError.java @@ -4,7 +4,7 @@ import java.awt.Component; import javax.swing.SwingUtilities; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.AuthorizationError; import org.openslx.bwlp.thrift.iface.InvocationError; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java index 1e4ef05a..777cfcc7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/UploadInitiator.java @@ -7,7 +7,8 @@ import java.nio.ByteBuffer; import java.security.NoSuchAlgorithmException; 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.thrift.iface.SatelliteStatus; import org.openslx.bwlp.thrift.iface.TAuthorizationException; @@ -21,7 +22,7 @@ import org.openslx.util.QuickTimer; public class UploadInitiator { - private static final Logger LOGGER = Logger.getLogger(UploadInitiator.class); + private static final Logger LOGGER = LogManager.getLogger(UploadInitiator.class); private static final long SIZE_CHECK_EXTRA_UL = 150l * 1024l * 1024l; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java index 7b6cbe25..32956c71 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/MetaDataCache.java @@ -3,7 +3,8 @@ package org.openslx.dozmod.thrift.cache; 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.apache.thrift.TApplicationException; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.LdapFilter; @@ -21,7 +22,7 @@ import org.openslx.util.GenericDataCache.CacheMode; public class MetaDataCache { - private static final Logger LOGGER = Logger.getLogger(MetaDataCache.class); + private static final Logger LOGGER = LogManager.getLogger(MetaDataCache.class); /** * How long to cache data. diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java index f4e0a430..eb804929 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/OrganizationCache.java @@ -3,7 +3,8 @@ package org.openslx.dozmod.thrift.cache; import java.util.Collections; 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.bwlp.thrift.iface.SatelliteServer; import org.openslx.bwlp.thrift.iface.UserInfo; @@ -14,7 +15,7 @@ import org.openslx.util.GenericDataCache.CacheMode; public class OrganizationCache { - private static final Logger LOGGER = Logger.getLogger(OrganizationCache.class); + private static final Logger LOGGER = LogManager.getLogger(OrganizationCache.class); /** * How long should the list be cached? diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java index d3774d58..2cc5516c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/thrift/cache/UserCache.java @@ -5,7 +5,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.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.thrift.Session; @@ -15,7 +16,7 @@ import org.openslx.util.GenericDataCache.CacheMode; public class UserCache { - private static final Logger LOGGER = Logger.getLogger(UserCache.class); + private static final Logger LOGGER = LogManager.getLogger(UserCache.class); /** * How long should the list be cached? |