You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2022/03/28 02:18:59 UTC
[logging-log4j2] branch master updated (deea4d4 -> eff04d2)
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from deea4d4 Make KeyProvider plugins injectable
add 0ce86d5 Move JsonReader to log4j-api
add 52870bb [LOG4J2-3415] Support JSON configuration using embedded JSON parser
add efbacfa Move JsonReader to log4j-core
add 381a7de Clean up function
new eff04d2 Merge branch 'json-config'
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:
.../core/config/arbiters/BasicArbiterTest.java | 2 +-
.../logging/log4j/core}/util/JsonReaderTest.java | 8 +-
.../src/test/resources/log4j2-arbiters.json | 42 ++++
.../log4j/core/config/jason/JsonConfiguration.java | 247 +++++++++++++++++++++
.../{json => jason}/JsonConfigurationFactory.java | 35 +--
.../core/config/json/JsonConfigurationFactory.java | 4 -
.../logging/log4j/core}/util/JsonReader.java | 23 +-
.../json/resolver/CaseConverterResolver.java | 2 +-
.../resolver/EventAdditionalFieldInterceptor.java | 4 +-
.../template/json/resolver/TemplateResolvers.java | 2 +-
.../JsonTemplateLayoutAdditionalFieldTest.java | 2 +-
.../log4j/layout/template/json/TestHelpers.java | 2 +-
.../json/resolver/CounterResolverTest.java | 2 +-
.../json/resolver/MessageResolverTest.java | 4 +-
.../json/JsonTemplateLayoutBenchmarkReport.java | 2 +-
15 files changed, 331 insertions(+), 50 deletions(-)
rename {log4j-layout-template-json/src/test/java/org/apache/logging/log4j/layout/template/json => log4j-core-test/src/test/java/org/apache/logging/log4j/core}/util/JsonReaderTest.java (98%)
create mode 100644 log4j-core-test/src/test/resources/log4j2-arbiters.json
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/jason/JsonConfiguration.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/config/{json => jason}/JsonConfigurationFactory.java (64%)
rename {log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json => log4j-core/src/main/java/org/apache/logging/log4j/core}/util/JsonReader.java (95%)
[logging-log4j2] 01/01: Merge branch 'json-config'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit eff04d2b98bc5a793ed55b391e0670b44815f48a
Merge: deea4d4 381a7de
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Sun Mar 27 21:08:48 2022 -0500
Merge branch 'json-config'
.../core/config/arbiters/BasicArbiterTest.java | 2 +-
.../logging/log4j/core}/util/JsonReaderTest.java | 8 +-
.../src/test/resources/log4j2-arbiters.json | 42 ++++
.../log4j/core/config/jason/JsonConfiguration.java | 247 +++++++++++++++++++++
.../{json => jason}/JsonConfigurationFactory.java | 35 +--
.../core/config/json/JsonConfigurationFactory.java | 4 -
.../logging/log4j/core}/util/JsonReader.java | 23 +-
.../json/resolver/CaseConverterResolver.java | 2 +-
.../resolver/EventAdditionalFieldInterceptor.java | 4 +-
.../template/json/resolver/TemplateResolvers.java | 2 +-
.../JsonTemplateLayoutAdditionalFieldTest.java | 2 +-
.../log4j/layout/template/json/TestHelpers.java | 2 +-
.../json/resolver/CounterResolverTest.java | 2 +-
.../json/resolver/MessageResolverTest.java | 4 +-
.../json/JsonTemplateLayoutBenchmarkReport.java | 2 +-
15 files changed, 331 insertions(+), 50 deletions(-)