Merge branch 'master' into LOG4J-1181
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/e28d50be Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/e28d50be Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/e28d50be Branch: refs/heads/LOG4J-1181 Commit: e28d50be04dfa8cc47592a8e94c7f321435eaf8c Parents: d6debce 7f64fe8 Author: Mikael Ståldal <[email protected]> Authored: Mon Nov 30 10:04:57 2015 +0100 Committer: Mikael Ståldal <[email protected]> Committed: Mon Nov 30 10:04:57 2015 +0100 ---------------------------------------------------------------------- .../java/org/apache/log4j/LogWithMDCTest.java | 41 + .../java/org/apache/log4j/LogWithRouteTest.java | 42 + .../src/test/resources/log-RouteWithMDC.xml | 47 + log4j-1.2-api/src/test/resources/logWithMDC.xml | 40 + .../ParameterizedNoReferenceMessageFactory.java | 15 +- .../logging/log4j/status/StatusLogger.java | 3 +- .../org/apache/logging/log4j/core/Logger.java | 9 - .../log4j/core/appender/AbstractManager.java | 5 + .../core/appender/RollingFileAppender.java | 2 +- .../RollingRandomAccessFileAppender.java | 2 +- .../appender/rolling/CronTriggeringPolicy.java | 119 ++ .../rolling/DefaultRolloverStrategy.java | 46 +- .../log4j/core/appender/rolling/FileSize.java | 90 + .../appender/rolling/RollingFileManager.java | 48 +- .../rolling/RollingRandomAccessFileManager.java | 17 + .../rolling/SizeBasedTriggeringPolicy.java | 61 +- .../rolling/action/AbstractPathAction.java | 163 ++ .../appender/rolling/action/DeleteAction.java | 154 ++ .../rolling/action/DeletingVisitor.java | 97 ++ .../core/appender/rolling/action/Duration.java | 257 +++ .../rolling/action/FileRenameAction.java | 31 +- .../rolling/action/IfAccumulatedFileCount.java | 113 ++ .../rolling/action/IfAccumulatedFileSize.java | 116 ++ .../core/appender/rolling/action/IfAll.java | 116 ++ .../core/appender/rolling/action/IfAny.java | 86 + .../appender/rolling/action/IfFileName.java | 149 ++ .../appender/rolling/action/IfLastModified.java | 113 ++ .../core/appender/rolling/action/IfNot.java | 77 + .../appender/rolling/action/PathCondition.java | 44 + .../action/PathSortByModificationTime.java | 85 + .../appender/rolling/action/PathSorter.java | 27 + .../rolling/action/PathWithAttributes.java | 59 + .../appender/rolling/action/SortingVisitor.java | 58 + .../core/appender/routing/IdlePurgePolicy.java | 141 ++ .../core/appender/routing/PurgePolicy.java | 31 + .../core/appender/routing/RoutingAppender.java | 32 +- .../core/config/AbstractConfiguration.java | 97 +- .../log4j/core/config/Configuration.java | 23 +- .../log4j/core/config/ConfigurationMonitor.java | 37 - .../core/config/ConfigurationScheduler.java | 188 ++ .../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 | 23 + .../log4j/core/config/xml/XmlConfiguration.java | 6 +- .../log4j/core/jmx/LoggerContextAdmin.java | 5 - .../log4j/core/jmx/LoggerContextAdminMBean.java | 9 - .../log4j/core/script/AbstractScript.java | 16 + .../logging/log4j/core/script/Script.java | 16 + .../logging/log4j/core/script/ScriptFile.java | 14 +- .../log4j/core/script/ScriptManager.java | 47 +- .../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 + .../appender/mom/kafka/KafkaAppenderTest.java | 2 +- .../rolling/RollingAppenderCronTest.java | 111 ++ .../RollingAppenderCustomDeleteActionTest.java | 102 ++ ...lingAppenderDeleteAccumulatedCount1Test.java | 121 ++ ...lingAppenderDeleteAccumulatedCount2Test.java | 122 ++ ...ollingAppenderDeleteAccumulatedSizeTest.java | 89 + .../RollingAppenderDeleteMaxDepthTest.java | 120 ++ .../RollingAppenderDeleteNestedTest.java | 121 ++ ...ollingAppenderNoUnconditionalDeleteTest.java | 104 ++ .../rolling/action/CountingCondition.java | 62 + .../rolling/action/DeleteActionTest.java | 119 ++ .../rolling/action/DeletingVisitorTest.java | 135 ++ .../rolling/action/DummyFileAttributes.java | 86 + .../appender/rolling/action/DurationTest.java | 149 ++ .../appender/rolling/action/FixedCondition.java | 44 + .../action/IfAccumulatedFileCountTest.java | 75 + .../action/IfAccumulatedFileSizeTest.java | 130 ++ .../core/appender/rolling/action/IfAllTest.java | 54 + .../core/appender/rolling/action/IfAnyTest.java | 52 + .../appender/rolling/action/IfFileNameTest.java | 131 ++ .../rolling/action/IfLastModifiedTest.java | 97 ++ .../core/appender/rolling/action/IfNotTest.java | 52 + .../action/PathSortByModificationTimeTest.java | 93 + .../rolling/action/SortingVisitorTest.java | 94 + .../routing/RoutingAppenderWithPurgingTest.java | 108 ++ .../log4j/core/config/TestConfigurator.java | 2 +- .../plugins/convert/TypeConvertersTest.java | 3 + .../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 + ...-rolling-with-custom-delete-accum-count1.xml | 49 + ...-rolling-with-custom-delete-accum-count2.xml | 49 + ...4j-rolling-with-custom-delete-accum-size.xml | 48 + ...og4j-rolling-with-custom-delete-maxdepth.xml | 47 + .../log4j-rolling-with-custom-delete-nested.xml | 51 + ...olling-with-custom-delete-unconditional1.xml | 46 + ...olling-with-custom-delete-unconditional2.xml | 47 + ...olling-with-custom-delete-unconditional3.xml | 47 + .../log4j-rolling-with-custom-delete.xml | 47 + .../src/test/resources/log4j-routing-purge.xml | 71 + pom.xml | 2 +- src/changes/changes.xml | 24 + src/site/xdoc/manual/appenders.xml | 344 +++- 107 files changed, 8070 insertions(+), 444 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/e28d50be/pom.xml ----------------------------------------------------------------------
