You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/11/12 08:18:55 UTC
[2/2] logging-log4j2 git commit: Refactor magic string "Core" into a
new constant Core.CATEGORY_NAME. I'm open to a better name than "Core".
Refactor magic string "Core" into a new constant Core.CATEGORY_NAME. I'm
open to a better name than "Core".
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cdc19e40
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cdc19e40
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cdc19e40
Branch: refs/heads/master
Commit: cdc19e40eb957ddfe7b36856eb2109386fddbcdc
Parents: d4af844
Author: Gary Gregory <gg...@apache.org>
Authored: Sat Nov 12 00:18:48 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Sat Nov 12 00:18:48 2016 -0800
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/Core.java | 7 +
.../log4j/core/appender/AppenderSet.java | 3 +-
.../log4j/core/appender/AsyncAppender.java | 3 +-
.../log4j/core/appender/ConsoleAppender.java | 3 +-
.../core/appender/CountingNoOpAppender.java | 3 +-
.../log4j/core/appender/FailoverAppender.java | 3 +-
.../log4j/core/appender/FailoversPlugin.java | 3 +-
.../log4j/core/appender/FileAppender.java | 3 +-
.../core/appender/MemoryMappedFileAppender.java | 3 +-
.../log4j/core/appender/NullAppender.java | 3 +-
.../core/appender/OutputStreamAppender.java | 3 +-
.../core/appender/RandomAccessFileAppender.java | 3 +-
.../core/appender/RollingFileAppender.java | 3 +-
.../RollingRandomAccessFileAppender.java | 3 +-
.../core/appender/ScriptAppenderSelector.java | 3 +-
.../log4j/core/appender/SmtpAppender.java | 3 +-
.../log4j/core/appender/SocketAppender.java | 3 +-
.../log4j/core/appender/SyslogAppender.java | 3 +-
.../log4j/core/appender/WriterAppender.java | 3 +-
.../core/appender/db/jdbc/ColumnConfig.java | 3 +-
.../db/jdbc/DataSourceConnectionSource.java | 3 +-
.../db/jdbc/FactoryMethodConnectionSource.java | 3 +-
.../core/appender/db/jdbc/JdbcAppender.java | 3 +-
.../log4j/core/appender/db/jpa/JpaAppender.java | 3 +-
.../rewrite/LoggerNameLevelRewritePolicy.java | 3 +-
.../core/appender/rewrite/MapRewritePolicy.java | 3 +-
.../rewrite/PropertiesRewritePolicy.java | 3 +-
.../core/appender/rewrite/RewriteAppender.java | 3 +-
.../rolling/CompositeTriggeringPolicy.java | 3 +-
.../appender/rolling/CronTriggeringPolicy.java | 3 +-
.../rolling/DefaultRolloverStrategy.java | 3 +-
.../rolling/OnStartupTriggeringPolicy.java | 3 +-
.../rolling/SizeBasedTriggeringPolicy.java | 3 +-
.../rolling/TimeBasedTriggeringPolicy.java | 3 +-
.../appender/rolling/action/DeleteAction.java | 3 +-
.../rolling/action/IfAccumulatedFileCount.java | 227 +++++++-------
.../rolling/action/IfAccumulatedFileSize.java | 233 ++++++++-------
.../core/appender/rolling/action/IfAll.java | 3 +-
.../core/appender/rolling/action/IfAny.java | 3 +-
.../appender/rolling/action/IfFileName.java | 299 ++++++++++---------
.../appender/rolling/action/IfLastModified.java | 227 +++++++-------
.../core/appender/rolling/action/IfNot.java | 155 +++++-----
.../action/PathSortByModificationTime.java | 179 +++++------
.../rolling/action/ScriptCondition.java | 238 +++++++--------
.../core/appender/routing/IdlePurgePolicy.java | 3 +-
.../log4j/core/appender/routing/Route.java | 3 +-
.../log4j/core/appender/routing/Routes.java | 3 +-
.../core/appender/routing/RoutingAppender.java | 3 +-
.../log4j/core/async/AsyncLoggerConfig.java | 3 +-
.../log4j/core/config/AppendersPlugin.java | 3 +-
.../log4j/core/config/CustomLevelConfig.java | 3 +-
.../logging/log4j/core/config/CustomLevels.java | 3 +-
.../logging/log4j/core/config/LoggerConfig.java | 3 +-
.../log4j/core/config/ScriptsPlugin.java | 3 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 3 +-
.../core/net/ssl/KeyStoreConfiguration.java | 3 +-
.../log4j/core/net/ssl/SslConfiguration.java | 3 +-
.../core/net/ssl/TrustStoreConfiguration.java | 3 +-
.../log4j/core/pattern/RegexReplacement.java | 3 +-
.../log4j/core/appender/HangingAppender.java | 2 +-
.../appender/rewrite/TestRewritePolicy.java | 2 +-
.../log4j/core/config/InMemoryAdvertiser.java | 2 +-
.../log4j/test/appender/ListAppender.java | 2 +-
.../test/appender/UsesLoggingAppender.java | 2 +-
.../logging/log4j/test/layout/BasicLayout.java | 2 +-
65 files changed, 898 insertions(+), 832 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/Core.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Core.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Core.java
new file mode 100644
index 0000000..ccb3ddb
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Core.java
@@ -0,0 +1,7 @@
+package org.apache.logging.log4j.core;
+
+public class Core {
+
+ public static final String CATEGORY_NAME = "Core";
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index 0aa6e35..7b3c07b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.Node;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -33,7 +34,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* A deferred plugin for appenders.
*/
-@Plugin(name = "AppenderSet", category = "Core", printObject = true, deferChildren = true)
+@Plugin(name = "AppenderSet", category = Core.CATEGORY_NAME, printObject = true, deferChildren = true)
public class AppenderSet {
public static class Builder implements org.apache.logging.log4j.core.util.Builder<AppenderSet> {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
index 436664c..f0f5c0e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.logging.log4j.core.AbstractLogEvent;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.async.ArrayBlockingQueueFactory;
@@ -54,7 +55,7 @@ import org.apache.logging.log4j.core.util.Log4jThread;
* Appender to append to if the queue is full. The AsyncAppender does not allow a filter to be specified on the Appender
* references.
*/
-@Plugin(name = "Async", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "Async", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class AsyncAppender extends AbstractAppender {
private static final int DEFAULT_QUEUE_SIZE = 128;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index b865caf..9479be8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -28,6 +28,7 @@ import java.nio.charset.Charset;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -48,7 +49,7 @@ import org.apache.logging.log4j.util.PropertiesUtil;
* encoding. (RG) Encoding is handled within the Layout. Typically, a Layout will generate a String and then call
* getBytes which may use a configured encoding or the system default. OTOH, a Writer cannot print byte streams.
*/
-@Plugin(name = ConsoleAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = ConsoleAppender.PLUGIN_NAME, category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class ConsoleAppender extends AbstractOutputStreamAppender<OutputStreamManager> {
public static final String PLUGIN_NAME = "Console";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java
index 89ff670..0e3ac47 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java
@@ -20,6 +20,7 @@ import java.util.Objects;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -29,7 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
* No-Operation Appender that counts events.
*/
-@Plugin(name = "CountingNoOp", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "CountingNoOp", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public class CountingNoOpAppender extends AbstractAppender {
private final AtomicLong total = new AtomicLong();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
index 6fc0adb..659caf1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.LoggingException;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.AppenderControl;
@@ -41,7 +42,7 @@ import org.apache.logging.log4j.core.util.Constants;
* to a different appender. Hopefully it is obvious that the Appenders must be configured
* to not suppress exceptions for the FailoverAppender to work.
*/
-@Plugin(name = "Failover", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "Failover", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class FailoverAppender extends AbstractAppender {
private static final int DEFAULT_INTERVAL_SECONDS = 60;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
index 2d1b9a6..c537d91 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoversPlugin.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.appender;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.AppenderRef;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
@@ -26,7 +27,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* The array of failover Appenders.
*/
-@Plugin(name = "failovers", category = "Core")
+@Plugin(name = "failovers", category = Core.CATEGORY_NAME)
public final class FailoversPlugin {
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
index 1c76ffb..fdcffe2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.Configuration;
@@ -37,7 +38,7 @@ import org.apache.logging.log4j.core.util.Integers;
/**
* File Appender.
*/
-@Plugin(name = FileAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = FileAppender.PLUGIN_NAME, category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class FileAppender extends AbstractOutputStreamAppender<FileManager> {
public static final String PLUGIN_NAME = "File";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/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 1c8e0d2..271ea29 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
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -41,7 +42,7 @@ import org.apache.logging.log4j.core.util.Integers;
*
* @since 2.1
*/
-@Plugin(name = "MemoryMappedFile", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "MemoryMappedFile", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class MemoryMappedFileAppender extends AbstractOutputStreamAppender<MemoryMappedFileManager> {
private static final int BIT_POSITION_1GB = 30; // 2^30 ~= 1GB
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java
index 07a6250..45cc47b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/NullAppender.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.appender;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -25,7 +26,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
* An Appender that ignores log events. Use for compatibility with version 1.2.
*/
-@Plugin(name = NullAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = NullAppender.PLUGIN_NAME, category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public class NullAppender extends AbstractAppender {
public static final String PLUGIN_NAME = "Null";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
index f9a2e66..ddca626 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
@@ -20,6 +20,7 @@ import java.io.OutputStream;
import java.io.Serializable;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -34,7 +35,7 @@ import org.apache.logging.log4j.core.util.CloseShieldOutputStream;
* Character encoding is handled within the Layout.
* </p>
*/
-@Plugin(name = "OutputStream", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "OutputStream", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class OutputStreamAppender extends AbstractOutputStreamAppender<OutputStreamManager> {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
index 0d9328d..63fe917d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -39,7 +40,7 @@ import org.apache.logging.log4j.core.util.Integers;
/**
* File Appender.
*/
-@Plugin(name = "RandomAccessFile", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "RandomAccessFile", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class RandomAccessFileAppender extends AbstractOutputStreamAppender<RandomAccessFileManager> {
private final String fileName;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
index 93e8e2c..418addb 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
import java.util.zip.Deflater;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -44,7 +45,7 @@ import org.apache.logging.log4j.core.util.Integers;
/**
* An appender that writes to files and can roll over at intervals.
*/
-@Plugin(name = RollingFileAppender.PLUGIN_NAME, category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = RollingFileAppender.PLUGIN_NAME, category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class RollingFileAppender extends AbstractOutputStreamAppender<RollingFileManager> {
public static final String PLUGIN_NAME = "RollingFile";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
index 931ed4e..ea984e3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
import java.util.zip.Deflater;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -45,7 +46,7 @@ import org.apache.logging.log4j.core.util.Integers;
* An appender that writes to random access files and can roll over at
* intervals.
*/
-@Plugin(name = "RollingRandomAccessFile", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "RollingRandomAccessFile", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class RollingRandomAccessFileAppender extends AbstractOutputStreamAppender<RollingRandomAccessFileManager> {
private final String fileName;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
index 0bfd514..ab9dfb4 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
@@ -22,6 +22,7 @@ import java.util.Objects;
import javax.script.Bindings;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -35,7 +36,7 @@ import org.apache.logging.log4j.core.config.plugins.validation.constraints.Requi
import org.apache.logging.log4j.core.script.AbstractScript;
import org.apache.logging.log4j.core.script.ScriptManager;
-@Plugin(name = "ScriptAppenderSelector", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "ScriptAppenderSelector", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public class ScriptAppenderSelector extends AbstractAppender {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
index 87225de..6b9c474 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SmtpAppender.java
@@ -20,6 +20,7 @@ package org.apache.logging.log4j.core.appender;
import java.io.Serializable;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -53,7 +54,7 @@ import org.apache.logging.log4j.core.util.Booleans;
* message is appended. This can be modified by setting a filter for the
* appender.
*/
-@Plugin(name = "SMTP", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "SMTP", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class SmtpAppender extends AbstractAppender {
private static final int DEFAULT_BUFFER_SIZE = 512;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/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 8178ca0..8af4cec 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
@@ -22,6 +22,7 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.LogEvent;
@@ -47,7 +48,7 @@ import org.apache.logging.log4j.core.util.Constants;
/**
* An Appender that delivers events over socket connections. Supports both TCP and UDP.
*/
-@Plugin(name = "Socket", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "Socket", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketManager> {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
index 6d9f162..1f3cc7d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java
@@ -20,6 +20,7 @@ import java.io.Serializable;
import java.nio.charset.Charset;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.Layout;
import org.apache.logging.log4j.core.config.Configuration;
@@ -43,7 +44,7 @@ import org.apache.logging.log4j.util.EnglishEnums;
/**
* The Syslog Appender.
*/
-@Plugin(name = "Syslog", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "Syslog", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public class SyslogAppender extends SocketAppender {
protected static final String RFC5424 = "RFC5424";
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
index e6a3b9d..dc8f4d2 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender;
import java.io.Writer;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.StringLayout;
import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -30,7 +31,7 @@ import org.apache.logging.log4j.core.util.CloseShieldWriter;
/**
* Appends log events to a {@link Writer}.
*/
-@Plugin(name = "Writer", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "Writer", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class WriterAppender extends AbstractWriterAppender<WriterManager> {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
index b876226..1828382 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.appender.db.jdbc;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -30,7 +31,7 @@ import org.apache.logging.log4j.util.Strings;
/**
* A configuration element used to configure which event properties are logged to which columns in the database table.
*/
-@Plugin(name = "Column", category = "Core", printObject = true)
+@Plugin(name = "Column", category = Core.CATEGORY_NAME, printObject = true)
public final class ColumnConfig {
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
index a984e18..389586e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/DataSourceConnectionSource.java
@@ -24,6 +24,7 @@ import javax.naming.NamingException;
import javax.sql.DataSource;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -33,7 +34,7 @@ import org.apache.logging.log4j.util.Strings;
/**
* A {@link JdbcAppender} connection source that uses a {@link DataSource} to connect to the database.
*/
-@Plugin(name = "DataSource", category = "Core", elementType = "connectionSource", printObject = true)
+@Plugin(name = "DataSource", category = Core.CATEGORY_NAME, elementType = "connectionSource", printObject = true)
public final class DataSourceConnectionSource implements ConnectionSource {
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
index 7cdad6f..d69859b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/FactoryMethodConnectionSource.java
@@ -24,6 +24,7 @@ import java.sql.SQLException;
import javax.sql.DataSource;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -35,7 +36,7 @@ import org.apache.logging.log4j.util.Strings;
* A {@link JdbcAppender} connection source that uses a public static factory method to obtain a {@link Connection} or
* {@link DataSource}.
*/
-@Plugin(name = "ConnectionFactory", category = "Core", elementType = "connectionSource", printObject = true)
+@Plugin(name = "ConnectionFactory", category = Core.CATEGORY_NAME, elementType = "connectionSource", printObject = true)
public final class FactoryMethodConnectionSource implements ConnectionSource {
private static final Logger LOGGER = StatusLogger.getLogger();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
index 4846615..ccc0fa5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcAppender.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.appender.db.jdbc;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.appender.AbstractAppender;
import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender;
@@ -35,7 +36,7 @@ import org.apache.logging.log4j.core.util.Booleans;
* @see ColumnConfig
* @see ConnectionSource
*/
-@Plugin(name = "JDBC", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "JDBC", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class JdbcAppender extends AbstractDatabaseAppender<JdbcDatabaseManager> {
private final String description;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
index 0f1053f..aee94e8 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JpaAppender.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender.db.jpa;
import java.lang.reflect.Constructor;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
@@ -38,7 +39,7 @@ import org.apache.logging.log4j.util.Strings;
*
* @see AbstractLogEventWrapperEntity
*/
-@Plugin(name = "JPA", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "JPA", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class JpaAppender extends AbstractDatabaseAppender<JpaDatabaseManager> {
private final String description;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
index 617367f..d04ffc3 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/LoggerNameLevelRewritePolicy.java
@@ -21,6 +21,7 @@ import java.util.Locale;
import java.util.Map;
import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -34,7 +35,7 @@ import org.apache.logging.log4j.core.util.KeyValuePair;
*
* @since 2.4
*/
-@Plugin(name = "LoggerNameLevelRewritePolicy", category = "Core", elementType = "rewritePolicy", printObject = true)
+@Plugin(name = "LoggerNameLevelRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public class LoggerNameLevelRewritePolicy implements RewritePolicy {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
index cc115ea..7735424 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/MapRewritePolicy.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -34,7 +35,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* This policy modifies events by replacing or possibly adding keys and values to the MapMessage.
*/
-@Plugin(name = "MapRewritePolicy", category = "Core", elementType = "rewritePolicy", printObject = true)
+@Plugin(name = "MapRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public final class MapRewritePolicy implements RewritePolicy {
/**
* Allow subclasses access to the status logger without creating another instance.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
index f0e40a7..ad32e28 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/PropertiesRewritePolicy.java
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Map;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.Property;
@@ -35,7 +36,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* This policy modifies events by replacing or possibly adding keys and values to the MapMessage.
*/
-@Plugin(name = "PropertiesRewritePolicy", category = "Core", elementType = "rewritePolicy", printObject = true)
+@Plugin(name = "PropertiesRewritePolicy", category = Core.CATEGORY_NAME, elementType = "rewritePolicy", printObject = true)
public final class PropertiesRewritePolicy implements RewritePolicy {
/**
* Allow subclasses access to the status logger without creating another instance.
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
index befc6b4..64a0abd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java
@@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.Filter;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.appender.AbstractAppender;
@@ -36,7 +37,7 @@ import org.apache.logging.log4j.core.util.Booleans;
/**
* This Appender allows the logging event to be manipulated before it is processed by other Appenders.
*/
-@Plugin(name = "Rewrite", category = "Core", elementType = Appender.ELEMENT_TYPE, printObject = true)
+@Plugin(name = "Rewrite", category = Core.CATEGORY_NAME, elementType = Appender.ELEMENT_TYPE, printObject = true)
public final class RewriteAppender extends AbstractAppender {
private final Configuration config;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
index b7bf027..ecb48cc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CompositeTriggeringPolicy.java
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.core.appender.rolling;
import java.util.Arrays;
import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LifeCycle;
import org.apache.logging.log4j.core.LifeCycle2;
import org.apache.logging.log4j.core.LogEvent;
@@ -29,7 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
* Triggering policy that wraps other triggering policies.
*/
-@Plugin(name = "Policies", category = "Core", printObject = true)
+@Plugin(name = "Policies", category = Core.CATEGORY_NAME, printObject = true)
public final class CompositeTriggeringPolicy extends AbstractTriggeringPolicy {
private final TriggeringPolicy[] triggeringPolicies;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
index 6b8af2a..1ce1ebd 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
@@ -21,6 +21,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.concurrent.TimeUnit;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.CronScheduledFuture;
@@ -34,7 +35,7 @@ import org.apache.logging.log4j.core.util.CronExpression;
/**
* Rolls a file over based on a cron schedule.
*/
-@Plugin(name = "CronTriggeringPolicy", category = "Core", printObject = true)
+@Plugin(name = "CronTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
@Scheduled
public final class CronTriggeringPolicy extends AbstractTriggeringPolicy {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/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 d1d2794..ea32068 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
@@ -25,6 +25,7 @@ import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.zip.Deflater;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.appender.rolling.action.Action;
import org.apache.logging.log4j.core.appender.rolling.action.CommonsCompressAction;
import org.apache.logging.log4j.core.appender.rolling.action.CompositeAction;
@@ -73,7 +74,7 @@ import org.apache.logging.log4j.core.util.Integers;
* are discouraged.
* </p>
*/
-@Plugin(name = "DefaultRolloverStrategy", category = "Core", printObject = true)
+@Plugin(name = "DefaultRolloverStrategy", category = Core.CATEGORY_NAME, printObject = true)
public class DefaultRolloverStrategy extends AbstractRolloverStrategy {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
index a993d87..4c8ae1c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/OnStartupTriggeringPolicy.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j.core.appender.rolling;
import java.lang.reflect.Method;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -28,7 +29,7 @@ import org.apache.logging.log4j.status.StatusLogger;
/**
* Triggers a rollover on every restart, but only if the file size is greater than zero.
*/
-@Plugin(name = "OnStartupTriggeringPolicy", category = "Core", printObject = true)
+@Plugin(name = "OnStartupTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
public class OnStartupTriggeringPolicy extends AbstractTriggeringPolicy {
private static final long JVM_START_TIME = initStartTime();
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
index 6f6c8b5..f77d571 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/SizeBasedTriggeringPolicy.java
@@ -16,6 +16,7 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -24,7 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
/**
*
*/
-@Plugin(name = "SizeBasedTriggeringPolicy", category = "Core", printObject = true)
+@Plugin(name = "SizeBasedTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
public class SizeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
index 61200ed..ee0d7e9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java
@@ -16,6 +16,7 @@
*/
package org.apache.logging.log4j.core.appender.rolling;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -25,7 +26,7 @@ import org.apache.logging.log4j.core.util.Integers;
/**
* Rolls a file over based on time.
*/
-@Plugin(name = "TimeBasedTriggeringPolicy", category = "Core", printObject = true)
+@Plugin(name = "TimeBasedTriggeringPolicy", category = Core.CATEGORY_NAME, printObject = true)
public final class TimeBasedTriggeringPolicy extends AbstractTriggeringPolicy {
private long nextRolloverMillis;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
index 4499478..fe3da17 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
@@ -24,6 +24,7 @@ import java.nio.file.Path;
import java.util.List;
import java.util.Objects;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
@@ -35,7 +36,7 @@ import org.apache.logging.log4j.core.lookup.StrSubstitutor;
/**
* Rollover or scheduled action for deleting old log files that are accepted by the specified PathFilters.
*/
-@Plugin(name = "Delete", category = "Core", printObject = true)
+@Plugin(name = "Delete", category = Core.CATEGORY_NAME, printObject = true)
public class DeleteAction extends AbstractPathAction {
private final PathSorter pathSorter;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
index b70dc26..b996a19 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
@@ -1,113 +1,114 @@
-/*
- * 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.rolling.action;
-
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.status.StatusLogger;
-
-/**
- * PathCondition that accepts paths after some count threshold is exceeded during the file tree walk.
- */
-@Plugin(name = "IfAccumulatedFileCount", category = "Core", printObject = true)
-public final class IfAccumulatedFileCount implements PathCondition {
- private static final Logger LOGGER = StatusLogger.getLogger();
- private final int threshold;
- private int count;
- private final PathCondition[] nestedConditions;
-
- private IfAccumulatedFileCount(final int thresholdParam, final PathCondition[] nestedConditions) {
- if (thresholdParam <= 0) {
- throw new IllegalArgumentException("Count must be a positive integer but was " + thresholdParam);
- }
- this.threshold = thresholdParam;
- this.nestedConditions = nestedConditions == null ? new PathCondition[0] : Arrays.copyOf(nestedConditions,
- nestedConditions.length);
- }
-
- public int getThresholdCount() {
- return threshold;
- }
-
- public List<PathCondition> getNestedConditions() {
- return Collections.unmodifiableList(Arrays.asList(nestedConditions));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
- * java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
- */
- @Override
- public boolean accept(final Path basePath, final Path relativePath, final BasicFileAttributes attrs) {
- final boolean result = ++count > threshold;
- final String match = result ? ">" : "<=";
- final String accept = result ? "ACCEPTED" : "REJECTED";
- LOGGER.trace("IfAccumulatedFileCount {}: {} count '{}' {} threshold '{}'", accept, relativePath, count, match,
- threshold);
- if (result) {
- return IfAll.accept(nestedConditions, basePath, relativePath, attrs);
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
- */
- @Override
- public void beforeFileTreeWalk() {
- count = 0;
- IfAll.beforeFileTreeWalk(nestedConditions);
- }
-
- /**
- * Create an IfAccumulatedFileCount condition.
- *
- * @param threshold The threshold count from which files will be deleted.
- * @return An IfAccumulatedFileCount condition.
- */
- @PluginFactory
- public static IfAccumulatedFileCount createFileCountCondition( //
- // @formatter:off
- @PluginAttribute(value = "exceeds", defaultInt = Integer.MAX_VALUE) final int threshold,
- @PluginElement("PathConditions") final PathCondition... nestedConditions) {
- // @formatter:on
-
- if (threshold == Integer.MAX_VALUE) {
- LOGGER.error("IfAccumulatedFileCount invalid or missing threshold value.");
- }
- return new IfAccumulatedFileCount(threshold, nestedConditions);
- }
-
- @Override
- public String toString() {
- final String nested = nestedConditions.length == 0 ? "" : " AND " + Arrays.toString(nestedConditions);
- return "IfAccumulatedFileCount(exceeds=" + threshold + nested + ")";
- }
-}
+/*
+ * 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.rolling.action;
+
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.status.StatusLogger;
+
+/**
+ * PathCondition that accepts paths after some count threshold is exceeded during the file tree walk.
+ */
+@Plugin(name = "IfAccumulatedFileCount", category = Core.CATEGORY_NAME, printObject = true)
+public final class IfAccumulatedFileCount implements PathCondition {
+ private static final Logger LOGGER = StatusLogger.getLogger();
+ private final int threshold;
+ private int count;
+ private final PathCondition[] nestedConditions;
+
+ private IfAccumulatedFileCount(final int thresholdParam, final PathCondition[] nestedConditions) {
+ if (thresholdParam <= 0) {
+ throw new IllegalArgumentException("Count must be a positive integer but was " + thresholdParam);
+ }
+ this.threshold = thresholdParam;
+ this.nestedConditions = nestedConditions == null ? new PathCondition[0] : Arrays.copyOf(nestedConditions,
+ nestedConditions.length);
+ }
+
+ public int getThresholdCount() {
+ return threshold;
+ }
+
+ public List<PathCondition> getNestedConditions() {
+ return Collections.unmodifiableList(Arrays.asList(nestedConditions));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
+ * java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
+ */
+ @Override
+ public boolean accept(final Path basePath, final Path relativePath, final BasicFileAttributes attrs) {
+ final boolean result = ++count > threshold;
+ final String match = result ? ">" : "<=";
+ final String accept = result ? "ACCEPTED" : "REJECTED";
+ LOGGER.trace("IfAccumulatedFileCount {}: {} count '{}' {} threshold '{}'", accept, relativePath, count, match,
+ threshold);
+ if (result) {
+ return IfAll.accept(nestedConditions, basePath, relativePath, attrs);
+ }
+ return result;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
+ */
+ @Override
+ public void beforeFileTreeWalk() {
+ count = 0;
+ IfAll.beforeFileTreeWalk(nestedConditions);
+ }
+
+ /**
+ * Create an IfAccumulatedFileCount condition.
+ *
+ * @param threshold The threshold count from which files will be deleted.
+ * @return An IfAccumulatedFileCount condition.
+ */
+ @PluginFactory
+ public static IfAccumulatedFileCount createFileCountCondition( //
+ // @formatter:off
+ @PluginAttribute(value = "exceeds", defaultInt = Integer.MAX_VALUE) final int threshold,
+ @PluginElement("PathConditions") final PathCondition... nestedConditions) {
+ // @formatter:on
+
+ if (threshold == Integer.MAX_VALUE) {
+ LOGGER.error("IfAccumulatedFileCount invalid or missing threshold value.");
+ }
+ return new IfAccumulatedFileCount(threshold, nestedConditions);
+ }
+
+ @Override
+ public String toString() {
+ final String nested = nestedConditions.length == 0 ? "" : " AND " + Arrays.toString(nestedConditions);
+ return "IfAccumulatedFileCount(exceeds=" + threshold + nested + ")";
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
index bcf543a..e0de809 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
@@ -1,116 +1,117 @@
-/*
- * 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.rolling.action;
-
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.core.appender.rolling.FileSize;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
-import org.apache.logging.log4j.status.StatusLogger;
-
-/**
- * PathCondition that accepts paths after the accumulated file size threshold is exceeded during the file tree walk.
- */
-@Plugin(name = "IfAccumulatedFileSize", category = "Core", printObject = true)
-public final class IfAccumulatedFileSize implements PathCondition {
- private static final Logger LOGGER = StatusLogger.getLogger();
- private final long thresholdBytes;
- private long accumulatedSize;
- private final PathCondition[] nestedConditions;
-
- private IfAccumulatedFileSize(final long thresholdSize, final PathCondition[] nestedConditions) {
- if (thresholdSize <= 0) {
- throw new IllegalArgumentException("Count must be a positive integer but was " + thresholdSize);
- }
- this.thresholdBytes = thresholdSize;
- this.nestedConditions = nestedConditions == null ? new PathCondition[0] : Arrays.copyOf(nestedConditions,
- nestedConditions.length);
- }
-
- public long getThresholdBytes() {
- return thresholdBytes;
- }
-
- public List<PathCondition> getNestedConditions() {
- return Collections.unmodifiableList(Arrays.asList(nestedConditions));
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
- * java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
- */
- @Override
- public boolean accept(final Path basePath, final Path relativePath, final BasicFileAttributes attrs) {
- accumulatedSize += attrs.size();
- final boolean result = accumulatedSize > thresholdBytes;
- final String match = result ? ">" : "<=";
- final String accept = result ? "ACCEPTED" : "REJECTED";
- LOGGER.trace("IfAccumulatedFileSize {}: {} accumulated size '{}' {} thresholdBytes '{}'", accept, relativePath,
- accumulatedSize, match, thresholdBytes);
- if (result) {
- return IfAll.accept(nestedConditions, basePath, relativePath, attrs);
- }
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
- */
- @Override
- public void beforeFileTreeWalk() {
- accumulatedSize = 0;
- IfAll.beforeFileTreeWalk(nestedConditions);
- }
-
- /**
- * Create an IfAccumulatedFileSize condition.
- *
- * @param threshold The threshold accumulated file size from which files will be deleted.
- * @return An IfAccumulatedFileSize condition.
- */
- @PluginFactory
- public static IfAccumulatedFileSize createFileSizeCondition( //
- // @formatter:off
- @PluginAttribute("exceeds") final String size,
- @PluginElement("PathConditions") final PathCondition... nestedConditions) {
- // @formatter:on
-
- if (size == null) {
- LOGGER.error("IfAccumulatedFileSize missing mandatory size threshold.");
- }
- final long threshold = size == null ? Long.MAX_VALUE : FileSize.parse(size, Long.MAX_VALUE);
- return new IfAccumulatedFileSize(threshold, nestedConditions);
- }
-
- @Override
- public String toString() {
- final String nested = nestedConditions.length == 0 ? "" : " AND " + Arrays.toString(nestedConditions);
- return "IfAccumulatedFileSize(exceeds=" + thresholdBytes + nested + ")";
- }
-}
+/*
+ * 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.rolling.action;
+
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.Core;
+import org.apache.logging.log4j.core.appender.rolling.FileSize;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+import org.apache.logging.log4j.status.StatusLogger;
+
+/**
+ * PathCondition that accepts paths after the accumulated file size threshold is exceeded during the file tree walk.
+ */
+@Plugin(name = "IfAccumulatedFileSize", category = Core.CATEGORY_NAME, printObject = true)
+public final class IfAccumulatedFileSize implements PathCondition {
+ private static final Logger LOGGER = StatusLogger.getLogger();
+ private final long thresholdBytes;
+ private long accumulatedSize;
+ private final PathCondition[] nestedConditions;
+
+ private IfAccumulatedFileSize(final long thresholdSize, final PathCondition[] nestedConditions) {
+ if (thresholdSize <= 0) {
+ throw new IllegalArgumentException("Count must be a positive integer but was " + thresholdSize);
+ }
+ this.thresholdBytes = thresholdSize;
+ this.nestedConditions = nestedConditions == null ? new PathCondition[0] : Arrays.copyOf(nestedConditions,
+ nestedConditions.length);
+ }
+
+ public long getThresholdBytes() {
+ return thresholdBytes;
+ }
+
+ public List<PathCondition> getNestedConditions() {
+ return Collections.unmodifiableList(Arrays.asList(nestedConditions));
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#accept(java.nio.file.Path,
+ * java.nio.file.Path, java.nio.file.attribute.BasicFileAttributes)
+ */
+ @Override
+ public boolean accept(final Path basePath, final Path relativePath, final BasicFileAttributes attrs) {
+ accumulatedSize += attrs.size();
+ final boolean result = accumulatedSize > thresholdBytes;
+ final String match = result ? ">" : "<=";
+ final String accept = result ? "ACCEPTED" : "REJECTED";
+ LOGGER.trace("IfAccumulatedFileSize {}: {} accumulated size '{}' {} thresholdBytes '{}'", accept, relativePath,
+ accumulatedSize, match, thresholdBytes);
+ if (result) {
+ return IfAll.accept(nestedConditions, basePath, relativePath, attrs);
+ }
+ return result;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.logging.log4j.core.appender.rolling.action.PathCondition#beforeFileTreeWalk()
+ */
+ @Override
+ public void beforeFileTreeWalk() {
+ accumulatedSize = 0;
+ IfAll.beforeFileTreeWalk(nestedConditions);
+ }
+
+ /**
+ * Create an IfAccumulatedFileSize condition.
+ *
+ * @param threshold The threshold accumulated file size from which files will be deleted.
+ * @return An IfAccumulatedFileSize condition.
+ */
+ @PluginFactory
+ public static IfAccumulatedFileSize createFileSizeCondition( //
+ // @formatter:off
+ @PluginAttribute("exceeds") final String size,
+ @PluginElement("PathConditions") final PathCondition... nestedConditions) {
+ // @formatter:on
+
+ if (size == null) {
+ LOGGER.error("IfAccumulatedFileSize missing mandatory size threshold.");
+ }
+ final long threshold = size == null ? Long.MAX_VALUE : FileSize.parse(size, Long.MAX_VALUE);
+ return new IfAccumulatedFileSize(threshold, nestedConditions);
+ }
+
+ @Override
+ public String toString() {
+ final String nested = nestedConditions.length == 0 ? "" : " AND " + Arrays.toString(nestedConditions);
+ return "IfAccumulatedFileSize(exceeds=" + thresholdBytes + nested + ")";
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
index 2b3088c..88ead53 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
@@ -21,6 +21,7 @@ import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.Objects;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -29,7 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
* Composite {@code PathCondition} that only accepts objects that are accepted by <em>all</em> component conditions.
* Corresponds to logical "AND".
*/
-@Plugin(name = "IfAll", category = "Core", printObject = true)
+@Plugin(name = "IfAll", category = Core.CATEGORY_NAME, printObject = true)
public final class IfAll implements PathCondition {
private final PathCondition[] components;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cdc19e40/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
index 6b71542..b5300ba 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
@@ -21,6 +21,7 @@ import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.Objects;
+import org.apache.logging.log4j.core.Core;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.config.plugins.PluginElement;
import org.apache.logging.log4j.core.config.plugins.PluginFactory;
@@ -29,7 +30,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory;
* Composite {@code PathCondition} that accepts objects that are accepted by <em>any</em> component conditions.
* Corresponds to logical "OR".
*/
-@Plugin(name = "IfAny", category = "Core", printObject = true)
+@Plugin(name = "IfAny", category = Core.CATEGORY_NAME, printObject = true)
public final class IfAny implements PathCondition {
private final PathCondition[] components;