You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2022/01/13 12:50:44 UTC
[logging-log4j2] branch release-2.x updated (9af3874 -> c0faed9)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from 9af3874 Add class from version 1.2.17.
new 7cfbea5 Rename local typed as a ConfigurationSource to avoid confusion with Source.
new c0faed9 Use generics.
The 2 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:
.../main/java/org/apache/log4j/config/Log4j1Configuration.java | 9 ++++-----
.../java/org/apache/log4j/config/Log4j1ConfigurationParser.java | 6 +++---
2 files changed, 7 insertions(+), 8 deletions(-)
[logging-log4j2] 01/02: Rename local typed as a ConfigurationSource to avoid confusion with Source.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 7cfbea5d05ab64780c2724bcb000840de2b32d9e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 07:46:38 2022 -0500
Rename local typed as a ConfigurationSource to avoid confusion with
Source.
---
.../main/java/org/apache/log4j/config/Log4j1Configuration.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1Configuration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1Configuration.java
index 8be2ae8..ae733a1 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1Configuration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1Configuration.java
@@ -36,13 +36,12 @@ public class Log4j1Configuration extends AbstractConfiguration implements Reconf
public static final String NULL = "null";
- protected final BuilderManager manager;
+ protected final BuilderManager manager = new BuilderManager();
- public Log4j1Configuration(final LoggerContext loggerContext, final ConfigurationSource source,
+ public Log4j1Configuration(final LoggerContext loggerContext, final ConfigurationSource configurationSource,
int monitorIntervalSeconds) {
- super(loggerContext, source);
- manager = new BuilderManager();
- initializeWatchers(this, source, monitorIntervalSeconds);
+ super(loggerContext, configurationSource);
+ initializeWatchers(this, configurationSource, monitorIntervalSeconds);
}
public BuilderManager getBuilderManager() {
[logging-log4j2] 02/02: Use generics.
Posted by gg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit c0faed9fbe975bedbc81e46f53891d06307301cb
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu Jan 13 07:50:40 2022 -0500
Use generics.
---
.../java/org/apache/log4j/config/Log4j1ConfigurationParser.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
index 8fa269a..63f79ff 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
@@ -257,7 +257,7 @@ public class Log4j1ConfigurationParser {
builder.add(appenderBuilder);
}
- private void buildAttribute(final String componentName, final ComponentBuilder componentBuilder,
+ private void buildAttribute(final String componentName, final ComponentBuilder<?> componentBuilder,
final String sourceAttributeName, final String targetAttributeName) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName);
if (attributeValue != null) {
@@ -265,13 +265,13 @@ public class Log4j1ConfigurationParser {
}
}
- private void buildAttributeWithDefault(final String componentName, final ComponentBuilder componentBuilder,
+ private void buildAttributeWithDefault(final String componentName, final ComponentBuilder<?> componentBuilder,
final String sourceAttributeName, final String targetAttributeName, final String defaultValue) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName, defaultValue);
componentBuilder.addAttribute(targetAttributeName, attributeValue);
}
- private void buildMandatoryAttribute(final String componentName, final ComponentBuilder componentBuilder,
+ private void buildMandatoryAttribute(final String componentName, final ComponentBuilder<?> componentBuilder,
final String sourceAttributeName, final String targetAttributeName) {
final String attributeValue = getLog4jAppenderValue(componentName, sourceAttributeName);
if (attributeValue != null) {