This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch fix/generalize-di-usage
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from 536df2aa1c Generalize DI usage
add a40170023a Revert `ConfigurationFactory` renaming
add de7aaf7289 Revert `LogEventWrapper` changes
No new revisions were added by this update.
Summary of changes:
.../src/main/java/org/apache/log4j/Category.java | 2 +-
.../org/apache/log4j/bridge/AppenderAdapter.java | 2 +-
.../org/apache/log4j/bridge/LogEventAdapter.java | 13 --
.../org/apache/log4j/bridge/LogEventWrapper.java | 8 -
.../log4j/config/Log4j1ConfigurationFactory.java | 4 +-
.../config/PropertiesConfigurationFactory.java | 8 +-
.../apache/log4j/xml/XmlConfigurationFactory.java | 8 +-
.../apache/log4j/BasicConfigurationFactory.java | 4 +-
.../test/java/org/apache/log4j/CategoryTest.java | 35 +----
.../test/java/org/apache/log4j/ListAppender.java | 7 +-
.../config/PropertiesConfigurationFactoryTest.java | 4 +-
.../log4j/config/XmlConfigurationFactoryTest.java | 4 +-
.../properties/JavaPropsConfigurationFactory.java | 6 +-
.../config/yaml/YamlConfigurationFactory.java | 6 +-
.../log4j/core/test/BasicConfigurationFactory.java | 4 +-
.../core/test/junit/ConfigurationFactoryType.java | 6 +-
.../log4j/core/test/junit/Log4jExtension.java | 4 +-
.../apache/logging/log4j/core/LoggerContext.java | 7 +-
.../core/config/AbstractConfigurationFactory.java | 172 ---------------------
.../log4j/core/config/ConfigurationFactory.java | 157 +++++++++++++++++--
.../log4j/core/config/ConfigurationSource.java | 14 +-
.../core/config/DefaultConfigurationFactory.java | 32 ++--
.../apache/logging/log4j/core/config/Order.java | 2 +-
.../log4j/core/config/URIConfigurationFactory.java | 86 +++++++++++
.../config/composite/CompositeConfiguration.java | 5 +-
.../core/config/json/JsonConfigurationFactory.java | 6 +-
.../core/config/xml/XmlConfigurationFactory.java | 6 +-
.../logging/log4j/core/impl/DefaultBundle.java | 6 +-
.../log4j/core/impl/SystemPropertyBundle.java | 4 +-
.../osgi/tests/CustomConfigurationFactory.java | 6 +-
.../config/builder/CustomConfigurationFactory.java | 4 +-
31 files changed, 314 insertions(+), 318 deletions(-)
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfigurationFactory.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/URIConfigurationFactory.java