Revert ConfigurationFactory renaming

Author: ppkarwasz

log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java

@@ -19,9 +19,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
 import org.apache.logging.log4j.core.config.ConfigurationException;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.builder.api.ConfigurationBuilder;
 import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
@@ -35,7 +35,7 @@
 //
 // Best Value?
 // @Order(50)
-public class Log4j1ConfigurationFactory extends AbstractConfigurationFactory {
+public class Log4j1ConfigurationFactory extends ConfigurationFactory {
 
     private static final String[] SUFFIXES = {".properties"};
 

log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertiesConfigurationFactory.java

@@ -17,8 +17,8 @@
 package org.apache.log4j.config;
 
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.Order;
 import org.apache.logging.log4j.plugins.Namespace;
@@ -28,10 +28,10 @@
 /**
  * Configures Log4j from a log4j 1 format properties file.
  */
-@Namespace(AbstractConfigurationFactory.NAMESPACE)
+@Namespace(ConfigurationFactory.NAMESPACE)
 @Plugin("Log4j1PropertiesConfigurationFactory")
 @Order(2)
-public class PropertiesConfigurationFactory extends AbstractConfigurationFactory {
+public class PropertiesConfigurationFactory extends ConfigurationFactory {
 
     static final String FILE_EXTENSION = ".properties";
 
@@ -48,7 +48,7 @@ public class PropertiesConfigurationFactory extends AbstractConfigurationFactory
     @Override
     public String[] getSupportedTypes() {
         if (!PropertiesUtil.getProperties()
-                .getBooleanProperty(AbstractConfigurationFactory.LOG4J1_EXPERIMENTAL, Boolean.FALSE)) {
+                .getBooleanProperty(ConfigurationFactory.LOG4J1_EXPERIMENTAL, Boolean.FALSE)) {
             return null;
         }
         return new String[] {FILE_EXTENSION};

log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfigurationFactory.java

@@ -18,8 +18,8 @@
 
 import org.apache.log4j.config.Log4j1Configuration;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.Order;
 import org.apache.logging.log4j.plugins.Namespace;
@@ -29,10 +29,10 @@
 /**
  * Constructs a Configuration usable in Log4j 2 from a Log4j 1 configuration file.
  */
-@Namespace(AbstractConfigurationFactory.NAMESPACE)
+@Namespace(ConfigurationFactory.NAMESPACE)
 @Plugin("Log4j1XmlConfigurationFactory")
 @Order(2)
-public class XmlConfigurationFactory extends AbstractConfigurationFactory {
+public class XmlConfigurationFactory extends ConfigurationFactory {
 
     public static final String FILE_EXTENSION = ".xml";
 
@@ -49,7 +49,7 @@ public class XmlConfigurationFactory extends AbstractConfigurationFactory {
     @Override
     public String[] getSupportedTypes() {
         if (!PropertiesUtil.getProperties()
-                .getBooleanProperty(AbstractConfigurationFactory.LOG4J1_EXPERIMENTAL, Boolean.FALSE)) {
+                .getBooleanProperty(ConfigurationFactory.LOG4J1_EXPERIMENTAL, Boolean.FALSE)) {
             return null;
         }
         return new String[] {FILE_EXTENSION};

log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java

@@ -20,15 +20,15 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.AbstractConfiguration;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 
 /**
  *
  */
-public class BasicConfigurationFactory extends AbstractConfigurationFactory {
+public class BasicConfigurationFactory extends ConfigurationFactory {
 
     @Override
     public String[] getSupportedTypes() {

log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationFactoryTest.java

@@ -21,7 +21,7 @@
 import java.io.File;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -33,7 +33,7 @@ public class PropertiesConfigurationFactoryTest {
     @BeforeClass
     public static void beforeClass() {
         System.setProperty(
-                AbstractConfigurationFactory.LOG4J1_CONFIGURATION_FILE_PROPERTY.getSystemKey(),
+                ConfigurationFactory.LOG4J1_CONFIGURATION_FILE_PROPERTY.getSystemKey(),
                 "target/test-classes/log4j1-file-1.properties");
     }
 

log4j-1.2-api/src/test/java/org/apache/log4j/config/XmlConfigurationFactoryTest.java

@@ -21,7 +21,7 @@
 import java.io.File;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -33,7 +33,7 @@ public class XmlConfigurationFactoryTest {
     @BeforeClass
     public static void beforeClass() {
         System.setProperty(
-                AbstractConfigurationFactory.LOG4J1_CONFIGURATION_FILE_PROPERTY.getSystemKey(),
+                ConfigurationFactory.LOG4J1_CONFIGURATION_FILE_PROPERTY.getSystemKey(),
                 "target/test-classes/log4j1-file.xml");
     }
 

log4j-config-properties/src/main/java/org/apache/logging/log4j/config/properties/JavaPropsConfigurationFactory.java

@@ -17,17 +17,17 @@
 package org.apache.logging.log4j.config.properties;
 
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.Order;
 import org.apache.logging.log4j.plugins.Namespace;
 import org.apache.logging.log4j.plugins.Plugin;
 
-@Namespace(AbstractConfigurationFactory.NAMESPACE)
+@Namespace(ConfigurationFactory.NAMESPACE)
 @Plugin
 @Order(8)
-public class JavaPropsConfigurationFactory extends AbstractConfigurationFactory {
+public class JavaPropsConfigurationFactory extends ConfigurationFactory {
 
     /**
      * The file extensions supported by this factory.

log4j-config-yaml/src/main/java/org/apache/logging/log4j/config/yaml/YamlConfigurationFactory.java

@@ -17,17 +17,17 @@
 package org.apache.logging.log4j.config.yaml;
 
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.Order;
 import org.apache.logging.log4j.plugins.Namespace;
 import org.apache.logging.log4j.plugins.Plugin;
 
-@Namespace(AbstractConfigurationFactory.NAMESPACE)
+@Namespace(ConfigurationFactory.NAMESPACE)
 @Plugin("YamlConfigurationFactory")
 @Order(7)
-public class YamlConfigurationFactory extends AbstractConfigurationFactory {
+public class YamlConfigurationFactory extends ConfigurationFactory {
 
     /**
      * The file extensions supported by this factory.

log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/BasicConfigurationFactory.java

@@ -20,8 +20,8 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.AbstractConfiguration;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationSource;
 import org.apache.logging.log4j.core.config.LoggerConfig;
 import org.apache.logging.log4j.plugins.di.ConfigurableInstanceFactory;
@@ -31,7 +31,7 @@
 /**
  *
  */
-public class BasicConfigurationFactory extends AbstractConfigurationFactory {
+public class BasicConfigurationFactory extends ConfigurationFactory {
 
     @Override
     public Configuration getConfiguration(

log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/ConfigurationFactoryType.java

@@ -21,16 +21,16 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import org.apache.logging.log4j.core.config.AbstractConfigurationFactory;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.core.config.URIConfigurationFactory;
 
 /**
- * Specifies a particular {@link AbstractConfigurationFactory} class to use for a test class or method instead of the default.
+ * Specifies a particular {@link ConfigurationFactory} class to use for a test class or method instead of the default.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
 @Inherited
 @Log4jTest
 public @interface ConfigurationFactoryType {
-    Class<? extends ConfigurationFactory> value();
+    Class<? extends URIConfigurationFactory> value();
 }