-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move configuration format converter from log4j-1.2-api
#93
Draft
ppkarwasz
wants to merge
84
commits into
main
Choose a base branch
from
feature/log4j-config-converter
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/log4j2/trunk@1241269 13f79535-47bb-0310-9956-ffa450edef68
start, with the ConsoleAppender.
Partial support for XML and HTML layouts (defaults only).
Partial support for TTCC layout (defaults only).
Partial support for EnhancedPatternLayout (defaults only).
Complete TTCC layout.
The Core AbstractConfiguration should track its LoggerContext.
at end of every line.
…s (#737) * Fixes default Log4j 1.x values The properties of the generated appenders are not always the same as it was in Log4j 1.x. * Fixes NoSuchFieldError Adapts `getAppendProperty` to different Java versions. * Fixes whitespace problems Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/ConsoleAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/FileAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/HtmlLayoutBuilder.java log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationTest.java
Tests are from PR #762 by ppkarwasz. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java log4j-1.2-api/src/test/java/org/apache/log4j/config/PropertiesConfigurationTest.java
The `log4j.threshold` configuration key was not translated into its Log4j 2.x equivalent global filter. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
Synchronizes `log4j-1.2-api` main source with version 2.17.2. It mainly consists of: * formatting, * `final` modifiers, * the removal of the deprecated `Holder` class.
When custom levels are in play the names of Log4j 1.x custom levels (which are not unique) and those of Log4j 2.x custom levels (which must be unique) do not match. There is a need therefore for a pattern converter specific to Log4j 1.x. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/SimpleLayoutBuilder.java
Although `%pid` was never a valid Log4j 1.x pattern, it was supported in the previous bridge versions. This fixes a regression with respect to `log4j-1.2-api` version 2.17.2. Conflicts: log4j-1.2-api/src/main/java/org/apache/log4j/builders/layout/PatternLayoutBuilder.java
- Moved Plugin::category into recently created annotation Category::value - Category is no longer a qualifier type but instead a namespace for Key. - Allow for stereotype annotations for Category to make categories annotation-type-safe when desired (including new TypeConverterCategory stereotype) - Rename Plugin::name to Plugin::value and make it optional, defaulting to the simple class name of the annotated class - Add PluginEntry::getElementName to more consistently store element names along with refactoring to use a builder pattern - Fix PluginElementVisitor to fall back to checking a plugin name when the element name isn't defined. This inconsistency arose from a typo somewhere. - Update PluginOrder to fall back to comparing by class name when neither class is annotated - Replace Named with Category when injecting plugin categories - Update docs to clarify that plugin categories are namespaces Signed-off-by: Matt Sicker <[email protected]>
This commit ensures that: * an `InstanceFactory` is created in the Log4j `Provider`, * the same factory is injected as parameters to all the components of the chain `Log4jContextFactory`, `ContextSelector`, `LoggerContext` (child), `Configuration` (grand-child). * `DI.createInstanceFactory` is called only when strictly necessary.
ppkarwasz
added a commit
to apache/logging-log4j2
that referenced
this pull request
Apr 1, 2024
We remove the command line tools to generate logger wrappers and convert Log4j 1.x configuration. The tools have been submitted to Log4j Transform: * apache/logging-log4j-transform#92 * apache/logging-log4j-transform#93 and are not necessary at runtime. The `Log4j1ConfigurationFactory` that has been removed from `log4j-1.2-api` is an **older** and deprecated version of the `PropertiesConfigurationFactory`.
ppkarwasz
added a commit
to apache/logging-log4j2
that referenced
this pull request
Apr 1, 2024
We remove the command line tools to generate logger wrappers and convert Log4j 1.x configuration. The tools have been submitted to Log4j Transform: * apache/logging-log4j-transform#92 * apache/logging-log4j-transform#93 and are not necessary at runtime. The `Log4j1ConfigurationFactory` that has been removed from `log4j-1.2-api` is an **older** and deprecated version of the `PropertiesConfigurationFactory`.
ppkarwasz
added a commit
to apache/logging-log4j2
that referenced
this pull request
Apr 1, 2024
We remove the command line tools to generate logger wrappers and convert Log4j 1.x configuration. The tools have been submitted to Log4j Transform: * apache/logging-log4j-transform#92 * apache/logging-log4j-transform#93 and are not necessary at runtime. The `Log4j1ConfigurationFactory` that has been removed from `log4j-1.2-api` is an **older** and deprecated version of the `PropertiesConfigurationFactory`.
ppkarwasz
added a commit
to apache/logging-log4j2
that referenced
this pull request
Apr 3, 2024
We remove the command line tools to generate logger wrappers and convert Log4j 1.x configuration. The tools have been submitted to Log4j Transform: * apache/logging-log4j-transform#92 * apache/logging-log4j-transform#93 and are not necessary at runtime. The `Log4j1ConfigurationFactory` that has been removed from `log4j-1.2-api` is an **older** and deprecated version of the `PropertiesConfigurationFactory`.
ppkarwasz
added a commit
to apache/logging-log4j2
that referenced
this pull request
Apr 4, 2024
We remove the command line tools to generate logger wrappers and convert Log4j 1.x configuration. The tools have been submitted to Log4j Transform: * apache/logging-log4j-transform#92 * apache/logging-log4j-transform#93 and are not necessary at runtime. The `Log4j1ConfigurationFactory` that has been removed from `log4j-1.2-api` is an **older** and deprecated version of the `PropertiesConfigurationFactory`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This moves the converter between
log4j.properties
andlog4j2.xml
fromlog4j-1.2-api
to a newlog4j-config-converter
artifact.