This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch fix/apply-property-environment
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
discard d174ab66a5 Replace `PropertiesUtil` with `PropertyEnvironment`
add c624e01cc4 Add support for default values
add 64ebf0ddaa Corrections due to #2307 review
add 7c09141a56 Fix environment variable names
add 536df2aa1c Generalize DI usage
add a40170023a Revert `ConfigurationFactory` renaming
add de7aaf7289 Revert `LogEventWrapper` changes
new 10ad9c45c0 Replace `PropertiesUtil` with `PropertyEnvironment`
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d174ab66a5)
\
N -- N -- N refs/heads/fix/apply-property-environment
(10ad9c45c0)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/log4j/PropertyConfigurator.java | 3 +-
.../apache/log4j/config/Log4j1Configuration.java | 14 +-
.../log4j/config/Log4j1ConfigurationFactory.java | 2 +-
.../log4j/config/PropertiesConfiguration.java | 30 +-
.../config/PropertiesConfigurationFactory.java | 8 +-
.../org/apache/log4j/xml/XmlConfiguration.java | 8 +-
.../apache/log4j/xml/XmlConfigurationFactory.java | 8 +-
.../log4j/test/junit/StatusLoggerExtension.java | 5 +-
.../log4j/test/junit/TestPropertySource.java | 10 +-
.../java/org/apache/logging/log4j/LogManager.java | 29 +-
.../org/apache/logging/log4j/ThreadContext.java | 17 +-
.../apache/logging/log4j/spi/LoggingSystem.java | 160 ++--------
.../org/apache/logging/log4j/spi/Provider.java | 106 +++++++
.../logging/log4j/async/logger/AsyncLogger.java | 7 +-
.../log4j/async/logger/AsyncLoggerConfig.java | 66 ++--
.../async/logger/AsyncLoggerConfigDelegate.java | 10 -
.../async/logger/AsyncLoggerConfigDisruptor.java | 29 +-
.../log4j/async/logger/AsyncLoggerContext.java | 99 +++---
.../async/logger/AsyncLoggerContextSelector.java | 6 +-
.../log4j/async/logger/AsyncLoggerDisruptor.java | 25 +-
.../async/logger/AsyncWaitStrategyFactory.java | 9 +-
.../logger/BasicAsyncLoggerContextSelector.java | 11 +-
.../log4j/async/logger/DisruptorConfiguration.java | 67 ++--
.../DefaultAsyncWaitStrategyFactory.java | 6 +-
.../log4j/async/logger/internal/DefaultBundle.java | 67 ++++
.../async/logger/{ => internal}/DisruptorUtil.java | 37 +--
.../internal/InstanceFactoryPostProcessor.java | 15 +-
.../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 +-
.../log4j/config/yaml/YamlConfiguration.java | 1 +
.../log4j/core/test/BasicConfigurationFactory.java | 17 +-
.../config/AbstractNestedLoggerConfigTest.java | 7 +-
.../core/test/junit/ConfigurationFactoryType.java | 3 +-
.../log4j/core/test/junit/Log4jExtension.java | 10 +-
.../logging/log4j/core/LoggerContextTest.java | 50 ---
.../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 | 47 +--
.../apache/logging/log4j/core/LoggerContext.java | 243 ++++++++-------
.../log4j/core/appender/ConsoleAppender.java | 2 +-
.../log4j/core/appender/SyslogAppender.java | 6 +-
.../appender/rolling/DefaultRolloverStrategy.java | 2 +-
.../log4j/core/config/AbstractConfiguration.java | 87 ++++--
.../logging/log4j/core/config/Configuration.java | 6 +-
.../log4j/core/config/ConfigurationFactory.java | 49 ++-
.../log4j/core/config/ConfigurationScheduler.java | 5 +-
.../logging/log4j/core/config/Configurator.java | 2 +-
.../log4j/core/config/DefaultConfiguration.java | 17 +-
.../core/config/DefaultConfigurationFactory.java | 100 +++---
.../logging/log4j/core/config/HttpWatcher.java | 2 +-
.../logging/log4j/core/config/LoggerConfig.java | 179 ++++-------
.../log4j/core/config/NullConfiguration.java | 11 +-
.../core/config/ReliabilityStrategyFactory.java | 11 +-
.../log4j/core/config/URIConfigurationFactory.java | 86 ++++++
.../config/builder/impl/BuiltConfiguration.java | 16 +-
.../config/composite/CompositeConfiguration.java | 14 +-
.../core/config/json/JsonConfigurationFactory.java | 2 +-
.../log4j/core/config/xml/XmlConfiguration.java | 19 +-
.../core/filter/MutableThreadContextMapFilter.java | 4 +-
.../logging/log4j/core/impl/DefaultBundle.java | 56 ++--
.../log4j/core/impl/Log4jContextFactory.java | 28 +-
.../impl/Log4jInstanceFactoryPostProcessor.java | 36 +--
.../logging/log4j/core/impl/Log4jProvider.java | 21 ++
.../logging/log4j/core/impl/PropertyKeys.java | 2 +-
.../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 | 40 +--
.../log4j/core/selector/BasicContextSelector.java | 8 +-
.../core/selector/ClassLoaderContextSelector.java | 6 -
.../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 +-
log4j-kit/pom.xml | 20 ++
.../kit/env/ConfigurablePropertyEnvironment.java | 35 ---
.../logging/log4j/kit/env/Log4jProperty.java | 3 -
.../logging/log4j/kit/env/PropertyEnvironment.java | 27 +-
.../logging/log4j/kit/env/PropertySource.java | 3 +-
...va => ContextualEnvironmentPropertySource.java} | 32 +-
...java => ContextualJavaPropsPropertySource.java} | 14 +-
.../kit/env/internal/CopyOnWriteNavigableSet.java | 269 -----------------
.../kit/env/support/BasicPropertyEnvironment.java | 336 +++++++++++++--------
...nt.java => ClassLoaderPropertyEnvironment.java} | 4 +-
...ment.java => CompositePropertyEnvironment.java} | 49 +--
.../env/internal/AbstractPropertyNamesTest.java} | 32 +-
.../ContextualEnvironmentPropertySourceTest.java | 30 +-
.../ContextualJavaPropsPropertySourceTest.java | 29 +-
.../PropertiesUtilPropertyEnvironmentTest.java | 51 ++++
.../env/support/BasicPropertyEnvironmentTest.java | 179 +++++++----
.../condition/OnPresentBindingsConditionTest.java | 71 +++++
...erty.java => ConditionalOnPresentBindings.java} | 16 +-
...dition.java => OnPresentBindingsCondition.java} | 19 +-
.../plugins/di/ConfigurableInstanceFactory.java | 1 +
.../config/builder/CustomConfigurationFactory.java | 2 +-
120 files changed, 1868 insertions(+), 1800 deletions(-)
rename
log4j-async-logger/src/main/java/org/apache/logging/log4j/async/logger/{ =>
internal}/DefaultAsyncWaitStrategyFactory.java (92%)
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-plugins/src/main/java/org/apache/logging/log4j/plugins/di/spi/SingletonScopePostProcessor.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-kit/src/main/java/org/apache/logging/log4j/kit/env/ConfigurablePropertyEnvironment.java
rename
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/{ContextEnvironmentPropertySource.java
=> ContextualEnvironmentPropertySource.java} (61%)
rename
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/{ContextPropertiesPropertySource.java
=> ContextualJavaPropsPropertySource.java} (80%)
delete mode 100644
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/internal/CopyOnWriteNavigableSet.java
rename
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/support/{ClassloaderPropertyEnvironment.java
=> ClassLoaderPropertyEnvironment.java} (91%)
rename
log4j-kit/src/main/java/org/apache/logging/log4j/kit/env/support/{PropertySourcePropertyEnvironment.java
=> CompositePropertyEnvironment.java} (57%)
copy
log4j-kit/src/{main/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironment.java
=>
test/java/org/apache/logging/log4j/kit/env/internal/AbstractPropertyNamesTest.java}
(53%)
copy
log4j-api-test/src/test/java/org/apache/logging/log4j/message/SimpleMessageTest.java
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/ContextualEnvironmentPropertySourceTest.java
(50%)
copy
log4j-api-test/src/test/java/org/apache/logging/log4j/NoopThreadContextTest.java
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/ContextualJavaPropsPropertySourceTest.java
(53%)
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/env/internal/PropertiesUtilPropertyEnvironmentTest.java
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%)
