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
The following commit(s) were added to refs/heads/2.x by this push:
new 37122bda29 Backports from `main` changes irrelevant to code
(log4j-1.2-api)
37122bda29 is described below
commit 37122bda29de81f584e55d870faff1e549a32df5
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Wed Mar 29 23:30:08 2023 +0200
Backports from `main` changes irrelevant to code (log4j-1.2-api)
Backports differences regarding Javadoc and `final` modifiers on private
fields.
---
.../src/main/java/org/apache/log4j/LogManager.java | 5 ++---
log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java | 2 +-
.../src/main/java/org/apache/log4j/WriterAppender.java | 7 ++++++-
.../main/java/org/apache/log4j/bridge/LayoutAdapter.java | 2 +-
.../org/apache/log4j/bridge/RewritePolicyAdapter.java | 1 +
.../java/org/apache/log4j/builders/AbstractBuilder.java | 2 +-
.../java/org/apache/log4j/builders/BuilderManager.java | 3 +--
.../log4j/builders/appender/AsyncAppenderBuilder.java | 8 ++++----
.../appender/DailyRollingFileAppenderBuilder.java | 4 ++--
.../log4j/builders/appender/RewriteAppenderBuilder.java | 8 ++++----
.../builders/appender/RollingFileAppenderBuilder.java | 5 +++--
.../log4j/builders/filter/LevelMatchFilterBuilder.java | 2 +-
.../org/apache/log4j/config/Log4j1Configuration.java | 2 +-
.../java/org/apache/log4j/config/PropertySetter.java | 6 +++---
.../java/org/apache/log4j/helpers/OptionConverter.java | 2 ++
.../java/org/apache/log4j/layout/Log4j1SyslogLayout.java | 2 +-
.../java/org/apache/log4j/layout/Log4j1XmlLayout.java | 2 +-
.../main/java/org/apache/log4j/or/ObjectRenderer.java | 2 ++
.../src/main/java/org/apache/log4j/or/RendererMap.java | 3 ++-
.../src/main/java/org/apache/log4j/spi/ErrorCode.java | 2 +-
.../src/main/java/org/apache/log4j/spi/LoggingEvent.java | 2 +-
.../main/java/org/apache/log4j/xml/XmlConfiguration.java | 16 ++++++++++++----
.../java/org/apache/log4j/BasicConfigurationFactory.java | 2 +-
23 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
index ec48d3ea64..68e82ff915 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/LogManager.java
@@ -67,8 +67,7 @@ public final class LogManager {
static {
LOG4J_CORE_PRESENT = checkLog4jCore();
- //
- // By default we use a DefaultRepositorySelector which always returns
'hierarchy'.
+ // By default, we use a DefaultRepositorySelector which always returns
'hierarchy'.
final Hierarchy hierarchy = new Hierarchy(new RootLogger(Level.DEBUG));
repositorySelector = new DefaultRepositorySelector(hierarchy);
}
@@ -98,7 +97,7 @@ public final class LogManager {
/**
* Gets a LoggerContext.
*
- * @param loader The ClassLoader for the context. If null the context will
attempt to determine the appropriate
+ * @param classLoader The ClassLoader for the context. If null the context
will attempt to determine the appropriate
* ClassLoader.
* @return a LoggerContext.
*/
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
index 48ef698d0e..ad902d21e6 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
@@ -28,7 +28,7 @@ import org.apache.logging.log4j.ThreadContext;
*/
public final class MDC {
- private static ThreadLocal<Map<String, Object>> localMap =
+ private static final ThreadLocal<Map<String, Object>> localMap =
new InheritableThreadLocal<Map<String, Object>>() {
@Override
protected Map<String, Object> initialValue() {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
index c386faa4c5..760449c237 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/WriterAppender.java
@@ -53,7 +53,7 @@ public class WriterAppender extends AppenderSkeleton {
/**
* The encoding to use when writing. <p>The
- * <code>encoding</code> variable is set to <code>null</null> by
+ * <code>encoding</code> variable is set to <code>null</code> by
* default which results in the utilization of the system's default
* encoding.
*/
@@ -76,6 +76,8 @@ public class WriterAppender extends AppenderSkeleton {
* Instantiate a WriterAppender and set the output destination to a
* new {@link OutputStreamWriter} initialized with <code>os</code>
* as its {@link OutputStream}.
+ * @param layout The Layout.
+ * @param os The OutputStream.
*/
public WriterAppender(Layout layout, OutputStream os) {
this(layout, new OutputStreamWriter(os));
@@ -87,6 +89,9 @@ public class WriterAppender extends AppenderSkeleton {
*
* <p>The <code>writer</code> must have been previously opened by
* the user.
+ *
+ * @param layout The Layout.
+ * @param writer The Writer.
*/
public WriterAppender(Layout layout, Writer writer) {
this.layout = layout;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
index 515f818de9..a98b0a8646 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/LayoutAdapter.java
@@ -27,7 +27,7 @@ import
org.apache.logging.log4j.core.layout.ByteBufferDestination;
* Class Description goes here.
*/
public class LayoutAdapter implements
org.apache.logging.log4j.core.Layout<String> {
- private Layout layout;
+ private final Layout layout;
/**
* Adapts a Log4j 1.x layout into a Log4j 2.x layout. Applying this method
to
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyAdapter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyAdapter.java
index cf0b42b40e..cd03754845 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyAdapter.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/bridge/RewritePolicyAdapter.java
@@ -30,6 +30,7 @@ public class RewritePolicyAdapter implements
org.apache.logging.log4j.core.appen
/**
* Constructor.
+ * @param policy The Rewrite policy.
*/
public RewritePolicyAdapter(RewritePolicy policy) {
this.policy = policy;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
index 16240f45a5..f2605ace91 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/AbstractBuilder.java
@@ -45,7 +45,7 @@ import org.w3c.dom.Element;
*/
public abstract class AbstractBuilder<T> implements Builder<T> {
- private static Logger LOGGER = StatusLogger.getLogger();
+ private static final Logger LOGGER = StatusLogger.getLogger();
protected static final String FILE_PARAM = "File";
protected static final String APPEND_PARAM = "Append";
protected static final String BUFFERED_IO_PARAM = "BufferedIO";
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
index dba7d267df..f0a86943fc 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/BuilderManager.java
@@ -56,9 +56,8 @@ public class BuilderManager {
public static final Filter INVALID_FILTER = new FilterWrapper(null);
public static final Layout INVALID_LAYOUT = new LayoutWrapper(null);
public static final RewritePolicy INVALID_REWRITE_POLICY = new
RewritePolicyWrapper(null);
-
private static final Logger LOGGER = StatusLogger.getLogger();
- private static Class<?>[] CONSTRUCTOR_PARAMS = new Class[] {String.class,
Properties.class};
+ private static final Class<?>[] CONSTRUCTOR_PARAMS = new Class[] {
String.class, Properties.class };
private final Map<String, PluginType<?>> plugins;
/**
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
index f4efbae0c0..51fdc14137 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/AsyncAppenderBuilder.java
@@ -39,6 +39,7 @@ import org.apache.log4j.config.PropertiesConfiguration;
import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.xml.XmlConfiguration;
+import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.appender.AsyncAppender;
import org.apache.logging.log4j.core.appender.AsyncAppender.Builder;
@@ -48,9 +49,8 @@ import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
import org.w3c.dom.Element;
-
/**
- * Build an Asynch Appender
+ * Build an Async Appender
*/
@Plugin(name = "org.apache.log4j.AsyncAppender", category = CATEGORY)
public class AsyncAppenderBuilder extends AbstractBuilder implements
AppenderBuilder {
@@ -138,8 +138,8 @@ public class AsyncAppenderBuilder extends AbstractBuilder
implements AppenderBui
LOGGER.error("No appender references configured for AsyncAppender
{}", name);
return null;
}
- final org.apache.logging.log4j.Level logLevel =
OptionConverter.convertLevel(level,
- org.apache.logging.log4j.Level.TRACE);
+ final Level logLevel = OptionConverter.convertLevel(level,
+ Level.TRACE);
final AppenderRef[] refs = new AppenderRef[appenderRefs.length];
int index = 0;
for (final String appenderRef : appenderRefs) {
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
index 13ff6d088b..ada06424da 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/DailyRollingFileAppenderBuilder.java
@@ -130,8 +130,8 @@ public class DailyRollingFileAppenderBuilder extends
AbstractBuilder implements
final boolean bufferedIo = getBooleanProperty(BUFFERED_IO_PARAM,
false);
final int bufferSize = getIntegerProperty(BUFFER_SIZE_PARAM, 8192);
final String datePattern = getProperty(DATE_PATTERN_PARAM,
DEFAULT_DATE_PATTERN);
- return createAppender(name, layout, filter, fileName, append,
immediateFlush,
- level, bufferedIo, bufferSize, datePattern, configuration);
+ return createAppender(name, layout, filter, fileName, append,
immediateFlush, level, bufferedIo, bufferSize,
+ datePattern, configuration);
}
private <T extends Log4j1Configuration> Appender createAppender(final
String name, final Layout layout,
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
index 303bb8c633..bcfcf86782 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RewriteAppenderBuilder.java
@@ -40,6 +40,7 @@ import org.apache.log4j.helpers.OptionConverter;
import org.apache.log4j.rewrite.RewritePolicy;
import org.apache.log4j.spi.Filter;
import org.apache.log4j.xml.XmlConfiguration;
+import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.core.appender.rewrite.RewriteAppender;
import org.apache.logging.log4j.core.config.AppenderRef;
@@ -48,9 +49,8 @@ import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.Strings;
import org.w3c.dom.Element;
-
/**
- * Build an Asynch Appender
+ * Build a Rewrite Appender
*/
@Plugin(name = "org.apache.log4j.rewrite.RewriteAppender", category = CATEGORY)
public class RewriteAppenderBuilder extends AbstractBuilder implements
AppenderBuilder {
@@ -128,8 +128,8 @@ public class RewriteAppenderBuilder extends AbstractBuilder
implements AppenderB
LOGGER.error("No appender references configured for
RewriteAppender {}", name);
return null;
}
- final org.apache.logging.log4j.Level logLevel =
OptionConverter.convertLevel(level,
- org.apache.logging.log4j.Level.TRACE);
+ final Level logLevel = OptionConverter.convertLevel(level,
+ Level.TRACE);
final AppenderRef[] refs = new AppenderRef[appenderRefs.length];
int index = 0;
for (final String appenderRef : appenderRefs) {
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
index 25b740edf8..2a9ee41731 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/appender/RollingFileAppenderBuilder.java
@@ -139,8 +139,9 @@ public class RollingFileAppenderBuilder extends
AbstractBuilder implements Appen
}
private Appender createAppender(final String name, final
Log4j1Configuration config, final Layout layout,
- final Filter filter, final boolean append, final boolean
bufferedIo, final int bufferSize, boolean immediateFlush,
- final String fileName, final String level, final String maxSize,
final String maxBackups) {
+ final Filter filter, final boolean append, final boolean
bufferedIo, final int bufferSize,
+ boolean immediateFlush, final String fileName, final String level,
final String maxSize,
+ final String maxBackups) {
org.apache.logging.log4j.core.Layout<?> fileLayout =
LayoutAdapter.adapt(layout);
if (!bufferedIo) {
immediateFlush = false;
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
index 2e8a487cbc..e09c1c2de9 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/builders/filter/LevelMatchFilterBuilder.java
@@ -35,7 +35,7 @@ import org.apache.logging.log4j.core.filter.LevelMatchFilter;
import org.w3c.dom.Element;
/**
- * Build a Level match failter.
+ * Build a Level match filter.
*/
@Plugin(name = "org.apache.log4j.varia.LevelMatchFilter", category = CATEGORY)
public class LevelMatchFilterBuilder extends AbstractBuilder<Filter>
implements FilterBuilder {
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 5e2008383c..7864e91f32 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
@@ -25,7 +25,7 @@ import
org.apache.logging.log4j.core.config.ConfigurationSource;
import org.apache.logging.log4j.core.config.Reconfigurable;
/**
- * Class Description goes here.
+ * Base Configuration for Log4j 1.
*/
public class Log4j1Configuration extends AbstractConfiguration implements
Reconfigurable {
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
index d7475c6487..7ee650ef4c 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/config/PropertySetter.java
@@ -57,13 +57,13 @@ import org.apache.logging.log4j.status.StatusLogger;
*/
public class PropertySetter {
private static final PropertyDescriptor[] EMPTY_PROPERTY_DESCRIPTOR_ARRAY
= {};
- private static Logger LOGGER = StatusLogger.getLogger();
+ private static final Logger LOGGER = StatusLogger.getLogger();
protected Object obj;
protected PropertyDescriptor[] props;
/**
* Create a new PropertySetter for the specified Object. This is done
- * in prepartion for invoking {@link #setProperty} one or more times.
+ * in preparation for invoking {@link #setProperty} one or more times.
*
* @param obj the object for which to set properties
*/
@@ -99,7 +99,7 @@ public class PropertySetter {
}
/**
- * Set the properites for the object that match the
+ * Set the properties for the object that match the
* <code>prefix</code> passed as parameter.
* @param properties The properties.
* @param prefix The prefix of the properties to use.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
index 9e108164b2..a96282b061 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/OptionConverter.java
@@ -394,6 +394,8 @@ public class OptionConverter {
* <code>val</code> contains a start delimeter "${" which is not
* balanced by a stop delimeter "}". </p>
*
+ * <p><b>Author</b> Avy Sharell</p>
+ *
* @param val The string on which variable substitution is performed.
* @param props The properties to use for the substitution.
* @return The substituted string.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1SyslogLayout.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1SyslogLayout.java
index beb0aff3bd..0134a9392d 100644
---
a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1SyslogLayout.java
+++
b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1SyslogLayout.java
@@ -158,7 +158,7 @@ public final class Log4j1SyslogLayout extends
AbstractStringLayout {
}
/**
- * Formats a {@link org.apache.logging.log4j.core.LogEvent} in conformance
with the BSD Log record format.
+ * Formats a {@link LogEvent} in conformance with the BSD Log record
format.
*
* @param event The LogEvent
* @return the event formatted as a String.
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
index b244016a89..678dacf506 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
@@ -50,7 +50,7 @@ public final class Log4j1XmlLayout extends
AbstractStringLayout {
@PluginFactory
public static Log4j1XmlLayout createLayout(
- // @formatter:off
+ // @formatter:off
@PluginAttribute(value = "locationInfo") final boolean
locationInfo,
@PluginAttribute(value = "properties") final boolean properties
// @formatter:on
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
index f3fed18570..4e627c24ac 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/ObjectRenderer.java
@@ -22,6 +22,8 @@ package org.apache.log4j.or;
public interface ObjectRenderer {
/**
* Render the object passed as parameter as a String.
+ * @param o The object to render.
+ * @return The String representation of the object.
*/
String doRender(Object o);
}
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
index 28f5065457..c199a56f56 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/or/RendererMap.java
@@ -26,7 +26,8 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Map class objects to an {@link ObjectRenderer}.
- *
+ *
+ * @author Ceki Gülcü
* @since version 1.0
*/
public class RendererMap {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
index 3de40ca47f..752b077a84 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/ErrorCode.java
@@ -19,7 +19,7 @@ package org.apache.log4j.spi;
/**
- This interface defines commonly encoutered error codes.
+ This interface defines commonly encountered error codes.
*/
public interface ErrorCode {
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
index f22c34e012..73dd528efc 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/spi/LoggingEvent.java
@@ -209,7 +209,7 @@ public class LoggingEvent {
}
/**
- Return this event's throwable's string[] representaion.
+ Return this event's throwable's string[] representation.
@return Always returns null.
*/
public String[] getThrowableStrRep() {
diff --git
a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
index a24a3515a0..d8fee4d987 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java
@@ -110,9 +110,9 @@ public class XmlConfiguration extends Log4j1Configuration {
protected static final String DEFAULT_PREFIX = "log4j";
// key: appenderName, value: appender
- private Map<String, Appender> appenderMap;
+ private final Map<String, Appender> appenderMap;
- private Properties props = null;
+ private final Properties props = null;
public XmlConfiguration(final LoggerContext loggerContext, final
ConfigurationSource source,
int monitorIntervalSeconds) {
@@ -153,7 +153,7 @@ public class XmlConfiguration extends Log4j1Configuration {
try {
LOGGER.debug("System property is : {}",
OptionConverter.getSystemProperty(dbfKey, null));
dbf = DocumentBuilderFactory.newInstance();
- LOGGER.debug("Standard DocumentBuilderFactory search succeded.");
+ LOGGER.debug("Standard DocumentBuilderFactory search succeeded.");
LOGGER.debug("DocumentBuilderFactory is: " +
dbf.getClass().getName());
} catch (FactoryConfigurationError fce) {
Exception e = fce.getException();
@@ -352,6 +352,8 @@ public class XmlConfiguration extends Log4j1Configuration {
/**
* Used internally to parse appenders by IDREF element.
+ * @param appenderRef The Appender Reference Element.
+ * @return The Appender.
*/
public Appender findAppenderByReference(Element appenderRef) {
String appenderName = subst(appenderRef.getAttribute(REF_ATTR));
@@ -361,6 +363,8 @@ public class XmlConfiguration extends Log4j1Configuration {
/**
* Used internally to parse an appender element.
+ * @param appenderElement The Appender Element.
+ * @return The Appender.
*/
public Appender parseAppender(Element appenderElement) {
String className = subst(appenderElement.getAttribute(CLASS_ATTR));
@@ -500,6 +504,8 @@ public class XmlConfiguration extends Log4j1Configuration {
/**
* Used internally to parse a filter element.
+ * @param filterElement The Filter Element.
+ * @return The Filter.
*/
public void addFilter(final AtomicReference<Filter> ref, final Element
filterElement) {
final Filter value = parseFilters(filterElement);
@@ -567,7 +573,7 @@ public class XmlConfiguration extends Log4j1Configuration {
}
/**
- * Used internally to parse the roor category element.
+ * Used internally to parse the root category element.
*/
private void parseRoot(Element rootElement) {
LoggerConfig root = getRootLogger();
@@ -613,6 +619,8 @@ public class XmlConfiguration extends Log4j1Configuration {
/**
* Used internally to parse a layout element.
+ * @param layoutElement The Layout Element.
+ * @return The Layout.
*/
public Layout parseLayout(Element layoutElement) {
String className = subst(layoutElement.getAttribute(CLASS_ATTR));
diff --git
a/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java
b/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java
index d231d82346..b205705970 100644
---
a/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java
+++
b/log4j-1.2-api/src/test/java/org/apache/log4j/BasicConfigurationFactory.java
@@ -46,7 +46,7 @@ public class BasicConfigurationFactory extends
ConfigurationFactory {
return new BasicConfiguration(loggerContext);
}
- public class BasicConfiguration extends AbstractConfiguration {
+ public static class BasicConfiguration extends AbstractConfiguration {
private static final long serialVersionUID = -2716784321395089563L;
