This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch feature/log4j-sdk
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from e18403a619 Fix `PropertiesUtil` source
add 35c0f02012 Generalize DI usage
add c2b121dc19 Revert `ConfigurationFactory` renaming
add a75bd17047 Revert `LogEventWrapper` changes
add 68e22a7428 Revert changes to methods used by Spring Boot
No new revisions were added by this update.
Summary of changes:
.../org/apache/log4j/PropertyConfigurator.java | 3 +-
.../apache/log4j/config/Log4j1Configuration.java | 14 +-
.../log4j/config/PropertiesConfiguration.java | 30 +-
.../config/PropertiesConfigurationFactory.java | 6 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 8 +-
.../apache/log4j/xml/XmlConfigurationFactory.java | 6 +-
.../apache/log4j/BasicConfigurationFactory.java | 2 +-
.../log4j/test/junit/StatusLoggerExtension.java | 5 +-
.../java/org/apache/logging/log4j/LogManager.java | 29 +-
.../org/apache/logging/log4j/ThreadContext.java | 17 +-
.../apache/logging/log4j/spi/LoggerContext.java | 2 +-
.../apache/logging/log4j/spi/LoggingSystem.java | 160 ++---------
.../org/apache/logging/log4j/spi/Provider.java | 106 +++++++
.../logging/log4j/async/logger/AsyncLogger.java | 31 ++
.../log4j/async/logger/AsyncLoggerConfig.java | 66 +++--
.../async/logger/AsyncLoggerConfigDelegate.java | 10 -
.../async/logger/AsyncLoggerConfigDisruptor.java | 28 +-
.../log4j/async/logger/AsyncLoggerContext.java | 106 +++----
.../async/logger/AsyncLoggerContextSelector.java | 6 +-
.../log4j/async/logger/AsyncLoggerDisruptor.java | 20 +-
.../async/logger/AsyncWaitStrategyFactory.java | 9 +-
.../logger/BasicAsyncLoggerContextSelector.java | 8 +-
.../log4j/async/logger/DisruptorConfiguration.java | 63 +++--
.../DefaultAsyncWaitStrategyFactory.java | 5 +-
.../log4j/async/logger/internal/DefaultBundle.java | 67 +++++
.../async/logger/{ => internal}/DisruptorUtil.java | 42 +--
.../internal/InstanceFactoryPostProcessor.java | 13 +-
.../TimeoutBlockingWaitStrategy.java | 4 +-
.../logger/AsyncLoggerClassLoadDeadlockTest.java | 2 +-
.../logger/AsyncLoggerConfigAutoFlushTest.java | 13 +-
.../log4j/async/logger/AsyncLoggerConfigTest.java | 3 +-
.../log4j/async/logger/AsyncLoggerContextTest.java | 13 +-
.../AsyncLoggerCustomSelectorLocationTest.java | 4 +-
.../log4j/async/logger/AsyncThreadContextTest.java | 4 +-
.../async/logger/DefaultIncludeLocationTest.java | 9 +-
.../logger/DisruptorConfigurationInvalidTest.java | 1 +
.../async/logger/DisruptorConfigurationTest.java | 7 +-
.../async/logger/QueueFullAsyncAbstractTest.java | 8 +-
.../config/properties/JavaPropsConfiguration.java | 7 +-
.../properties/JavaPropsConfigurationFactory.java | 2 +-
.../log4j/config/yaml/YamlConfiguration.java | 1 +
.../config/yaml/YamlConfigurationFactory.java | 2 +-
.../log4j/core/test/BasicConfigurationFactory.java | 19 +-
.../config/AbstractNestedLoggerConfigTest.java | 7 +-
.../core/test/junit/ConfigurationFactoryType.java | 3 +-
.../log4j/core/test/junit/Log4jExtension.java | 10 +-
.../logging/log4j/core/LoggerContextTest.java | 46 ---
.../org/apache/logging/log4j/core/LoggerTest.java | 11 +-
.../core/appender/ReconfigureAppenderTest.java | 8 +-
.../appender/rolling/RollingAppenderCronTest.java | 5 +-
...llingAppenderDirectWriteWithHtmlLayoutTest.java | 2 +-
.../log4j/core/config/JiraLog4j2_2134Test.java | 5 +-
.../LoggerContextAwarePostProcessorTest.java | 5 +-
.../core/impl/ThreadContextDataInjectorTest.java | 4 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 12 +-
.../log4j/core/lookup/InterpolatorTest.java | 14 +-
.../logging/log4j/core/lookup/MainLookupTest.java | 3 +-
.../log4j/core/lookup/StrSubstitutorTest.java | 77 +++--
.../log4j/core/pattern/PatternParserTest2.java | 6 +-
.../log4j/core/pattern/StyleConverterTest.java | 9 +-
.../util/NamedLoggerContextPropertiesTest.java | 6 +-
.../java/org/apache/logging/log4j/core/Logger.java | 74 +++++
.../apache/logging/log4j/core/LoggerContext.java | 290 +++++++++----------
.../log4j/core/appender/ConsoleAppender.java | 2 +-
.../log4j/core/appender/SyslogAppender.java | 6 +-
.../appender/rolling/DefaultRolloverStrategy.java | 2 +-
.../log4j/core/config/AbstractConfiguration.java | 86 ++++--
.../logging/log4j/core/config/Configuration.java | 6 +-
.../log4j/core/config/ConfigurationFactory.java | 51 ++--
.../log4j/core/config/ConfigurationScheduler.java | 5 +-
.../logging/log4j/core/config/Configurator.java | 2 +-
.../log4j/core/config/DefaultConfiguration.java | 17 +-
.../core/config/DefaultConfigurationFactory.java | 114 ++++----
.../logging/log4j/core/config/HttpWatcher.java | 2 +-
.../logging/log4j/core/config/LoggerConfig.java | 179 ++++--------
.../log4j/core/config/NullConfiguration.java | 11 +-
.../core/config/ReliabilityStrategyFactory.java | 8 +-
.../log4j/core/config/URIConfigurationFactory.java | 86 ++++++
.../config/builder/impl/BuiltConfiguration.java | 16 +-
.../config/composite/CompositeConfiguration.java | 14 +-
.../log4j/core/config/xml/XmlConfiguration.java | 19 +-
.../core/config/xml/XmlConfigurationFactory.java | 2 +-
.../core/filter/MutableThreadContextMapFilter.java | 4 +-
.../logging/log4j/core/impl/DefaultBundle.java | 62 ++--
.../log4j/core/impl/Log4jContextFactory.java | 100 +------
.../logging/log4j/core/impl/Log4jProvider.java | 21 ++
.../log4j/core/impl/SystemPropertyBundle.java | 7 +
.../core/impl/internal/InternalLoggerContext.java | 311 ---------------------
.../logging/log4j/core/layout/HtmlLayout.java | 10 -
.../logging/log4j/core/lookup/Interpolator.java | 47 +---
.../logging/log4j/core/pattern/PatternParser.java | 1 +
.../core/selector/AbstractContextSelector.java | 35 +--
.../log4j/core/selector/BasicContextSelector.java | 8 +-
.../core/selector/ClassLoaderContextSelector.java | 34 +--
.../apache/logging/log4j/core/tools/Generate.java | 8 +-
.../log4j/csv/layout/CsvLogEventLayout.java | 2 +-
.../log4j/csv/layout/CsvParameterLayout.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 9 +-
.../log4j/flume/appender/FlumeAppenderTest.java | 28 +-
.../log4j/jndi/lookup/InterpolatorTest.java | 27 +-
.../log4j/jndi/selector/JndiContextSelector.java | 21 +-
.../osgi/tests/CustomConfigurationFactory.java | 2 +-
.../condition/OnPresentBindingsConditionTest.java | 71 +++++
...erty.java => ConditionalOnPresentBindings.java} | 16 +-
...dition.java => OnPresentBindingsCondition.java} | 19 +-
.../plugins/di/ConfigurableInstanceFactory.java | 12 +-
.../log4j/plugins/di/DefaultInstanceFactory.java | 36 ++-
107 files changed, 1521 insertions(+), 1558 deletions(-)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/DefaultAsyncWaitStrategyFactory.java (95%)
create mode 100644
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/DefaultBundle.java
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/DisruptorUtil.java (75%)
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jInstanceFactoryPostProcessor.java
=>
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/internal/InstanceFactoryPostProcessor.java
(73%)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/TimeoutBlockingWaitStrategy.java (97%)
delete mode 100644
log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerContextTest.java
create mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/config/URIConfigurationFactory.java
delete mode 100644
log4j-core/src/main/java/org/apache/logging/log4j/core/impl/internal/InternalLoggerContext.java
copy
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/BasicAsyncLoggerContextSelector.java
=>
log4j-core/src/main/java/org/apache/logging/log4j/core/selector/AbstractContextSelector.java
(54%)
create mode 100644
log4j-plugins-test/src/test/java/org/apache/logging/log4j/plugins/condition/OnPresentBindingsConditionTest.java
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/{ConditionalOnProperty.java
=> ConditionalOnPresentBindings.java} (76%)
copy
log4j-plugins/src/main/java/org/apache/logging/log4j/plugins/condition/{OnMissingBindingCondition.java
=> OnPresentBindingsCondition.java} (74%)
