You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2024/05/16 07:26:08 UTC
(logging-log4j2) branch 2.x updated (f1de65f839 -> c1459aa0c1)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from f1de65f839 rewrote flowtracing #2535
add 47ce519a7f New configuration page
add f6c630885d Revamp configuration page
add 553dd7b0c4 Move configuration properties to separate page
add a330c6bca3 Add arbiters and scripts
add 1d1a69cf25 Move scripts to a separate file
add c84f0a5959 Exclude Antora examples from RAT configuration
add 78cfcd341e Add headers to example files
add 5f8e0aeb52 Proofreading
add cd8a61722a grammar, typos, some rewording
add ced35ab13e tiny improvements on wording
add f797fcbd6d Apply suggestions from code review
add d55b35ae36 Simplify arbiters-select example
add 1c61b036eb Wrap `schemaLocation` attribute
add fcacdee953 Remove attribute with default value
add 76bb04f69b YAML formatting
add 01ef75c7a1 Fix reference naming
add 719586173a Miscellaneous fixes
add a786e62d71 Paragraph formatting problems
add 61c2c6ffa0 tiny wording/spelling improvements
add e84a46ceb7 tiny wording improvments and corrections
add be54ca2aef Apply suggestions from code review (2)
add 5f8a7dc05d Add logger configuration example
add cd69a989ee Add property expansion example
new c1459aa0c1 Merge branch 'doc/2.x/configuration' into 2.x
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:
.../manual/configuration/arbiters-select.json | 29 +
.../configuration/arbiters-select.properties | 32 +
.../manual/configuration/arbiters-select.xml | 42 +
.../manual/configuration/arbiters-select.yaml | 35 +
.../examples/manual/configuration/arbiters.json | 33 +
.../manual/configuration/arbiters.properties | 32 +
.../examples/manual/configuration/arbiters.xml | 38 +
.../examples/manual/configuration/arbiters.yaml | 34 +
.../manual/configuration/logger-properties.json | 29 +
.../configuration/logger-properties.properties | 32 +
.../manual/configuration/logger-properties.xml | 37 +
.../manual/configuration/logger-properties.yaml | 34 +
.../examples/manual/configuration/loggers.json | 37 +
.../manual/configuration/loggers.properties | 33 +
.../ROOT/examples/manual/configuration/loggers.xml | 40 +
.../examples/manual/configuration/loggers.yaml | 37 +
.../manual/configuration/main-elements.json | 47 +
.../manual/configuration/main-elements.properties | 40 +
.../manual/configuration/main-elements.xml | 43 +
.../manual/configuration/main-elements.yaml | 42 +
.../manual/configuration/properties-example.json | 14 +
.../configuration/properties-example.properties | 18 +
.../manual/configuration/properties-example.xml | 21 +
.../manual/configuration/properties-example.yaml | 22 +
.../manual/configuration/properties-recursion.json | 18 +
.../configuration/properties-recursion.properties | 19 +
.../manual/configuration/properties-recursion.xml | 22 +
.../manual/configuration/properties-recursion.yaml | 24 +
.../examples/manual/configuration/properties.json | 17 +
.../manual/configuration/properties.properties | 19 +
.../examples/manual/configuration/properties.xml | 28 +
.../examples/manual/configuration/properties.yaml | 24 +
.../examples/manual/configuration/routing.json | 34 +
.../manual/configuration/routing.properties | 37 +
.../ROOT/examples/manual/configuration/routing.xml | 45 +
.../examples/manual/configuration/routing.yaml | 36 +
.../examples/manual/configuration/scripts.json | 65 +
.../manual/configuration/scripts.properties | 67 +
.../ROOT/examples/manual/configuration/scripts.xml | 68 +
.../examples/manual/configuration/scripts.yaml | 70 +
.../manual/configuration/xinclude-appenders.xml | 25 +
.../manual/configuration/xinclude-loggers.xml | 25 +
.../manual/configuration/xinclude-main.xml | 29 +
.../ROOT/examples/manual/filters/filters.json | 36 +
.../examples/manual/filters/filters.properties | 38 +
.../ROOT/examples/manual/filters/filters.xml | 42 +
.../ROOT/examples/manual/filters/filters.yaml | 41 +
src/site/antora/modules/ROOT/nav.adoc | 19 +-
src/site/antora/modules/ROOT/pages/log4j-jul.adoc | 21 +-
.../pages/log4j-spring-cloud-config-client.adoc | 8 +-
.../modules/ROOT/pages/manual/appenders.adoc | 1109 ++++----
.../modules/ROOT/pages/manual/architecture.adoc | 38 +-
.../antora/modules/ROOT/pages/manual/async.adoc | 78 +-
.../modules/ROOT/pages/manual/configuration.adoc | 2807 ++++++++------------
.../antora/modules/ROOT/pages/manual/filters.adoc | 256 +-
.../modules/ROOT/pages/manual/garbagefree.adoc | 105 +-
.../modules/ROOT/pages/manual/installation.adoc | 88 +-
src/site/antora/modules/ROOT/pages/manual/jmx.adoc | 21 +-
.../antora/modules/ROOT/pages/manual/layouts.adoc | 505 ++--
.../antora/modules/ROOT/pages/manual/lookups.adoc | 8 +-
.../modules/ROOT/pages/manual/migration.adoc | 2 +-
.../antora/modules/ROOT/pages/manual/scripts.adoc | 127 +
.../{_properties.adoc => systemproperties.adoc} | 38 +-
.../antora/modules/ROOT/pages/manual/webapp.adoc | 1 +
.../modules/ROOT/pages/plugin-reference.adoc | 767 ++++++
.../partials/configuration-file-format-deps.adoc | 88 +
.../properties-async-logger-config.adoc | 0
.../systemproperties}/properties-async-logger.adoc | 0
.../systemproperties}/properties-async.adoc | 0
.../properties-configuration-factory.adoc | 2 +
.../properties-context-selector.adoc | 0
.../properties-garbage-collection.adoc | 0
.../systemproperties}/properties-jansi.adoc | 0
.../systemproperties}/properties-jmx.adoc | 0
.../systemproperties}/properties-jndi.adoc | 0
.../systemproperties}/properties-loader-util.adoc | 0
.../properties-log4j-core-misc.adoc | 0
.../systemproperties}/properties-log4j-jul.adoc | 0
.../properties-log4j-spring-boot.adoc | 0
.../systemproperties}/properties-meta.adoc | 0
.../systemproperties}/properties-provider.adoc | 0
.../properties-simple-logger.adoc | 0
.../properties-status-logger.adoc | 0
.../properties-thread-context.adoc | 0
.../properties-transport-security.adoc | 2 +-
85 files changed, 4719 insertions(+), 3001 deletions(-)
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters-select.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters-select.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters-select.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters-select.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/arbiters.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/logger-properties.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/logger-properties.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/logger-properties.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/logger-properties.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/loggers.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/loggers.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/loggers.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/loggers.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/main-elements.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/main-elements.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/main-elements.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/main-elements.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-example.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-example.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-example.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-example.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-recursion.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-recursion.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-recursion.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties-recursion.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/properties.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/routing.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/routing.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/routing.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/routing.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/scripts.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/scripts.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/scripts.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/scripts.yaml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/xinclude-appenders.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/xinclude-loggers.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/configuration/xinclude-main.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/filters/filters.json
create mode 100644 src/site/antora/modules/ROOT/examples/manual/filters/filters.properties
create mode 100644 src/site/antora/modules/ROOT/examples/manual/filters/filters.xml
create mode 100644 src/site/antora/modules/ROOT/examples/manual/filters/filters.yaml
create mode 100644 src/site/antora/modules/ROOT/pages/manual/scripts.adoc
rename src/site/antora/modules/ROOT/pages/manual/{_properties.adoc => systemproperties.adoc} (86%)
create mode 100644 src/site/antora/modules/ROOT/partials/configuration-file-format-deps.adoc
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-async-logger-config.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-async-logger.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-async.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-configuration-factory.adoc (94%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-context-selector.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-garbage-collection.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-jansi.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-jmx.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-jndi.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-loader-util.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-log4j-core-misc.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-log4j-jul.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-log4j-spring-boot.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-meta.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-provider.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-simple-logger.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-status-logger.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-thread-context.adoc (100%)
rename src/site/antora/modules/ROOT/partials/{ => manual/systemproperties}/properties-transport-security.adoc (98%)
(logging-log4j2) 01/01: Merge branch 'doc/2.x/configuration' into 2.x
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c1459aa0c1b085377edb0643c08de623fdf96e7d
Merge: f1de65f839 cd69a989ee
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu May 16 09:25:54 2024 +0200
Merge branch 'doc/2.x/configuration' into 2.x
.../manual/configuration/arbiters-select.json | 29 +
.../configuration/arbiters-select.properties | 32 +
.../manual/configuration/arbiters-select.xml | 42 +
.../manual/configuration/arbiters-select.yaml | 35 +
.../examples/manual/configuration/arbiters.json | 33 +
.../manual/configuration/arbiters.properties | 32 +
.../examples/manual/configuration/arbiters.xml | 38 +
.../examples/manual/configuration/arbiters.yaml | 34 +
.../manual/configuration/logger-properties.json | 29 +
.../configuration/logger-properties.properties | 32 +
.../manual/configuration/logger-properties.xml | 37 +
.../manual/configuration/logger-properties.yaml | 34 +
.../examples/manual/configuration/loggers.json | 37 +
.../manual/configuration/loggers.properties | 33 +
.../ROOT/examples/manual/configuration/loggers.xml | 40 +
.../examples/manual/configuration/loggers.yaml | 37 +
.../manual/configuration/main-elements.json | 47 +
.../manual/configuration/main-elements.properties | 40 +
.../manual/configuration/main-elements.xml | 43 +
.../manual/configuration/main-elements.yaml | 42 +
.../manual/configuration/properties-example.json | 14 +
.../configuration/properties-example.properties | 18 +
.../manual/configuration/properties-example.xml | 21 +
.../manual/configuration/properties-example.yaml | 22 +
.../manual/configuration/properties-recursion.json | 18 +
.../configuration/properties-recursion.properties | 19 +
.../manual/configuration/properties-recursion.xml | 22 +
.../manual/configuration/properties-recursion.yaml | 24 +
.../examples/manual/configuration/properties.json | 17 +
.../manual/configuration/properties.properties | 19 +
.../examples/manual/configuration/properties.xml | 28 +
.../examples/manual/configuration/properties.yaml | 24 +
.../examples/manual/configuration/routing.json | 34 +
.../manual/configuration/routing.properties | 37 +
.../ROOT/examples/manual/configuration/routing.xml | 45 +
.../examples/manual/configuration/routing.yaml | 36 +
.../examples/manual/configuration/scripts.json | 65 +
.../manual/configuration/scripts.properties | 67 +
.../ROOT/examples/manual/configuration/scripts.xml | 68 +
.../examples/manual/configuration/scripts.yaml | 70 +
.../manual/configuration/xinclude-appenders.xml | 25 +
.../manual/configuration/xinclude-loggers.xml | 25 +
.../manual/configuration/xinclude-main.xml | 29 +
.../ROOT/examples/manual/filters/filters.json | 36 +
.../examples/manual/filters/filters.properties | 38 +
.../ROOT/examples/manual/filters/filters.xml | 42 +
.../ROOT/examples/manual/filters/filters.yaml | 41 +
src/site/antora/modules/ROOT/nav.adoc | 19 +-
src/site/antora/modules/ROOT/pages/log4j-jul.adoc | 21 +-
.../pages/log4j-spring-cloud-config-client.adoc | 8 +-
.../modules/ROOT/pages/manual/appenders.adoc | 1109 ++++----
.../modules/ROOT/pages/manual/architecture.adoc | 38 +-
.../antora/modules/ROOT/pages/manual/async.adoc | 78 +-
.../modules/ROOT/pages/manual/configuration.adoc | 2807 ++++++++------------
.../antora/modules/ROOT/pages/manual/filters.adoc | 256 +-
.../modules/ROOT/pages/manual/garbagefree.adoc | 105 +-
.../modules/ROOT/pages/manual/installation.adoc | 88 +-
src/site/antora/modules/ROOT/pages/manual/jmx.adoc | 21 +-
.../antora/modules/ROOT/pages/manual/layouts.adoc | 505 ++--
.../antora/modules/ROOT/pages/manual/lookups.adoc | 8 +-
.../modules/ROOT/pages/manual/migration.adoc | 2 +-
.../antora/modules/ROOT/pages/manual/scripts.adoc | 127 +
.../{_properties.adoc => systemproperties.adoc} | 38 +-
.../antora/modules/ROOT/pages/manual/webapp.adoc | 1 +
.../modules/ROOT/pages/plugin-reference.adoc | 767 ++++++
.../partials/configuration-file-format-deps.adoc | 88 +
.../properties-async-logger-config.adoc | 0
.../systemproperties}/properties-async-logger.adoc | 0
.../systemproperties}/properties-async.adoc | 0
.../properties-configuration-factory.adoc | 2 +
.../properties-context-selector.adoc | 0
.../properties-garbage-collection.adoc | 0
.../systemproperties}/properties-jansi.adoc | 0
.../systemproperties}/properties-jmx.adoc | 0
.../systemproperties}/properties-jndi.adoc | 0
.../systemproperties}/properties-loader-util.adoc | 0
.../properties-log4j-core-misc.adoc | 0
.../systemproperties}/properties-log4j-jul.adoc | 0
.../properties-log4j-spring-boot.adoc | 0
.../systemproperties}/properties-meta.adoc | 0
.../systemproperties}/properties-provider.adoc | 0
.../properties-simple-logger.adoc | 0
.../properties-status-logger.adoc | 0
.../properties-thread-context.adoc | 0
.../properties-transport-security.adoc | 2 +-
85 files changed, 4719 insertions(+), 3001 deletions(-)