diff options
Diffstat (limited to 'src/main/java/org/openslx/virtualization')
8 files changed, 25 insertions, 16 deletions
diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java index 318aa4c..165b80b 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfiguration.java @@ -7,7 +7,8 @@ import java.util.ArrayList; 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.OperatingSystem; import org.openslx.virtualization.Version; import org.openslx.virtualization.hardware.VirtOptionValue; @@ -20,7 +21,7 @@ import org.openslx.virtualization.virtualizer.Virtualizer; */ public abstract class VirtualizationConfiguration { - private static final Logger LOGGER = Logger.getLogger( VirtualizationConfiguration.class ); + private static final Logger LOGGER = LogManager.getLogger( VirtualizationConfiguration.class ); private final Virtualizer virtualizer; diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java index bcfbb19..9dfa0a6 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationDocker.java @@ -6,7 +6,8 @@ import java.io.FileInputStream; import java.io.IOException; 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.OperatingSystem; import org.openslx.virtualization.Version; import org.openslx.virtualization.virtualizer.VirtualizerDocker; @@ -18,7 +19,7 @@ public class VirtualizationConfigurationDocker extends VirtualizationConfigurati */ private static final String FILE_NAME_EXTENSION = null; - private static final Logger LOGGER = Logger.getLogger( VirtualizationConfigurationDocker.class); + private static final Logger LOGGER = LogManager.getLogger( VirtualizationConfigurationDocker.class); /** * containerDefinition is a serialized tar.gz archive and represents a diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java index 963179c..266f10e 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualBox.java @@ -10,7 +10,8 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; -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.thrifthelper.TConst; import org.openslx.util.Util; @@ -34,7 +35,7 @@ public class VirtualizationConfigurationVirtualBox extends VirtualizationConfigu */ public static final String FILE_NAME_EXTENSION = "vbox"; - private static final Logger LOGGER = Logger.getLogger( VirtualizationConfigurationVirtualBox.class ); + private static final Logger LOGGER = LogManager.getLogger( VirtualizationConfigurationVirtualBox.class ); private final VirtualizationConfigurationVirtualboxFileFormat config; diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java index b2dcd48..032e36b 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVirtualboxFileFormat.java @@ -21,7 +21,8 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.util.Util; import org.openslx.util.XmlHelper; import org.openslx.virtualization.Version; @@ -39,7 +40,7 @@ import org.xml.sax.SAXException; */ public class VirtualizationConfigurationVirtualboxFileFormat { - private static final Logger LOGGER = Logger.getLogger( VirtualizationConfigurationVirtualboxFileFormat.class ); + private static final Logger LOGGER = LogManager.getLogger( VirtualizationConfigurationVirtualboxFileFormat.class ); // key information set during initial parsing of the XML file private String osName = new String(); diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java index 3a5a165..49f44df 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmware.java @@ -12,7 +12,8 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; -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.thrifthelper.TConst; import org.openslx.util.Util; @@ -32,7 +33,7 @@ public class VirtualizationConfigurationVmware extends VirtualizationConfigurati */ public static final String FILE_NAME_EXTENSION = "vmx"; - private static final Logger LOGGER = Logger.getLogger( VirtualizationConfigurationVmware.class ); + private static final Logger LOGGER = LogManager.getLogger( VirtualizationConfigurationVmware.class ); private static final Pattern HDD_PATTERN = Pattern.compile( "^(ide\\d|scsi\\d|sata\\d|nvme\\d):?(\\d?)\\.(.*)", Pattern.CASE_INSENSITIVE ); diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmwareFileFormat.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmwareFileFormat.java index 231b2f2..134ff30 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmwareFileFormat.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationVmwareFileFormat.java @@ -16,7 +16,8 @@ import java.util.TreeMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.util.Util; class KeyValuePair @@ -34,7 +35,7 @@ class KeyValuePair public class VirtualizationConfigurationVmwareFileFormat { - private static final Logger LOGGER = Logger.getLogger( VirtualizationConfigurationVmwareFileFormat.class ); + private static final Logger LOGGER = LogManager.getLogger( VirtualizationConfigurationVmwareFileFormat.class ); private Map<String, ConfigEntry> entries = new TreeMap<>( String.CASE_INSENSITIVE_ORDER ); diff --git a/src/main/java/org/openslx/virtualization/configuration/container/ContainerDefinition.java b/src/main/java/org/openslx/virtualization/configuration/container/ContainerDefinition.java index 167a11f..91cf50c 100644 --- a/src/main/java/org/openslx/virtualization/configuration/container/ContainerDefinition.java +++ b/src/main/java/org/openslx/virtualization/configuration/container/ContainerDefinition.java @@ -3,7 +3,9 @@ package org.openslx.virtualization.configuration.container; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.stream.JsonReader; -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.TarInputStream; import org.kamranzafar.jtar.TarOutputStream; @@ -22,7 +24,7 @@ public class ContainerDefinition { // TODO refatoring: tar.gz of this object is not useful, for smaller dockerfiles it makes the package lager. // remove the containerRecipe, ContainerMeta holds in build_context the dockerfile. - protected static final Logger LOGGER = Logger.getLogger(ContainerDefinition.class); + protected static final Logger LOGGER = LogManager.getLogger(ContainerDefinition.class); protected static final String CONTAINER_FILE = "dockerfile"; protected static final String CONTAINER_META_FILE = "container_meta.json"; diff --git a/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java b/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java index b28fb32..6bb5faa 100644 --- a/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java +++ b/src/main/java/org/openslx/virtualization/configuration/transformation/TransformationManager.java @@ -2,7 +2,8 @@ package org.openslx.virtualization.configuration.transformation; import java.util.ArrayList; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * A transformation manager is a class to manage several transformations and their application. @@ -37,7 +38,7 @@ public class TransformationManager<T, R> /** * Logger instance to log messages. */ - private static final Logger LOGGER = Logger.getLogger( TransformationManager.class ); + private static final Logger LOGGER = LogManager.getLogger( TransformationManager.class ); /** * Create a transformation manager. |