Branch: refs/heads/master Home: https://github.com/qos-ch/logback Commit: e2ae83e648727f685b67a2b60c23df156a9f492e https://github.com/qos-ch/logback/commit/e2ae83e648727f685b67a2b60c23df156a9... Author: Ceki Gulcu <ceki@qos.ch> Date: 2016-03-27 (Sun, 27 Mar 2016) Changed paths: A logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedRollingPolicy.java M logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java M logback-core/src/test/java/ch/qos/logback/core/rolling/ConfigParameters.java M logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemoval_Test.java M logback-core/src/test/java/ch/qos/logback/core/rolling/helper/RollingCalendarTest.java M logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java M logback-examples/src/main/java/chapters/appenders/ConfigurationTester.java M logback-examples/src/main/resources/chapters/appenders/conf/logback-PrudentTimeBasedRolling.xml M logback-examples/src/main/resources/chapters/appenders/conf/logback-RollingTimeBased.xml M logback-site/src/site/pages/manual/appenders.html Log Message: ----------- added SizeAndTimeBasedRollingPolicy, documenting totalSizeCap option in TimeBasedRollingPolicy, general maintenance Commit: 6d570808f41547adb97e41c3cc869f884c36b280 https://github.com/qos-ch/logback/commit/6d570808f41547adb97e41c3cc869f884c3... Author: Ceki Gulcu <ceki@qos.ch> Date: 2016-03-27 (Sun, 27 Mar 2016) Changed paths: M logback-core/src/main/java/ch/qos/logback/core/rolling/helper/TimeBasedArchiveRemover.java M logback-core/src/test/java/ch/qos/logback/core/AsyncAppenderBaseTest.java Log Message: ----------- minor clean up Commit: ef579e7a9313ba6a80e6263d1d345c3cf59e9a79 https://github.com/qos-ch/logback/commit/ef579e7a9313ba6a80e6263d1d345c3cf59... Author: Ceki Gulcu <ceki@qos.ch> Date: 2016-03-27 (Sun, 27 Mar 2016) Changed paths: R logback-examples/src/main/java/chapters/appenders/countingConsole.xml R logback-examples/src/main/java/chapters/appenders/mail/customBufferSize.xml R logback-examples/src/main/java/chapters/appenders/mail/gmailSSL.xml R logback-examples/src/main/java/chapters/appenders/mail/gmailSTARTTLS.xml R logback-examples/src/main/java/chapters/appenders/mail/mail1.xml R logback-examples/src/main/java/chapters/appenders/mail/mail2.xml R logback-examples/src/main/java/chapters/appenders/mail/mail3.xml R logback-examples/src/main/java/chapters/appenders/mail/mailWithMDCBasedDiscriminator.xml R logback-examples/src/main/java/chapters/appenders/mail/mailWithMarker.xml R logback-examples/src/main/java/chapters/appenders/mail/mailWithMarker_GEventEvaluator.xml R logback-examples/src/main/java/chapters/appenders/mail/mailWithMarker_Janino.xml R logback-examples/src/main/java/chapters/appenders/sift/access-siftingFile.xml R logback-examples/src/main/java/chapters/appenders/sift/byUserid.xml R logback-examples/src/main/java/chapters/appenders/socket/client1.xml R logback-examples/src/main/java/chapters/appenders/socket/client2.xml R logback-examples/src/main/java/chapters/appenders/socket/server1.xml R logback-examples/src/main/java/chapters/appenders/socket/server2.xml R logback-examples/src/main/java/chapters/architecture/sample-config-1.xml R logback-examples/src/main/java/chapters/architecture/sample-config-2.xml R logback-examples/src/main/java/chapters/architecture/sample-config-3.xml R logback-examples/src/main/java/chapters/configuration/additivityFlag.xml R logback-examples/src/main/java/chapters/configuration/containingConfig.xml R logback-examples/src/main/java/chapters/configuration/contextName.xml R logback-examples/src/main/java/chapters/configuration/contextScopedVariable.xml R logback-examples/src/main/java/chapters/configuration/duplicate.xml R logback-examples/src/main/java/chapters/configuration/includedConfig.xml R logback-examples/src/main/java/chapters/configuration/insertFromJNDI.xml R logback-examples/src/main/java/chapters/configuration/multiple.xml R logback-examples/src/main/java/chapters/configuration/onConsoleStatusListener.xml R logback-examples/src/main/java/chapters/configuration/restricted.xml R logback-examples/src/main/java/chapters/configuration/sample0.xml R logback-examples/src/main/java/chapters/configuration/sample1.xml R logback-examples/src/main/java/chapters/configuration/sample2.xml R logback-examples/src/main/java/chapters/configuration/sample3.xml R logback-examples/src/main/java/chapters/configuration/sample4.xml R logback-examples/src/main/java/chapters/configuration/scan1.xml R logback-examples/src/main/java/chapters/configuration/scan2.xml R logback-examples/src/main/java/chapters/configuration/variableSubstitution1.xml R logback-examples/src/main/java/chapters/configuration/variableSubstitution2.xml R logback-examples/src/main/java/chapters/configuration/variableSubstitution3.xml R logback-examples/src/main/java/chapters/configuration/variableSubstitution4.xml R logback-examples/src/main/java/chapters/configuration/variables1.properties R logback-examples/src/main/java/chapters/configuration/variables2.properties R logback-examples/src/main/java/chapters/filters/accessEventEvaluator.xml R logback-examples/src/main/java/chapters/filters/accessEventEvaluator2.xml R logback-examples/src/main/java/chapters/filters/basicConfiguration.xml R logback-examples/src/main/java/chapters/filters/basicEventEvaluator.xml R logback-examples/src/main/java/chapters/filters/duplicateMessage.xml R logback-examples/src/main/java/chapters/filters/evaluatorWithMatcher.xml R logback-examples/src/main/java/chapters/filters/levelFilterConfig.xml R logback-examples/src/main/java/chapters/filters/mdcfilter.xml R logback-examples/src/main/java/chapters/filters/sampleFilterConfig.xml R logback-examples/src/main/java/chapters/filters/sampleTurboFilterConfig.xml R logback-examples/src/main/java/chapters/filters/thresholdFilterConfig.xml R logback-examples/src/main/java/chapters/filters/turboFilters.xml R logback-examples/src/main/java/chapters/layouts/callerEvaluatorConfig.xml R logback-examples/src/main/java/chapters/layouts/exceptionEvaluatorConfig.xml R logback-examples/src/main/java/chapters/layouts/highlighted.xml R logback-examples/src/main/java/chapters/layouts/htmlLayoutConfig1.xml R logback-examples/src/main/java/chapters/layouts/log4jXMLLayout.xml R logback-examples/src/main/java/chapters/layouts/mySampleConverterConfig.xml R logback-examples/src/main/java/chapters/layouts/sampleLayoutConfig.xml R logback-examples/src/main/java/chapters/layouts/sampleLayoutConfig2.xml R logback-examples/src/main/java/chapters/mdc/mdc1.xml R logback-examples/src/main/java/chapters/mdc/simpleMDC.xml R logback-examples/src/main/java/chapters/migrationFromLog4j/log4jTrivial.properties R logback-examples/src/main/java/chapters/migrationFromLog4j/logback-trivial.xml R logback-examples/src/main/java/chapters/onJoran/calculator/calculator1.xml R logback-examples/src/main/java/chapters/onJoran/calculator/calculator2.xml R logback-examples/src/main/java/chapters/onJoran/calculator/calculator3.xml R logback-examples/src/main/java/chapters/onJoran/helloWorld/hello.xml R logback-examples/src/main/java/chapters/onJoran/implicit/implicit1.xml R logback-examples/src/main/java/chapters/onJoran/newRule/newRule.xml R logback-examples/src/main/java/chapters/receivers/socket/appender1.xml R logback-examples/src/main/java/chapters/receivers/socket/appender2.xml R logback-examples/src/main/java/chapters/receivers/socket/appender3.xml R logback-examples/src/main/java/chapters/receivers/socket/appender4.xml R logback-examples/src/main/java/chapters/receivers/socket/receiver1.xml R logback-examples/src/main/java/chapters/receivers/socket/receiver2.xml R logback-examples/src/main/java/chapters/receivers/socket/receiver3.xml R logback-examples/src/main/java/chapters/receivers/socket/receiver4.xml M logback-examples/src/main/resources/chapters/appenders/conf/logback-sizeAndTime.xml A logback-examples/src/main/resources/chapters/appenders/conf/logback-sizeAndTime_NEW.xml A logback-examples/src/main/resources/chapters/appenders/countingConsole.xml A logback-examples/src/main/resources/chapters/appenders/mail/customBufferSize.xml A logback-examples/src/main/resources/chapters/appenders/mail/gmailSSL.xml A logback-examples/src/main/resources/chapters/appenders/mail/gmailSTARTTLS.xml A logback-examples/src/main/resources/chapters/appenders/mail/mail1.xml A logback-examples/src/main/resources/chapters/appenders/mail/mail2.xml A logback-examples/src/main/resources/chapters/appenders/mail/mail3.xml A logback-examples/src/main/resources/chapters/appenders/mail/mailWithMDCBasedDiscriminator.xml A logback-examples/src/main/resources/chapters/appenders/mail/mailWithMarker.xml A logback-examples/src/main/resources/chapters/appenders/mail/mailWithMarker_GEventEvaluator.xml A logback-examples/src/main/resources/chapters/appenders/mail/mailWithMarker_Janino.xml A logback-examples/src/main/resources/chapters/appenders/sift/access-siftingFile.xml A logback-examples/src/main/resources/chapters/appenders/sift/byUserid.xml A logback-examples/src/main/resources/chapters/appenders/socket/client1.xml A logback-examples/src/main/resources/chapters/appenders/socket/client2.xml A logback-examples/src/main/resources/chapters/appenders/socket/server1.xml A logback-examples/src/main/resources/chapters/appenders/socket/server2.xml A logback-examples/src/main/resources/chapters/architecture/sample-config-1.xml A logback-examples/src/main/resources/chapters/architecture/sample-config-2.xml A logback-examples/src/main/resources/chapters/architecture/sample-config-3.xml A logback-examples/src/main/resources/chapters/configuration/additivityFlag.xml A logback-examples/src/main/resources/chapters/configuration/containingConfig.xml A logback-examples/src/main/resources/chapters/configuration/contextName.xml A logback-examples/src/main/resources/chapters/configuration/contextScopedVariable.xml A logback-examples/src/main/resources/chapters/configuration/duplicate.xml A logback-examples/src/main/resources/chapters/configuration/includedConfig.xml A logback-examples/src/main/resources/chapters/configuration/insertFromJNDI.xml A logback-examples/src/main/resources/chapters/configuration/multiple.xml A logback-examples/src/main/resources/chapters/configuration/onConsoleStatusListener.xml A logback-examples/src/main/resources/chapters/configuration/restricted.xml A logback-examples/src/main/resources/chapters/configuration/sample0.xml A logback-examples/src/main/resources/chapters/configuration/sample1.xml A logback-examples/src/main/resources/chapters/configuration/sample2.xml A logback-examples/src/main/resources/chapters/configuration/sample3.xml A logback-examples/src/main/resources/chapters/configuration/sample4.xml A logback-examples/src/main/resources/chapters/configuration/scan1.xml A logback-examples/src/main/resources/chapters/configuration/scan2.xml A logback-examples/src/main/resources/chapters/configuration/variableSubstitution1.xml A logback-examples/src/main/resources/chapters/configuration/variableSubstitution2.xml A logback-examples/src/main/resources/chapters/configuration/variableSubstitution3.xml A logback-examples/src/main/resources/chapters/configuration/variableSubstitution4.xml A logback-examples/src/main/resources/chapters/configuration/variables1.properties A logback-examples/src/main/resources/chapters/configuration/variables2.properties A logback-examples/src/main/resources/chapters/filters/accessEventEvaluator.xml A logback-examples/src/main/resources/chapters/filters/accessEventEvaluator2.xml A logback-examples/src/main/resources/chapters/filters/basicConfiguration.xml A logback-examples/src/main/resources/chapters/filters/basicEventEvaluator.xml A logback-examples/src/main/resources/chapters/filters/duplicateMessage.xml A logback-examples/src/main/resources/chapters/filters/evaluatorWithMatcher.xml A logback-examples/src/main/resources/chapters/filters/levelFilterConfig.xml A logback-examples/src/main/resources/chapters/filters/mdcfilter.xml A logback-examples/src/main/resources/chapters/filters/sampleFilterConfig.xml A logback-examples/src/main/resources/chapters/filters/sampleTurboFilterConfig.xml A logback-examples/src/main/resources/chapters/filters/thresholdFilterConfig.xml A logback-examples/src/main/resources/chapters/filters/turboFilters.xml A logback-examples/src/main/resources/chapters/layouts/callerEvaluatorConfig.xml A logback-examples/src/main/resources/chapters/layouts/exceptionEvaluatorConfig.xml A logback-examples/src/main/resources/chapters/layouts/highlighted.xml A logback-examples/src/main/resources/chapters/layouts/htmlLayoutConfig1.xml A logback-examples/src/main/resources/chapters/layouts/log4jXMLLayout.xml A logback-examples/src/main/resources/chapters/layouts/mySampleConverterConfig.xml A logback-examples/src/main/resources/chapters/layouts/sampleLayoutConfig.xml A logback-examples/src/main/resources/chapters/layouts/sampleLayoutConfig2.xml A logback-examples/src/main/resources/chapters/mdc/mdc1.xml A logback-examples/src/main/resources/chapters/mdc/simpleMDC.xml A logback-examples/src/main/resources/chapters/migrationFromLog4j/log4jTrivial.properties A logback-examples/src/main/resources/chapters/migrationFromLog4j/logback-trivial.xml A logback-examples/src/main/resources/chapters/onJoran/calculator/calculator1.xml A logback-examples/src/main/resources/chapters/onJoran/calculator/calculator2.xml A logback-examples/src/main/resources/chapters/onJoran/calculator/calculator3.xml A logback-examples/src/main/resources/chapters/onJoran/calculator/readme.txt A logback-examples/src/main/resources/chapters/onJoran/helloWorld/hello.xml A logback-examples/src/main/resources/chapters/onJoran/helloWorld/readme.txt A logback-examples/src/main/resources/chapters/onJoran/implicit/implicit1.xml A logback-examples/src/main/resources/chapters/onJoran/implicit/readme.txt A logback-examples/src/main/resources/chapters/onJoran/newRule/newRule.xml A logback-examples/src/main/resources/chapters/onJoran/newRule/readme.txt A logback-examples/src/main/resources/chapters/receivers/socket/appender1.xml A logback-examples/src/main/resources/chapters/receivers/socket/appender2.xml A logback-examples/src/main/resources/chapters/receivers/socket/appender3.xml A logback-examples/src/main/resources/chapters/receivers/socket/appender4.xml A logback-examples/src/main/resources/chapters/receivers/socket/receiver1.xml A logback-examples/src/main/resources/chapters/receivers/socket/receiver2.xml A logback-examples/src/main/resources/chapters/receivers/socket/receiver3.xml A logback-examples/src/main/resources/chapters/receivers/socket/receiver4.xml M logback-site/src/site/pages/manual/appenders.html M logback-site/src/site/pages/manual/configuration.html M logback-site/src/site/pages/manual/filters.html M logback-site/src/site/pages/manual/layouts.html M logback-site/src/site/pages/manual/receivers.html M logback-site/src/site/pages/news.html Log Message: ----------- use src/main/resources folder for xml and properties files Compare: https://github.com/qos-ch/logback/compare/77ce3dcf42e4...ef579e7a9313