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 10ad9c45c0 Replace `PropertiesUtil` with `PropertyEnvironment`
discard de7aaf7289 Revert `LogEventWrapper` changes
discard a40170023a Revert `ConfigurationFactory` renaming
discard 536df2aa1c Generalize DI usage
add f1b306daa6 Make location and formatted message more lazy
add 9068465d54 Fix `log4j-1.2-api` OSGi descriptor
add 590a205df1 Fix Javadoc generation
add 79b6316312 Apply review suggestions
add 64f37b6d23 Generalize DI usage
add 1fd4a5ffec Revert `ConfigurationFactory` renaming
add 7dcc0c5b99 Revert `LogEventWrapper` changes
add 0c3b74b9c1 Revert changes to methods used by Spring Boot
new c646ed075f Generalize DI usage
new c38f7bbb33 Replace `PropertiesUtil` with `PropertyEnvironment`
new 0ac3d5e07d Move `Recycler` to `log4j-kit`
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 (10ad9c45c0)
\
N -- N -- N refs/heads/fix/apply-property-environment
(0ac3d5e07d)
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 3 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:
log4j-1.2-api/pom.xml | 5 +-
.../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 | 16 ++-
.../log4j/config/Log4j1ConfigurationFactory.java | 4 +-
.../config/PropertiesConfigurationFactory.java | 8 +-
.../apache/log4j/xml/XmlConfigurationFactory.java | 2 +-
.../apache/log4j/BasicConfigurationFactory.java | 6 +-
.../test/java/org/apache/log4j/CategoryTest.java | 35 +++--
.../test/java/org/apache/log4j/ListAppender.java | 7 +-
.../services/org.apache.logging.log4j.spi.Provider | 1 -
.../logging/log4j/async/logger/AsyncLogger.java | 95 ++------------
.../log4j/async/logger/AsyncLoggerConfig.java | 6 -
.../async/logger/AsyncLoggerConfigDisruptor.java | 75 +++++------
.../log4j/async/logger/RingBufferLogEvent.java | 6 +
.../async/logger/RingBufferLogEventTranslator.java | 87 ++++++-------
.../properties/JavaPropsConfigurationFactory.java | 8 +-
.../config/yaml/YamlConfigurationFactory.java | 8 +-
.../log4j/core/test/BasicConfigurationFactory.java | 6 +-
.../core/test/junit/ConfigurationFactoryType.java | 4 +-
.../log4j/core/impl/MutableLogEventTest.java | 6 +-
.../logging/log4j/core/AbstractLogEvent.java | 6 +
.../org/apache/logging/log4j/core/LogEvent.java | 29 +++--
.../java/org/apache/logging/log4j/core/Logger.java | 3 +-
.../logging/log4j/core/appender/AsyncAppender.java | 6 +-
.../core/appender/rewrite/RewriteAppender.java | 3 +-
.../log4j/core/async/InternalAsyncUtil.java | 34 +++++
...tory.java => AbstractConfigurationFactory.java} | 46 ++-----
.../logging/log4j/core/config/Configuration.java | 2 +-
.../log4j/core/config/ConfigurationFactory.java | 11 +-
.../log4j/core/config/ConfigurationSource.java | 14 +-
.../core/config/DefaultConfigurationFactory.java | 12 +-
.../apache/logging/log4j/core/config/Order.java | 2 +-
.../log4j/core/config/URIConfigurationFactory.java | 2 +-
.../core/config/json/JsonConfigurationFactory.java | 6 +-
.../core/config/xml/XmlConfigurationFactory.java | 8 +-
.../log4j/core/filter/StructuredDataFilter.java | 4 +-
.../logging/log4j/core/impl/DefaultBundle.java | 13 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 23 ++--
.../logging/log4j/core/impl/MementoLogEvent.java | 79 ++++--------
.../logging/log4j/core/impl/MutableLogEvent.java | 46 ++++---
.../log4j/core/impl/ReusableLogEventFactory.java | 4 +-
.../log4j/core/layout/AbstractStringLayout.java | 4 +-
.../logging/log4j/core/layout/PatternLayout.java | 2 +-
.../log4j/core/layout/StringBuilderEncoder.java | 2 +-
.../log4j/core/pattern/DatePatternConverter.java | 2 +-
.../apache/logging/log4j/core/util/JsonUtils.java | 2 +-
.../logging/log4j/flume/appender/FlumeEvent.java | 6 +
.../jctools/JCToolsRecyclerFactoryProvider.java | 19 +--
.../JCToolsRecyclerFactoryProviderTest.java | 4 +-
...ing.log4j.kit.recycler.RecyclerFactoryProvider} | 0
.../PropertiesUtilPropertyEnvironment.java | 7 +-
.../logging/log4j/kit/logger/AbstractLogger.java | 141 ++++++++++-----------
.../kit/logger/internal/DefaultLogBuilder.java | 4 +-
.../log4j/kit/message/RecyclingMessageFactory.java | 22 ++--
.../message/internal}/ReusableMessageFactory.java | 98 ++++----------
.../logging/log4j/kit/message}/package-info.java | 2 +-
.../logging/log4j/kit/recycler/PropertyKeys.java | 19 ++-
.../logging/log4j/kit}/recycler/Recycler.java | 2 +-
.../logging/log4j/kit}/recycler/RecyclerAware.java | 5 +-
.../log4j/kit}/recycler/RecyclerFactory.java | 2 +-
.../kit}/recycler/RecyclerFactoryProvider.java | 6 +-
.../log4j/kit/recycler/internal}/ArrayQueue.java | 2 +-
.../internal}/DummyRecyclerFactoryProvider.java | 12 +-
.../internal}/QueueingRecyclerFactoryProvider.java | 17 ++-
.../ThreadLocalRecyclerFactoryProvider.java | 35 +++--
.../logging/log4j/kit}/recycler/package-info.java | 2 +-
.../kit/recycler/support}/AbstractRecycler.java | 10 +-
.../log4j/kit/recycler/support}/package-info.java | 4 +-
.../log4j/kit/env/TestPropertyEnvironment.java} | 26 ++--
.../PropertiesUtilPropertyEnvironmentTest.java | 2 -
.../env/support/BasicPropertyEnvironmentTest.java | 22 +---
.../log4j/kit/logger/AbstractLoggerTest.java | 14 +-
.../logging/log4j/kit/logger/TestListLogger.java | 4 +-
.../kit/recycler/internal}/ArrayQueueTest.java | 2 +-
.../internal}/RecyclerFactoryRegistryTest.java | 25 ++--
.../recycler/internal/RecyclerFactoryTestUtil.java | 51 ++++++++
.../ThreadLocalRecyclerFactoryProviderTest.java | 19 +--
.../layout/template/json/JsonTemplateLayout.java | 2 +-
.../template/json/resolver/CounterResolver.java | 2 +-
.../json/resolver/MessageParameterResolver.java | 2 +-
.../json/resolver/ReadOnlyStringMapResolver.java | 4 +-
.../json/resolver/StackTraceStringResolver.java | 4 +-
.../osgi/tests/CustomConfigurationFactory.java | 8 +-
.../config/builder/CustomConfigurationFactory.java | 4 +-
.../services/org.apache.logging.log4j.spi.Provider | 1 -
pom.xml | 8 +-
88 files changed, 679 insertions(+), 707 deletions(-)
delete mode 100644
log4j-api-test/src/test/resources/META-INF/services/org.apache.logging.log4j.spi.Provider
copy
log4j-core/src/main/java/org/apache/logging/log4j/core/config/{ConfigurationFactory.java
=> AbstractConfigurationFactory.java} (78%)
rename
log4j-jctools/src/test/resources/META-INF/services/{org.apache.logging.log4j.spi.recycler.RecyclerFactoryProvider
=> org.apache.logging.log4j.kit.recycler.RecyclerFactoryProvider} (100%)
copy
log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/Tags.java =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/message/RecyclingMessageFactory.java
(59%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/message =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/message/internal}/ReusableMessageFactory.java
(68%)
copy {log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/message}/package-info.java
(95%)
copy log4j-jul/src/main/java/org/apache/logging/log4j/jul/JulKeys.java =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/PropertyKeys.java
(69%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/Recycler.java
(97%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/RecyclerAware.java
(91%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/RecyclerFactory.java
(97%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/RecyclerFactoryProvider.java
(94%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/ArrayQueue.java
(97%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/DummyRecyclerFactoryProvider.java
(86%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/QueueingRecyclerFactoryProvider.java
(84%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/internal/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/internal}/ThreadLocalRecyclerFactoryProvider.java
(79%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/spi =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit}/recycler/package-info.java
(95%)
copy {log4j-api/src/main/java/org/apache/logging/log4j/spi/recycler =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/support}/AbstractRecycler.java
(81%)
copy {log4j-core/src/main/java/org/apache/logging/log4j/core/appender =>
log4j-kit/src/main/java/org/apache/logging/log4j/kit/recycler/support}/package-info.java
(89%)
copy
log4j-kit/src/{main/java/org/apache/logging/log4j/kit/env/support/ClassLoaderPropertyEnvironment.java
=> test/java/org/apache/logging/log4j/kit/env/TestPropertyEnvironment.java}
(56%)
copy {log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal}/ArrayQueueTest.java
(98%)
copy {log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal}/RecyclerFactoryRegistryTest.java
(72%)
create mode 100644
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal/RecyclerFactoryTestUtil.java
copy {log4j-api-test/src/test/java/org/apache/logging/log4j/internal/recycler
=>
log4j-kit/src/test/java/org/apache/logging/log4j/kit/recycler/internal}/ThreadLocalRecyclerFactoryProviderTest.java
(80%)
delete mode 100644
log4j-to-slf4j/src/main/resources/META-INF/services/org.apache.logging.log4j.spi.Provider
