You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/10/25 08:55:18 UTC
[4/4] logging-log4j2 git commit: Checkstyle
Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/65dc9e86
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/65dc9e86
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/65dc9e86
Branch: refs/heads/master
Commit: 65dc9e860cff9e60d357867fb1488668c99cf049
Parents: 914ba98
Author: rpopma <rp...@apache.org>
Authored: Sun Oct 25 16:55:18 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Oct 25 16:55:18 2015 +0900
----------------------------------------------------------------------
.../core/appender/MemoryMappedFileAppender.java | 3 +-
.../core/appender/MemoryMappedFileManager.java | 3 +
.../log4j/core/appender/SocketAppender.java | 2 +-
.../log4j/core/appender/TlsSyslogFrame.java | 30 +--
.../ContextStackAttributeConverter.java | 2 +-
.../ContextStackJsonAttributeConverter.java | 2 +-
.../appender/db/jpa/converter/package-info.java | 11 +-
.../rolling/DefaultRolloverStrategy.java | 199 +++++++++----------
.../appender/rolling/RollingFileManager.java | 7 +-
.../log4j/core/async/RingBufferLogEvent.java | 2 +-
.../log4j/core/config/ConfigurationSource.java | 81 ++++----
.../log4j/core/config/DefaultConfiguration.java | 4 +-
.../core/config/FileConfigurationMonitor.java | 19 +-
.../api/ConfigurationBuilderFactory.java | 2 +-
.../log4j/core/config/plugins/Plugin.java | 6 +-
.../config/plugins/PluginBuilderAttribute.java | 6 +-
.../config/plugins/PluginBuilderFactory.java | 6 +-
.../config/plugins/PluginVisitorStrategy.java | 6 +-
.../config/plugins/convert/TypeConverter.java | 6 +-
.../config/plugins/convert/TypeConverters.java | 6 +-
.../log4j/core/config/plugins/package-info.java | 6 +-
.../config/plugins/processor/PluginCache.java | 6 +-
.../config/plugins/processor/PluginEntry.java | 6 +-
.../plugins/processor/PluginProcessor.java | 6 +-
.../config/plugins/processor/package-info.java | 6 +-
.../core/config/plugins/util/PluginBuilder.java | 6 +-
.../config/plugins/util/PluginRegistry.java | 6 +-
.../core/config/plugins/util/package-info.java | 6 +-
.../plugins/visitors/AbstractPluginVisitor.java | 6 +-
.../visitors/PluginAttributeVisitor.java | 6 +-
.../visitors/PluginBuilderAttributeVisitor.java | 6 +-
.../visitors/PluginConfigurationVisitor.java | 6 +-
.../plugins/visitors/PluginElementVisitor.java | 6 +-
.../plugins/visitors/PluginNodeVisitor.java | 6 +-
.../plugins/visitors/PluginValueVisitor.java | 6 +-
.../config/plugins/visitors/PluginVisitor.java | 6 +-
.../config/plugins/visitors/PluginVisitors.java | 6 +-
.../config/plugins/visitors/package-info.java | 6 +-
.../core/config/status/StatusConfiguration.java | 6 +-
.../jackson/ListOfMapEntryDeserializer.java | 2 +-
.../core/jackson/ListOfMapEntrySerializer.java | 2 -
.../logging/log4j/core/jackson/MapEntry.java | 6 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 15 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 18 +-
.../apache/logging/log4j/core/net/Priority.java | 2 +-
.../core/net/mom/jms/JmsQueueReceiver.java | 2 +-
.../core/net/mom/jms/JmsTopicReceiver.java | 2 +-
.../log4j/core/net/mom/jms/package-info.java | 2 +-
.../core/net/server/SecureTcpSocketServer.java | 4 +-
.../log4j/core/net/server/TcpSocketServer.java | 74 +++----
.../log4j/core/net/server/UdpSocketServer.java | 38 ++--
.../net/ssl/StoreConfigurationException.java | 30 +--
.../logging/log4j/core/osgi/Activator.java | 6 +-
.../logging/log4j/core/osgi/package-info.java | 6 +-
.../core/pattern/NanoTimePatternConverter.java | 14 +-
.../log4j/core/pattern/StyleConverter.java | 52 ++---
.../VariablesNotEmptyReplacementConverter.java | 26 +--
.../apache/logging/log4j/core/util/Builder.java | 6 +-
.../logging/log4j/core/util/Constants.java | 6 +-
.../util/DefaultShutdownCallbackRegistry.java | 4 +-
.../log4j/core/util/StringBuilderWriter.java | 6 +-
.../log4j/core/util/datetime/DateParser.java | 10 +-
.../log4j/core/util/datetime/DatePrinter.java | 10 +-
.../core/util/datetime/FastDateFormat.java | 10 +-
.../core/util/datetime/FastDateParser.java | 10 +-
.../core/util/datetime/FastDatePrinter.java | 10 +-
.../log4j/core/util/datetime/FormatCache.java | 10 +-
.../log4j/categories/PerformanceTests.java | 6 +-
.../logging/log4j/categories/package-info.java | 6 +-
.../log4j/core/config/ConfigurationTest.java | 6 +-
.../logging/log4j/core/config/XIncludeTest.java | 6 +-
.../plugins/convert/TypeConvertersTest.java | 6 +-
.../config/plugins/processor/FakePlugin.java | 6 +-
.../plugins/processor/PluginProcessorTest.java | 6 +-
.../log4j/core/lookup/Log4jLookupTest.java | 4 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 4 +-
.../apache/logging/log4j/core/util/Compare.java | 6 +-
.../core/util/UnexpectedFormatException.java | 6 +-
.../logging/log4j/junit/package-info.java | 6 +-
.../logging/log4j/test/AvailablePortFinder.java | 6 +-
80 files changed, 493 insertions(+), 481 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
index 02a56d9..365f6db 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileAppender.java
@@ -44,7 +44,8 @@ public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender
private static final long serialVersionUID = 1L;
- private static final int MAX_REGION_LENGTH = 1 << 30; // 1GB
+ private static final int BIT_POSITION_1GB = 30; // 2^30 ~= 1GB
+ private static final int MAX_REGION_LENGTH = 1 << BIT_POSITION_1GB;
private static final int MIN_REGION_LENGTH = 256;
private final String fileName;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
index 0aa4be6..7bd0eb5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/MemoryMappedFileManager.java
@@ -36,6 +36,8 @@ import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.util.Closer;
import org.apache.logging.log4j.core.util.NullOutputStream;
+//Lines too long...
+//CHECKSTYLE:OFF
/**
* Extends OutputStreamManager but instead of using a buffered output stream, this class maps a region of a file into
* memory and writes to this memory region.
@@ -51,6 +53,7 @@ import org.apache.logging.log4j.core.util.NullOutputStream;
*
* @since 2.1
*/
+//CHECKSTYLE:ON
public class MemoryMappedFileManager extends OutputStreamManager {
/**
* Default length of region to map.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 7e08c84..949eba8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -121,7 +121,7 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM
@PluginAttribute("immediateFlush") final String immediateFlush,
@PluginAttribute("ignoreExceptions") final String ignore,
@PluginElement("Layout") Layout<? extends Serializable> layout,
- @PluginElement("Filter") final Filter filter,
+ @PluginElement("Filter") final Filter filter,
@PluginAttribute("advertise") final String advertise, @PluginConfiguration final Configuration config) {
// @formatter:on
boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
index ebb3c47..f52167c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TlsSyslogFrame.java
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache license, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the license for the specific language governing permissions and
-* limitations under the license.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache license, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
+ */
package org.apache.logging.log4j.core.appender;
import java.nio.charset.Charset;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackAttributeConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackAttributeConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackAttributeConverter.java
index 670e0e4..18e1dbf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackAttributeConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackAttributeConverter.java
@@ -22,7 +22,7 @@ import javax.persistence.Converter;
import org.apache.logging.log4j.ThreadContext;
/**
- * A JPA 2.1 attribute converter for
+ * A JPA 2.1 attribute converter for
* {@link org.apache.logging.log4j.ThreadContext.ContextStack ThreadContext.ContextStack}s in
* {@link org.apache.logging.log4j.core.LogEvent}s. This converter is only capable of converting to {@link String}s. The
* {@link #convertToEntityAttribute(String)} method throws an {@link UnsupportedOperationException}. If you need to
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java
index 160829a..49dec9e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextStackJsonAttributeConverter.java
@@ -30,7 +30,7 @@ import org.apache.logging.log4j.util.Strings;
import com.fasterxml.jackson.core.type.TypeReference;
/**
- * A JPA 2.1 attribute converter for
+ * A JPA 2.1 attribute converter for
* {@link org.apache.logging.log4j.ThreadContext.ContextStack ThreadContext.ContextStack}s in
* {@link org.apache.logging.log4j.core.LogEvent}s. This converter is capable of converting both to and from
* {@link String}s.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/package-info.java
index 96a4fc2..2245fa7 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/package-info.java
@@ -14,16 +14,19 @@
* See the license for the specific language governing permissions and
* limitations under the license.
*/
+// Lines too long...
+//CHECKSTYLE:OFF
/**
* The converters in this package implement the JPA 2.1 mechanism for converting non-standard types to and from
* database fields. Most of these types are capable of two-way conversion and can be used to both persist and retrieve
- * entities. The
- * {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapAttributeConverter ContextMapAttributeConverter}
- * and {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextStackAttributeConverter ContextStackAttributeConverter}
+ * entities. The
+ * {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapAttributeConverter ContextMapAttributeConverter}
+ * and {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextStackAttributeConverter ContextStackAttributeConverter}
* only support persistence and not retrieval, persisting the type as a simple string. You can use the
- * {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapJsonAttributeConverter ContextMapJsonAttributeConverter}
+ * {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextMapJsonAttributeConverter ContextMapJsonAttributeConverter}
* and {@link org.apache.logging.log4j.core.appender.db.jpa.converter.ContextStackJsonAttributeConverter ContextStackJsonAttributeConverter}
* instead, which require the Jackson Data Processor dependency to also be on your class path.
*/
+//CHECKSTYLE:ON
package org.apache.logging.log4j.core.appender.db.jpa.converter;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
index af5ee25..f5472a3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java
@@ -39,42 +39,36 @@ import org.apache.logging.log4j.core.util.Integers;
import org.apache.logging.log4j.status.StatusLogger;
/**
- * When rolling over, <code>DefaultRolloverStrategy</code> renames files
- * according to an algorithm as described below.
+ * When rolling over, <code>DefaultRolloverStrategy</code> renames files according to an algorithm as described below.
*
* <p>
- * The DefaultRolloverStrategy is a combination of a time-based policy and a fixed-window policy. When
- * the file name pattern contains a date format then the rollover time interval will be used to calculate the
- * time to use in the file pattern. When the file pattern contains an integer replacement token one of the
- * counting techniques will be used.
+ * The DefaultRolloverStrategy is a combination of a time-based policy and a fixed-window policy. When the file name
+ * pattern contains a date format then the rollover time interval will be used to calculate the time to use in the file
+ * pattern. When the file pattern contains an integer replacement token one of the counting techniques will be used.
* </p>
* <p>
- * When the ascending attribute is set to true (the default) then the counter will be incremented and the
- * current log file will be renamed to include the counter value. If the counter hits the maximum value then
- * the oldest file, which will have the smallest counter, will be deleted, all other files will be renamed to
- * have their counter decremented and then the current file will be renamed to have the maximum counter value.
- * Note that with this counting strategy specifying a large maximum value may entirely avoid renaming files.
+ * When the ascending attribute is set to true (the default) then the counter will be incremented and the current log
+ * file will be renamed to include the counter value. If the counter hits the maximum value then the oldest file, which
+ * will have the smallest counter, will be deleted, all other files will be renamed to have their counter decremented
+ * and then the current file will be renamed to have the maximum counter value. Note that with this counting strategy
+ * specifying a large maximum value may entirely avoid renaming files.
* </p>
* <p>
* When the ascending attribute is false, then the "normal" fixed-window strategy will be used.
* </p>
* <p>
- * Let <em>max</em> and <em>min</em> represent the values of respectively
- * the <b>MaxIndex</b> and <b>MinIndex</b> options. Let "foo.log" be the value
- * of the <b>ActiveFile</b> option and "foo.%i.log" the value of
- * <b>FileNamePattern</b>. Then, when rolling over, the file
- * <code>foo.<em>max</em>.log</code> will be deleted, the file
- * <code>foo.<em>max-1</em>.log</code> will be renamed as
- * <code>foo.<em>max</em>.log</code>, the file <code>foo.<em>max-2</em>.log</code>
- * renamed as <code>foo.<em>max-1</em>.log</code>, and so on,
- * the file <code>foo.<em>min+1</em>.log</code> renamed as
- * <code>foo.<em>min+2</em>.log</code>. Lastly, the active file <code>foo.log</code>
- * will be renamed as <code>foo.<em>min</em>.log</code> and a new active file name
+ * Let <em>max</em> and <em>min</em> represent the values of respectively the <b>MaxIndex</b> and <b>MinIndex</b>
+ * options. Let "foo.log" be the value of the <b>ActiveFile</b> option and "foo.%i.log" the value of
+ * <b>FileNamePattern</b>. Then, when rolling over, the file <code>foo.<em>max</em>.log</code> will be deleted, the file
+ * <code>foo.<em>max-1</em>.log</code> will be renamed as <code>foo.<em>max</em>.log</code>, the file
+ * <code>foo.<em>max-2</em>.log</code> renamed as <code>foo.<em>max-1</em>.log</code>, and so on, the file
+ * <code>foo.<em>min+1</em>.log</code> renamed as <code>foo.<em>min+2</em>.log</code>. Lastly, the active file
+ * <code>foo.log</code> will be renamed as <code>foo.<em>min</em>.log</code> and a new active file name
* <code>foo.log</code> will be created.
* </p>
* <p>
- * Given that this rollover algorithm requires as many file renaming
- * operations as the window size, large window sizes are discouraged.
+ * Given that this rollover algorithm requires as many file renaming operations as the window size, large window sizes
+ * are discouraged.
* </p>
*/
@Plugin(name = "DefaultRolloverStrategy", category = "Core", printObject = true)
@@ -85,52 +79,52 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
* <p>
* Package-protected for unit tests.
*/
- enum FileExtensions {
+ static enum FileExtensions {
ZIP(".zip") {
@Override
- Action createCompressAction(final String renameTo, final String compressedName,
- final boolean deleteSource, final int compressionLevel) {
+ Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
+ final int compressionLevel) {
return new ZipCompressAction(source(renameTo), target(compressedName), deleteSource, compressionLevel);
}
},
GZ(".gz") {
@Override
- Action createCompressAction(final String renameTo, final String compressedName,
- final boolean deleteSource, final int compressionLevel) {
+ Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
+ final int compressionLevel) {
return new GzCompressAction(source(renameTo), target(compressedName), deleteSource);
}
},
BZIP2(".bz2") {
@Override
- Action createCompressAction(final String renameTo, final String compressedName,
- final boolean deleteSource, final int compressionLevel) {
+ Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
+ final int compressionLevel) {
// One of "gz", "bzip2", "xz", "pack200", or "deflate".
return new CommonsCompressAction("bzip2", source(renameTo), target(compressedName), deleteSource);
- }
+ }
},
DEFLATE(".deflate") {
@Override
- Action createCompressAction(final String renameTo, final String compressedName,
- final boolean deleteSource, final int compressionLevel) {
+ Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
+ final int compressionLevel) {
// One of "gz", "bzip2", "xz", "pack200", or "deflate".
return new CommonsCompressAction("deflate", source(renameTo), target(compressedName), deleteSource);
- }
+ }
},
PACK200(".pack200") {
@Override
- Action createCompressAction(final String renameTo, final String compressedName,
- final boolean deleteSource, final int compressionLevel) {
+ Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
+ final int compressionLevel) {
// One of "gz", "bzip2", "xz", "pack200", or "deflate".
return new CommonsCompressAction("pack200", source(renameTo), target(compressedName), deleteSource);
- }
+ }
},
XY(".xy") {
@Override
- Action createCompressAction(final String renameTo, final String compressedName,
- final boolean deleteSource, final int compressionLevel) {
+ Action createCompressAction(final String renameTo, final String compressedName, final boolean deleteSource,
+ final int compressionLevel) {
// One of "gz", "bzip2", "xz", "pack200", or "deflate".
return new CommonsCompressAction("xy", source(renameTo), target(compressedName), deleteSource);
- }
+ }
};
private final String extension;
@@ -151,11 +145,11 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
int length() {
return extension.length();
}
-
+
File source(String fileName) {
return new File(fileName);
}
-
+
File target(String fileName) {
return new File(fileName);
}
@@ -182,20 +176,47 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
private static final int DEFAULT_WINDOW_SIZE = 7;
/**
+ * Index for oldest retained log file.
+ */
+ private final int maxIndex;
+
+ /**
+ * Index for most recent log file.
+ */
+ private final int minIndex;
+ private final boolean useMax;
+ private final StrSubstitutor subst;
+ private final int compressionLevel;
+
+ /**
+ * Constructs a new instance.
+ *
+ * @param minIndex The minimum index.
+ * @param maxIndex The maximum index.
+ */
+ protected DefaultRolloverStrategy(final int minIndex, final int maxIndex, final boolean useMax,
+ final int compressionLevel, final StrSubstitutor subst) {
+ this.minIndex = minIndex;
+ this.maxIndex = maxIndex;
+ this.useMax = useMax;
+ this.compressionLevel = compressionLevel;
+ this.subst = subst;
+ }
+
+ /**
* Create the DefaultRolloverStrategy.
+ *
* @param max The maximum number of files to keep.
* @param min The minimum number of files to keep.
* @param fileIndex If set to "max" (the default), files with a higher index will be newer than files with a
- * smaller index. If set to "min", file renaming and the counter will follow the Fixed Window strategy.
+ * smaller index. If set to "min", file renaming and the counter will follow the Fixed Window strategy.
* @param compressionLevelStr The compression level, 0 (less) through 9 (more); applies only to ZIP files.
* @param config The Configuration.
* @return A DefaultRolloverStrategy.
*/
@PluginFactory
- public static DefaultRolloverStrategy createStrategy(
- @PluginAttribute("max") final String max,
- @PluginAttribute("min") final String min,
- @PluginAttribute("fileIndex") final String fileIndex,
+ public static DefaultRolloverStrategy createStrategy(@PluginAttribute("max") final String max,
+ @PluginAttribute("min") final String min, @PluginAttribute("fileIndex") final String fileIndex,
@PluginAttribute("compressionLevel") final String compressionLevelStr,
@PluginConfiguration final Configuration config) {
final boolean useMax = fileIndex == null ? true : fileIndex.equalsIgnoreCase("max");
@@ -219,33 +240,6 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
return new DefaultRolloverStrategy(minIndex, maxIndex, useMax, compressionLevel, config.getStrSubstitutor());
}
- /**
- * Index for oldest retained log file.
- */
- private final int maxIndex;
-
- /**
- * Index for most recent log file.
- */
- private final int minIndex;
- private final boolean useMax;
- private final StrSubstitutor subst;
- private final int compressionLevel;
-
- /**
- * Constructs a new instance.
- * @param minIndex The minimum index.
- * @param maxIndex The maximum index.
- */
- protected DefaultRolloverStrategy(final int minIndex, final int maxIndex, final boolean useMax,
- final int compressionLevel, final StrSubstitutor subst) {
- this.minIndex = minIndex;
- this.maxIndex = maxIndex;
- this.useMax = useMax;
- this.compressionLevel = compressionLevel;
- this.subst = subst;
- }
-
public int getCompressionLevel() {
return this.compressionLevel;
}
@@ -259,16 +253,15 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
}
private int purge(final int lowIndex, final int highIndex, final RollingFileManager manager) {
- return useMax ? purgeAscending(lowIndex, highIndex, manager) :
- purgeDescending(lowIndex, highIndex, manager);
+ return useMax ? purgeAscending(lowIndex, highIndex, manager) : purgeDescending(lowIndex, highIndex, manager);
}
/**
- * Purge and rename old log files in preparation for rollover. The oldest file will have the smallest index,
- * the newest the highest.
+ * Purge and rename old log files in preparation for rollover. The oldest file will have the smallest index, the
+ * newest the highest.
*
- * @param lowIndex low index
- * @param highIndex high index. Log file associated with high index will be deleted if needed.
+ * @param lowIndex low index
+ * @param highIndex high index. Log file associated with high index will be deleted if needed.
* @param manager The RollingFileManager
* @return true if purge was successful and rollover should be attempted.
*/
@@ -294,8 +287,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
boolean isBase = false;
if (suffixLength > 0) {
- final File toRenameBase =
- new File(highFilename.substring(0, highFilename.length() - suffixLength));
+ final File toRenameBase = new File(highFilename.substring(0, highFilename.length() - suffixLength));
if (toRename.exists()) {
if (toRenameBase.exists()) {
@@ -311,11 +303,11 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
if (toRename.exists()) {
//
- // if at lower index and then all slots full
- // attempt to delete last file
- // if that fails then abandon purge
+ // if at lower index and then all slots full
+ // attempt to delete last file
+ // if that fails then abandon purge
if (i == lowIndex) {
- LOGGER.debug("DefaultRolloverStrategy.purgeAscending deleting {} at low index {}: all slots full.", //
+ LOGGER.debug("DefaultRolloverStrategy.purgeAscending deleting {} at low index {}: all slots full.",
toRename, i);
if (!toRename.delete()) {
return -1;
@@ -325,8 +317,8 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
}
//
- // if intermediate index
- // add a rename action to the list
+ // if intermediate index
+ // add a rename action to the list
buf.setLength(0);
// LOG4J2-531: directory scan & rollover must use same format
manager.getPatternProcessor().formatFileName(subst, buf, i - 1);
@@ -353,7 +345,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
}
//
- // work renames backwards
+ // work renames backwards
//
for (int i = renames.size() - 1; i >= 0; i--) {
final Action action = renames.get(i);
@@ -375,8 +367,8 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
* Purge and rename old log files in preparation for rollover. The newest file will have the smallest index, the
* oldest will have the highest.
*
- * @param lowIndex low index
- * @param highIndex high index. Log file associated with high index will be deleted if needed.
+ * @param lowIndex low index
+ * @param highIndex high index. Log file associated with high index will be deleted if needed.
* @param manager The RollingFileManager
* @return true if purge was successful and rollover should be attempted.
*/
@@ -395,8 +387,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
boolean isBase = false;
if (suffixLength > 0) {
- final File toRenameBase =
- new File(lowFilename.substring(0, lowFilename.length() - suffixLength));
+ final File toRenameBase = new File(lowFilename.substring(0, lowFilename.length() - suffixLength));
if (toRename.exists()) {
if (toRenameBase.exists()) {
@@ -412,11 +403,12 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
if (toRename.exists()) {
//
- // if at upper index then
- // attempt to delete last file
- // if that fails then abandon purge
+ // if at upper index then
+ // attempt to delete last file
+ // if that fails then abandon purge
if (i == highIndex) {
- LOGGER.debug("DefaultRolloverStrategy.purgeDescending deleting {} at high index {}: all slots full.", //
+ LOGGER.debug(
+ "DefaultRolloverStrategy.purgeDescending deleting {} at high index {}: all slots full.", //
toRename, i);
if (!toRename.delete()) {
return -1;
@@ -426,8 +418,8 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
}
//
- // if intermediate index
- // add a rename action to the list
+ // if intermediate index
+ // add a rename action to the list
buf.setLength(0);
// LOG4J2-531: directory scan & rollover must use same format
manager.getPatternProcessor().formatFileName(subst, buf, i + 1);
@@ -447,7 +439,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
}
//
- // work renames backwards
+ // work renames backwards
//
for (int i = renames.size() - 1; i >= 0; i--) {
final Action action = renames.get(i);
@@ -477,6 +469,7 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
/**
* Perform the rollover.
+ *
* @param manager The RollingFileManager name for current active log file.
* @return A RolloverDescription.
* @throws SecurityException if an error occurs.
@@ -511,8 +504,8 @@ public class DefaultRolloverStrategy implements RolloverStrategy {
}
}
- final FileRenameAction renameAction =
- new FileRenameAction(new File(currentFileName), new File(renameTo), false);
+ final FileRenameAction renameAction = new FileRenameAction(new File(currentFileName), new File(renameTo),
+ false);
return new RolloverDescriptionImpl(currentFileName, false, renameAction, compressAction);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 4674c82..97bc193 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -136,16 +136,17 @@ public class RollingFileManager extends FileManager {
}
/**
- * Returns the triggering policy
+ * Returns the triggering policy.
+ * @param <T> TriggeringPolicy type
* @return The TriggeringPolicy
*/
public <T extends TriggeringPolicy> T getTriggeringPolicy() {
- // TODO We could parameterize this class with a TriggeringPolicy instead of type casting here.
+ // TODO We could parameterize this class with a TriggeringPolicy instead of type casting here.
return (T) this.triggeringPolicy;
}
/**
- * Returns the rollover strategy
+ * Returns the rollover strategy.
* @return The RolloverStrategy
*/
public RolloverStrategy getRolloverStrategy() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
index 7654a2b..a522aa6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
@@ -266,7 +266,7 @@ public class RingBufferLogEvent implements LogEvent {
/**
* Creates and returns a new immutable copy of this {@code RingBufferLogEvent}.
- *
+ *
* @return a new immutable copy of the data in this {@code RingBufferLogEvent}
*/
public LogEvent createMemento() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
index 573963e..edb2d75 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java
@@ -30,6 +30,9 @@ import java.util.Objects;
* Represents the source for the logging configuration.
*/
public class ConfigurationSource {
+ /**
+ * ConfigurationSource to use with Configurations that do not require a "real" configuration source.
+ */
public static final ConfigurationSource NULL_SOURCE = new ConfigurationSource(new byte[0]);
private final File file;
@@ -39,23 +42,33 @@ public class ConfigurationSource {
private final byte[] data;
/**
- * Returns the contents of the specified {@code InputStream} as a byte array.
+ * Constructs a new {@code ConfigurationSource} with the specified input stream that originated from the specified
+ * file.
*
- * @param inputStream the stream to read
- * @return the contents of the specified stream
- * @throws IOException if a problem occurred reading from the stream
+ * @param stream the input stream
+ * @param file the file where the input stream originated
*/
- private static byte[] toByteArray(final InputStream inputStream) throws IOException {
- final int buffSize = Math.max(4096, inputStream.available());
- final ByteArrayOutputStream contents = new ByteArrayOutputStream(buffSize);
- final byte[] buff = new byte[buffSize];
+ public ConfigurationSource(final InputStream stream, final File file) {
+ this.stream = Objects.requireNonNull(stream, "stream is null");
+ this.file = Objects.requireNonNull(file, "file is null");
+ this.location = file.getAbsolutePath();
+ this.url = null;
+ this.data = null;
+ }
- int length = inputStream.read(buff);
- while (length > 0) {
- contents.write(buff, 0, length);
- length = inputStream.read(buff);
- }
- return contents.toByteArray();
+ /**
+ * Constructs a new {@code ConfigurationSource} with the specified input stream that originated from the specified
+ * url.
+ *
+ * @param stream the input stream
+ * @param url the URL where the input stream originated
+ */
+ public ConfigurationSource(final InputStream stream, final URL url) {
+ this.stream = Objects.requireNonNull(stream, "stream is null");
+ this.url = Objects.requireNonNull(url, "URL is null");
+ this.location = url.toString();
+ this.file = null;
+ this.data = null;
}
/**
@@ -78,33 +91,23 @@ public class ConfigurationSource {
}
/**
- * Constructs a new {@code ConfigurationSource} with the specified input stream that originated from the specified
- * file.
+ * Returns the contents of the specified {@code InputStream} as a byte array.
*
- * @param stream the input stream
- * @param file the file where the input stream originated
+ * @param inputStream the stream to read
+ * @return the contents of the specified stream
+ * @throws IOException if a problem occurred reading from the stream
*/
- public ConfigurationSource(final InputStream stream, final File file) {
- this.stream = Objects.requireNonNull(stream, "stream is null");
- this.file = Objects.requireNonNull(file, "file is null");
- this.location = file.getAbsolutePath();
- this.url = null;
- this.data = null;
- }
+ private static byte[] toByteArray(final InputStream inputStream) throws IOException {
+ final int buffSize = Math.max(4096, inputStream.available());
+ final ByteArrayOutputStream contents = new ByteArrayOutputStream(buffSize);
+ final byte[] buff = new byte[buffSize];
- /**
- * Constructs a new {@code ConfigurationSource} with the specified input stream that originated from the specified
- * url.
- *
- * @param stream the input stream
- * @param url the URL where the input stream originated
- */
- public ConfigurationSource(final InputStream stream, final URL url) {
- this.stream = Objects.requireNonNull(stream, "stream is null");
- this.url = Objects.requireNonNull(url, "URL is null");
- this.location = url.toString();
- this.file = null;
- this.data = null;
+ int length = inputStream.read(buff);
+ while (length > 0) {
+ contents.write(buff, 0, length);
+ length = inputStream.read(buff);
+ }
+ return contents.toByteArray();
}
/**
@@ -173,4 +176,4 @@ public class ConfigurationSource {
final int length = data == null ? -1 : data.length;
return "stream (" + length + " bytes, unknown location)";
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
index d0b17ee..51e7595 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java
@@ -33,8 +33,6 @@ import org.apache.logging.log4j.util.PropertiesUtil;
*/
public class DefaultConfiguration extends AbstractConfiguration {
- private static final long serialVersionUID = 1L;
-
/**
* The name of the default configuration.
*/
@@ -48,6 +46,8 @@ public class DefaultConfiguration extends AbstractConfiguration {
*/
public static final String DEFAULT_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
+ private static final long serialVersionUID = 1L;
+
/**
* Constructor to create the default configuration.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
index d0775d0..937501a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
@@ -29,10 +29,10 @@ import java.util.concurrent.locks.ReentrantLock;
*/
public class FileConfigurationMonitor implements ConfigurationMonitor {
- private static final int MASK = 0x0f;
-
static final int MIN_INTERVAL = 5;
+ private static final int MASK = 0x0f;
+
private final File file;
private volatile long lastModified;
@@ -51,14 +51,14 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
/**
* Constructor.
+ *
* @param reconfigurable The Configuration that can be reconfigured.
* @param file The File to monitor.
* @param listeners The List of ConfigurationListeners to notify upon a change.
* @param intervalSeconds The monitor interval in seconds. The minimum interval is 5 seconds.
*/
public FileConfigurationMonitor(final Reconfigurable reconfigurable, final File file,
- final List<ConfigurationListener> listeners,
- final int intervalSeconds) {
+ final List<ConfigurationListener> listeners, final int intervalSeconds) {
this.reconfigurable = reconfigurable;
this.file = file;
this.lastModified = file.lastModified();
@@ -92,6 +92,9 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
}
}
+ /**
+ * Helper class for triggering a reconfiguration in a background thread.
+ */
private static class ReconfigurationWorker implements Runnable {
private final ConfigurationListener listener;
@@ -108,8 +111,12 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
}
}
- /* (non-Javadoc)
- * @see org.apache.logging.log4j.core.config.ReliabilityStrategyFactory#getReliabilityStrategy(org.apache.logging.log4j.core.config.LoggerConfig)
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.logging.log4j.core.config.ReliabilityStrategyFactory#getReliabilityStrategy(org.apache.logging.log4j
+ * .core.config.LoggerConfig)
*/
@Override
public ReliabilityStrategy getReliabilityStrategy(LoggerConfig loggerConfig) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
index c58b229..b2ce321 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilderFactory.java
@@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.config.builder.impl.DefaultConfigurationBui
* Provides methods to create ConfigurationBuilders.
* @since 2.4
*/
-public class ConfigurationBuilderFactory {
+public abstract class ConfigurationBuilderFactory {
/**
* Returns a new default ConfigurationBuilder to construct Log4j configurations.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java
index f152429..0b2290f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Plugin.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
index ff7bc04..675d78f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderAttribute.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
index f085b2c..3effa6f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginBuilderFactory.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginVisitorStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginVisitorStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginVisitorStrategy.java
index 2f903d8..65fcb76 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginVisitorStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PluginVisitorStrategy.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverter.java
index d941593..e67e213 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverter.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.convert;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
index e106a90..a28897c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.convert;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/package-info.java
index 62e5516..5e74915 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/package-info.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
index ccdbb42..5e32820 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginCache.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.processor;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginEntry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginEntry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginEntry.java
index 1b63c93..f87f2a6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginEntry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginEntry.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.processor;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
index fe575b7..2db7241 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.processor;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/package-info.java
index dcd2b1a..4f6ddda 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/package-info.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
index 3e40491..9f48cef 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginBuilder.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.util;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
index dddf3e5..7e3e106 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/PluginRegistry.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.util;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/package-info.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/package-info.java
index a3d5932..270f8f6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/package-info.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/package-info.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
index ac341bb..560cbe3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/AbstractPluginVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
index acaea29..f4da42b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginAttributeVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginBuilderAttributeVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginBuilderAttributeVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginBuilderAttributeVisitor.java
index bfd2c70..e951456 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginBuilderAttributeVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginBuilderAttributeVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginConfigurationVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginConfigurationVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginConfigurationVisitor.java
index 6f3b79f..a5a896f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginConfigurationVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginConfigurationVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginElementVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginElementVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginElementVisitor.java
index 9082c2e..95bf102 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginElementVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginElementVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginNodeVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginNodeVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginNodeVisitor.java
index 566aece..7f15392 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginNodeVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginNodeVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginValueVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginValueVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginValueVisitor.java
index bf27566..5ec53da 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginValueVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginValueVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitor.java
index be9594a..34e2b78 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitor.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/65dc9e86/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitors.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitors.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitors.java
index b5447d7..10ee0df 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitors.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/visitors/PluginVisitors.java
@@ -2,7 +2,7 @@
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
+ * The ASF licenses this file to You under the Apache license, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
@@ -11,8 +11,8 @@
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * See the license for the specific language governing permissions and
+ * limitations under the license.
*/
package org.apache.logging.log4j.core.config.plugins.visitors;