diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/util')
9 files changed, 30 insertions, 22 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java index 0ac740b2..8f265a4c 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ClientVersion.java @@ -10,7 +10,8 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.io.FileUtils; 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.dozmod.App; import org.openslx.dozmod.Branding; import org.openslx.sat.thrift.version.Version; @@ -19,7 +20,7 @@ import org.openslx.util.Json; public class ClientVersion { - private static final Logger LOGGER = Logger.getLogger(ClientVersion.class); + private static final Logger LOGGER = LogManager.getLogger(ClientVersion.class); private static long localRevisionTime = 0; private static long remoteRevisionTime = 0; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java index 87f87131..de72d5b6 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerUtils.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.util; import com.google.gson.JsonArray; import com.google.gson.JsonParser; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.kamranzafar.jtar.TarEntry; import org.kamranzafar.jtar.TarHeader; @@ -36,7 +37,7 @@ import java.util.List; */ public class ContainerUtils { - private static final Logger LOGGER = Logger.getLogger(ContainerUtils.class); + private static final Logger LOGGER = LogManager.getLogger(ContainerUtils.class); /** * Checks ImageBaseId of image if already linked with existing Lectures in diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerWrapper.java index 38ca2477..dd3ee826 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ContainerWrapper.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.util; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.virtualization.configuration.container.ContainerDefinition; @@ -13,7 +14,7 @@ import java.nio.file.Files; public class ContainerWrapper { - private static final Logger LOGGER = Logger.getLogger(ContainerWrapper.class); + private static final Logger LOGGER = LogManager.getLogger(ContainerWrapper.class); public static void unwrapContainer(File tmpDiskFile, String imageName, File destDir, diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ConversionTaskWorker.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ConversionTaskWorker.java index a4e1be54..fb76db88 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ConversionTaskWorker.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ConversionTaskWorker.java @@ -9,14 +9,15 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import javax.swing.SwingWorker; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.I18n; import org.openslx.dozmod.gui.helper.MessageType; import org.openslx.dozmod.gui.wizard.page.ImageOvfConversionPage; public class ConversionTaskWorker extends SwingWorker<Boolean, String> { - private final static Logger LOGGER = Logger.getLogger(ConversionTaskWorker.class); + private final static Logger LOGGER = LogManager.getLogger(ConversionTaskWorker.class); private File srcFile; private File destFile; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java index 62517e15..6be653de 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java @@ -7,7 +7,8 @@ import java.net.URI; import java.net.URLEncoder; import java.util.Arrays; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.App; import org.openslx.dozmod.Branding; @@ -16,7 +17,7 @@ public class DesktopEnvironment { /** * Logger instance for this class */ - private final static Logger LOGGER = Logger.getLogger(DesktopEnvironment.class); + private final static Logger LOGGER = LogManager.getLogger(DesktopEnvironment.class); private static final Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; public static enum Link { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java index 3c3a5f1c..2c0e6123 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ImageWrapper.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.util; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.Branding; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.I18n; @@ -20,7 +21,7 @@ import java.io.IOException; */ public class ImageWrapper { - private static final Logger LOGGER = Logger.getLogger(ImageWrapper.class); + private static final Logger LOGGER = LogManager.getLogger(ImageWrapper.class); /** * @param virtualizerId string constant defined in @link org.openslx.thrifthelper.TConst diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java index 1e25bbe0..8011eaec 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ProxyConfigurator.java @@ -26,9 +26,9 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; import org.apache.http.impl.conn.SystemDefaultRoutePlanner; import org.apache.http.protocol.HttpContext; import org.apache.http.ssl.SSLContexts; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.Priority; +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.MasterServer; import org.openslx.dozmod.App; import org.openslx.dozmod.authentication.ShibbolethEcp; @@ -51,7 +51,7 @@ public class ProxyConfigurator { /** * Logger for this class */ - private final static Logger LOGGER = Logger.getLogger(ProxyConfigurator.class); + private final static Logger LOGGER = LogManager.getLogger(ProxyConfigurator.class); private static AtomicReference<CloseableHttpClient> apacheClient = new AtomicReference<>(); @@ -90,7 +90,7 @@ public class ProxyConfigurator { com.btr.proxy.util.Logger.setBackend(new LogBackEnd() { public void log(Class<?> clazz, LogLevel loglevel, String msg, Object... params) { - Priority priority; + Level priority; switch (loglevel) { case ERROR: priority = Level.ERROR; @@ -104,7 +104,7 @@ public class ProxyConfigurator { default: priority = Level.DEBUG; } - Logger.getLogger(clazz).log(priority, MessageFormat.format(msg, params)); + LogManager.getLogger(clazz).log(priority, MessageFormat.format(msg, params)); } public boolean isLogginEnabled(LogLevel logLevel) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java index fee5e7c2..02004cc0 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/ResourceLoader.java @@ -19,7 +19,8 @@ import javax.swing.Icon; import javax.swing.ImageIcon; 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.dozmod.Config; /** @@ -33,7 +34,7 @@ public class ResourceLoader /** * Logger for this class */ - private final static Logger LOGGER = Logger.getLogger( ResourceLoader.class ); + private final static Logger LOGGER = LogManager.getLogger( ResourceLoader.class ); /** * Load the given resource as an ImageIcon. diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java index 528c8a42..af951d47 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/VmWrapper.java @@ -18,7 +18,8 @@ import javax.management.ReflectionException; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.OperatingSystem; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.MessageType; @@ -37,7 +38,7 @@ import org.openslx.virtualization.disk.DiskImageVmdk; public class VmWrapper { - private static final Logger LOGGER = Logger.getLogger(VmWrapper.class); + private static final Logger LOGGER = LogManager.getLogger(VmWrapper.class); public static void wrapVm(File diskFile, String imageName, byte[] machineDescription, String virtualizerId, int osId, DiskImage diskImageInfo) throws VirtualizationConfigurationException, |