This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 31c823e434da80525298defe0f18384450361dbb Author: Piotr P. Karwasz <[email protected]> AuthorDate: Thu Mar 31 20:49:12 2022 +0200 Fix compilation and tests Fixes some compilation and test errors caused by a different project structure in `master`. --- .../src/test/resources/jarfile.jar | Bin .../src/test/resources/jarfile/config/console.xml | 0 .../log4j/core/config/ConfigurationFactory.java | 21 +-------------------- .../core/config/DefaultConfigurationFactory.java | 4 ---- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/log4j-core/src/test/resources/jarfile.jar b/log4j-core-test/src/test/resources/jarfile.jar similarity index 100% rename from log4j-core/src/test/resources/jarfile.jar rename to log4j-core-test/src/test/resources/jarfile.jar diff --git a/log4j-core/src/test/resources/jarfile/config/console.xml b/log4j-core-test/src/test/resources/jarfile/config/console.xml similarity index 100% rename from log4j-core/src/test/resources/jarfile/config/console.xml rename to log4j-core-test/src/test/resources/jarfile/config/console.xml diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java index 8473e25..e764231 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFactory.java @@ -16,26 +16,14 @@ */ package org.apache.logging.log4j.core.config; -import java.io.UnsupportedEncodingException; import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import org.apache.logging.log4j.Level; + import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilderFactory; import org.apache.logging.log4j.core.lookup.StrSubstitutor; import org.apache.logging.log4j.core.util.AuthorizationProvider; import org.apache.logging.log4j.core.util.BasicAuthorizationProvider; -import org.apache.logging.log4j.core.util.FileUtils; import org.apache.logging.log4j.plugins.Inject; import org.apache.logging.log4j.plugins.Named; import org.apache.logging.log4j.plugins.di.Injector; @@ -45,13 +33,6 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.LoaderUtil; import org.apache.logging.log4j.util.PropertiesUtil; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.net.URI; -import java.net.URL; -import java.net.URLConnection; - /** * Factory class for parsed {@link Configuration} objects from a configuration file. * ConfigurationFactory allows the configuration implementation to be diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java index 0ec7df5..3f0a790 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationFactory.java @@ -181,10 +181,6 @@ public class DefaultConfigurationFactory extends ConfigurationFactory { // Ignore the error and try as a String. LOGGER.catching(Level.DEBUG, ex); } - if (source == null) { - final ClassLoader loader = LoaderUtil.getThreadContextClassLoader(); - source = getInputFromString(configLocationStr, loader); - } if (source != null) { for (final ConfigurationFactory factory : configurationFactories.get()) { if (requiredVersion != null && !factory.getVersion().equals(requiredVersion)) {
