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/11/28 17:15:54 UTC
[11/46] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-435-delete-on-rollover
Merge remote-tracking branch 'origin/master' into LOG4J2-435-delete-on-rollover
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e233f8c6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e233f8c6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e233f8c6
Branch: refs/heads/master
Commit: e233f8c6a36afa9aaad53358379542b78e446f0d
Parents: 43cc290 6e4ff73
Author: rpopma <rp...@apache.org>
Authored: Thu Nov 26 23:30:48 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Nov 26 23:30:48 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/Logger.java | 9 -
.../log4j/core/appender/AbstractManager.java | 5 +
.../core/appender/AbstractManager.java.orig | 166 ++
.../appender/rolling/CronTriggeringPolicy.java | 119 ++
.../appender/rolling/RollingFileManager.java | 48 +-
.../rolling/RollingFileManager.java.orig | 343 ++++
.../rolling/RollingRandomAccessFileManager.java | 17 +
.../RollingRandomAccessFileManager.java.orig | 252 +++
.../core/config/AbstractConfiguration.java | 97 +-
.../log4j/core/config/Configuration.java | 23 +-
.../log4j/core/config/ConfigurationMonitor.java | 37 -
.../core/config/ConfigurationScheduler.java | 184 ++
.../core/config/ConfiguratonFileWatcher.java | 66 +
.../log4j/core/config/CronScheduledFuture.java | 76 +
.../config/DefaultConfigurationMonitor.java | 43 -
.../core/config/FileConfigurationMonitor.java | 127 --
.../logging/log4j/core/config/LoggerConfig.java | 2 +-
.../logging/log4j/core/config/Scheduled.java | 32 +
.../config/builder/impl/BuiltConfiguration.java | 7 +-
.../core/config/json/JsonConfiguration.java | 6 +-
.../config/plugins/convert/TypeConverters.java | 9 +
.../log4j/core/config/xml/XmlConfiguration.java | 6 +-
.../log4j/core/jmx/LoggerContextAdmin.java | 5 -
.../log4j/core/jmx/LoggerContextAdminMBean.java | 9 -
.../log4j/core/layout/PatternLayout.java | 3 -
.../log4j/core/script/AbstractScript.java | 16 +
.../logging/log4j/core/script/Script.java | 16 +
.../logging/log4j/core/script/ScriptFile.java | 14 +-
.../logging/log4j/core/script/ScriptRef.java | 16 +
.../log4j/core/util/CloseShieldWriter.java | 16 +
.../logging/log4j/core/util/CronExpression.java | 1627 ++++++++++++++++++
.../apache/logging/log4j/core/util/IOUtils.java | 16 +
.../logging/log4j/core/util/WatchManager.java | 19 +-
.../core/util/datetime/FastDateParser.java | 5 +-
.../core/util/datetime/FastDatePrinter.java | 3 +
.../rolling/RollingAppenderCronTest.java | 111 ++
.../log4j/core/config/TestConfigurator.java | 2 +-
.../log4j/core/util/CronExpressionTest.java | 68 +
.../log4j/core/util/WatchManagerTest.java | 10 +-
.../src/test/resources/log4j-rolling-cron.xml | 54 +
.../src/test/resources/log4j-rolling-cron2.xml | 54 +
.../appender/mongodb/MongoDbConnection.java | 5 +-
src/changes/changes.xml | 12 +
src/site/xdoc/manual/appenders.xml | 18 +
44 files changed, 3455 insertions(+), 318 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e233f8c6/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
----------------------------------------------------------------------
diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java
index d102294,a4350c8..5c4924e
--- 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
@@@ -33,8 -32,8 +33,9 @@@ import javax.xml.bind.DatatypeConverter
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.appender.rolling.action.Duration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
+ import org.apache.logging.log4j.core.util.CronExpression;
import org.apache.logging.log4j.core.util.Loader;
import org.apache.logging.log4j.status.StatusLogger;