[logback] 02/03: Merge tag 'upstream/1.1.7'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Apr 24 17:16:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository logback.
commit c8f2b9b2ede3a218f9a5f7bdb93835cd74200c9a
Merge: 289bddf 569e30d
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Sun Apr 24 19:08:44 2016 +0200
Merge tag 'upstream/1.1.7'
Upstream version 1.1.7
docs/access.html | 8 +-
docs/beagle/index.html | 3 +
docs/bugreport.html | 4 +
docs/codes.html | 4 +
docs/demo.html | 4 +
docs/dependencies.html | 4 +
docs/documentation.html | 3 +
docs/download.html | 26 +-
docs/faq.html | 10 +-
docs/index.html | 4 +
docs/license.html | 4 +
docs/mailinglist.html | 4 +
docs/manual/appenders.html | 248 ++++++-----
docs/manual/configuration.html | 46 +-
docs/manual/filters.html | 20 +-
docs/manual/groovy_ja.html | 4 +-
docs/manual/introduction.html | 2 +-
docs/manual/layouts.html | 8 +-
docs/manual/loggingSeparation.html | 6 +-
docs/manual/menu.js | 14 +
docs/manual/onJoran.html | 2 +-
docs/manual/receivers.html | 14 +-
docs/news.html | 56 ++-
docs/project-reports.html | 8 +-
docs/reasonsToSwitch.html | 4 +
docs/setup.html | 14 +-
docs/templates/creative.js | 2 +-
docs/templates/right.js | 28 +-
docs/volunteer.html | 4 +
logback-access/pom.xml | 2 +-
.../ch/qos/logback/access/tomcat/LogbackValve.java | 14 +-
logback-classic/pom.xml | 2 +-
.../classic/gaffer/ConfigurationDelegate.groovy | 350 +++++++--------
.../qos/logback/classic/gaffer/PropertyUtil.groovy | 6 +-
.../main/java/ch/qos/logback/classic/Logger.java | 9 +-
.../java/ch/qos/logback/classic/LoggerContext.java | 9 +
.../classic/joran/ReconfigureOnChangeTask.java | 168 ++++++++
.../joran/ReconfigureOnChangeTaskListener.java | 12 +
.../classic/joran/action/ConfigurationAction.java | 65 ++-
.../ch/qos/logback/classic/net/ReceiverBase.java | 2 +-
.../ch/qos/logback/classic/net/SocketReceiver.java | 5 +-
.../classic/turbo/ReconfigureOnChangeFilter.java | 4 +-
.../gaffer/ConfigurationDelegateTest.groovy | 8 +-
.../{turbo => joran/roct}/inclusion/inner0.xml | 0
.../roct}/inclusion/topByResource.xml | 2 +-
.../test/input/joran/roct/inclusion/topLevel0.xml | 9 +
.../test/input/{turbo => joran/roct}/scan 1.groovy | 2 +-
.../test/input/{turbo => joran/roct}/scan 1.xml | 2 +-
.../{turbo => joran/roct}/scan_logback_474.xml | 2 +-
.../test/input/{turbo => joran/roct}/scan_perf.xml | 0
logback-classic/src/test/input/joran/scan1.xml | 10 -
.../src/test/input/joran/valueOfConvention.xml | 26 ++
.../src/test/input/turbo/inclusion/topLevel0.xml | 9 -
.../classic/LoggerContextConcurrentResetTest.java | 104 +++++
.../ch/qos/logback/classic/LoggerContextTest.java | 17 +-
.../java/ch/qos/logback/classic/PackageTest.java | 5 +-
.../issue/lbclassic135/LoggingRunnable.java | 2 +-
.../classic/joran/JoranConfiguratorTest.java | 54 +--
.../classic/joran/ReconfigureOnChangeTaskTest.java | 472 +++++++++++++++++++++
.../classic/net/SocketAppenderMessageLossTest.java | 9 +-
.../qos/logback/classic/pattern/ConverterTest.java | 7 +-
.../logback/classic/sift/SiftingAppenderTest.java | 90 +++-
.../classic/spi/PackagingDataCalculatorTest.java | 2 +
.../classic/turbo/ReconfigureOnChangeTest.java | 1 +
logback-classic/src/test/java/org/slf4j/Main.java | 1 +
logback-classic/src/test/java/org/slf4j/Main2.java | 63 +++
.../src/test/resources/Xlogback-test.xml | 14 -
logback-core/pom.xml | 7 +-
.../ch/qos/logback/core/AsyncAppenderBase.java | 2 +
.../src/main/java/ch/qos/logback/core/Context.java | 18 +-
.../main/java/ch/qos/logback/core/ContextBase.java | 48 ++-
.../java/ch/qos/logback/core/CoreConstants.java | 21 +-
.../core/db/BindDataSourceToJNDIAction.java | 12 +-
.../logback/core/joran/GenericConfigurator.java | 19 +-
.../logback/core/joran/JoranConfiguratorBase.java | 11 +-
.../logback/core/joran/action/IncludeAction.java | 20 +-
.../core/joran/action/NestedBasicPropertyIA.java | 14 +-
.../core/joran/action/NestedComplexPropertyIA.java | 17 +-
.../qos/logback/core/joran/action/ParamAction.java | 8 +-
.../logback/core/joran/event/SaxEventRecorder.java | 14 +-
.../qos/logback/core/joran/event/StartEvent.java | 16 +-
.../core/joran/spi/ConfigurationWatchList.java | 8 +
.../joran/util/ConfigurationWatchListUtil.java | 28 +-
.../logback/core/joran/util/PropertySetter.java | 145 ++-----
.../core/joran/util/beans/BeanDescription.java | 71 ++++
.../joran/util/beans/BeanDescriptionCache.java | 38 ++
.../joran/util/beans/BeanDescriptionFactory.java | 64 +++
.../logback/core/joran/util/beans/BeanUtil.java | 137 ++++++
...aultTimeBasedFileNamingAndTriggeringPolicy.java | 7 +
.../core/rolling/SizeAndTimeBasedFNATP.java | 31 +-
.../rolling/SizeAndTimeBasedRollingPolicy.java | 35 ++
.../core/rolling/SizeBasedTriggeringPolicy.java | 8 +-
.../core/rolling/TimeBasedRollingPolicy.java | 56 ++-
.../core/rolling/helper/ArchiveRemover.java | 4 +-
.../rolling/helper/AsynchronousCompressor.java | 34 --
.../core/rolling/helper/CompressionRunnable.java | 33 --
.../logback/core/rolling/helper/Compressor.java | 33 +-
.../core/rolling/helper/DefaultArchiveRemover.java | 135 ------
.../core/rolling/helper/FileNamePattern.java | 5 +
.../core/rolling/helper/RollingCalendar.java | 21 +-
.../helper/SizeAndTimeBasedArchiveRemover.java | 32 +-
.../rolling/helper/TimeBasedArchiveRemover.java | 232 +++++++++-
.../core/sift/SiftingJoranConfiguratorBase.java | 6 +-
.../logback/core/spi/AbstractComponentTracker.java | 9 +-
.../ch/qos/logback/core/status/StatusUtil.java | 11 +-
.../java/ch/qos/logback/core/subst/Tokenizer.java | 5 +-
.../logback/core/util/DefaultInvocationGate.java | 113 +++++
.../qos/logback/core/util/ExecutorServiceUtil.java | 7 +
.../java/ch/qos/logback/core/util/FileSize.java | 24 +-
.../ch/qos/logback/core/util/InvocationGate.java | 65 +--
.../test/input/{compress2.txt => compress3.txt} | 8 +
.../ch/qos/logback/core/AsyncAppenderBaseTest.java | 50 ++-
.../contention/AbstractMultiThreadedHarness.java | 2 +-
.../core/contention/MultiThreadedHarness.java | 2 +-
.../WaitOnExecutionMultiThreadedHarness.java | 2 +-
.../qos/logback/core/issue/LOGBACK_849/Basic.java | 2 +-
.../qos/logback/core/joran/SimpleConfigurator.java | 5 +-
.../core/joran/TrivialConfiguratorTest.java | 6 +-
.../core/joran/action/IncludeActionTest.java | 7 +-
.../core/joran/replay/FruitConfigurator.java | 6 +-
.../core/joran/util/PropertySetterTest.java | 7 +-
.../net/AbstractSocketAppenderIntegrationTest.java | 32 +-
.../core/net/AbstractSocketAppenderTest.java | 38 +-
.../ch/qos/logback/core/net/mock/MockContext.java | 14 +-
...vice.java => MockScheduledExecutorService.java} | 25 +-
.../server/SSLServerSocketAppenderBaseTest.java | 5 +-
.../ServerSocketAppenderBaseFunctionalTest.java | 6 +-
.../qos/logback/core/rolling/ConfigParameters.java | 52 +++
.../core/rolling/RollingFileAppenderTest.java | 1 +
.../core/rolling/ScaffoldingForRollingTests.java | 12 +-
.../core/rolling/SizeAndTimeBasedFNATP_Test.java | 46 +-
...BasedFileNamingAndTriggeringPolicyBaseTest.java | 17 +-
.../logback/core/rolling/TimeBasedRollingTest.java | 6 +-
.../TimeBasedRollingWithArchiveRemoval_Test.java | 359 ++++++++++++----
.../core/rolling/helper/RollingCalendarTest.java | 40 +-
.../ch/qos/logback/core/status/StatusChecker.java | 8 +
.../ch/qos/logback/core/subst/TokenizerTest.java | 10 +
.../core/testUtil/DelayingListAppender.java | 5 +-
.../core/util/DefaultInvocationGateTest.java | 82 ++++
.../ch/qos/logback/core/util/FileSizeTest.java | 22 +-
.../logback/core/util/FixedRateInvocationGate.java | 19 +
logback-examples/pom.xml | 2 +-
logback-examples/setClasspath.cmd | 8 +-
logback-examples/setClasspath.sh | 8 +-
.../chapters/appenders/ConfigurationTester.java | 13 +-
.../java/chapters/appenders/countingConsole.xml | 19 -
.../chapters/appenders/mail/customBufferSize.xml | 20 -
.../main/java/chapters/appenders/mail/gmailSSL.xml | 22 -
.../java/chapters/appenders/mail/gmailSTARTTLS.xml | 21 -
.../main/java/chapters/appenders/mail/mail1.xml | 17 -
.../main/java/chapters/appenders/mail/mail2.xml | 18 -
.../main/java/chapters/appenders/mail/mail3.xml | 24 --
.../mail/mailWithMDCBasedDiscriminator.xml | 27 --
.../chapters/appenders/mail/mailWithMarker.xml | 24 --
.../mail/mailWithMarker_GEventEvaluator.xml | 24 --
.../appenders/mail/mailWithMarker_Janino.xml | 25 --
.../chapters/appenders/sift/access-siftingFile.xml | 22 -
.../main/java/chapters/appenders/sift/byUserid.xml | 21 -
.../java/chapters/appenders/socket/client1.xml | 23 -
.../java/chapters/appenders/socket/client2.xml | 28 --
.../java/chapters/appenders/socket/server1.xml | 47 --
.../java/chapters/appenders/socket/server2.xml | 25 --
.../java/chapters/architecture/sample-config-1.xml | 15 -
.../java/chapters/architecture/sample-config-2.xml | 24 --
.../java/chapters/architecture/sample-config-3.xml | 26 --
.../java/chapters/configuration/additivityFlag.xml | 26 --
.../chapters/configuration/containingConfig.xml | 12 -
.../java/chapters/configuration/contextName.xml | 15 -
.../configuration/contextScopedVariable.xml | 15 -
.../main/java/chapters/configuration/duplicate.xml | 19 -
.../java/chapters/configuration/includedConfig.xml | 13 -
.../java/chapters/configuration/insertFromJNDI.xml | 18 -
.../main/java/chapters/configuration/multiple.xml | 21 -
.../configuration/onConsoleStatusListener.xml | 21 -
.../java/chapters/configuration/restricted.xml | 25 --
.../main/java/chapters/configuration/sample0.xml | 17 -
.../main/java/chapters/configuration/sample1.xml | 17 -
.../main/java/chapters/configuration/sample2.xml | 23 -
.../main/java/chapters/configuration/sample3.xml | 24 --
.../main/java/chapters/configuration/sample4.xml | 21 -
.../src/main/java/chapters/configuration/scan1.xml | 17 -
.../src/main/java/chapters/configuration/scan2.xml | 15 -
.../configuration/variableSubstitution1.xml | 15 -
.../configuration/variableSubstitution2.xml | 13 -
.../configuration/variableSubstitution3.xml | 15 -
.../configuration/variableSubstitution4.xml | 15 -
.../chapters/configuration/variables1.properties | 1 -
.../chapters/configuration/variables2.properties | 3 -
.../java/chapters/filters/accessEventEvaluator.xml | 17 -
.../chapters/filters/accessEventEvaluator2.xml | 21 -
.../java/chapters/filters/basicConfiguration.xml | 12 -
.../java/chapters/filters/basicEventEvaluator.xml | 19 -
.../java/chapters/filters/duplicateMessage.xml | 16 -
.../java/chapters/filters/evaluatorWithMatcher.xml | 25 --
.../java/chapters/filters/levelFilterConfig.xml | 17 -
.../src/main/java/chapters/filters/mdcfilter.xml | 23 -
.../java/chapters/filters/sampleFilterConfig.xml | 16 -
.../chapters/filters/sampleTurboFilterConfig.xml | 16 -
.../chapters/filters/thresholdFilterConfig.xml | 20 -
.../main/java/chapters/filters/turboFilters.xml | 25 --
.../chapters/layouts/callerEvaluatorConfig.xml | 18 -
.../chapters/layouts/exceptionEvaluatorConfig.xml | 16 -
.../src/main/java/chapters/layouts/highlighted.xml | 16 -
.../java/chapters/layouts/htmlLayoutConfig1.xml | 14 -
.../main/java/chapters/layouts/log4jXMLLayout.xml | 14 -
.../chapters/layouts/mySampleConverterConfig.xml | 15 -
.../java/chapters/layouts/sampleLayoutConfig.xml | 12 -
.../java/chapters/layouts/sampleLayoutConfig2.xml | 16 -
.../src/main/java/chapters/mdc/mdc1.xml | 16 -
.../src/main/java/chapters/mdc/simpleMDC.xml | 15 -
.../migrationFromLog4j/log4jTrivial.properties | 3 -
.../migrationFromLog4j/logback-trivial.xml | 10 -
.../chapters/onJoran/calculator/calculator1.xml | 3 -
.../chapters/onJoran/calculator/calculator2.xml | 10 -
.../chapters/onJoran/calculator/calculator3.xml | 15 -
.../java/chapters/onJoran/helloWorld/hello.xml | 2 -
.../java/chapters/onJoran/implicit/implicit1.xml | 21 -
.../main/java/chapters/onJoran/newRule/newRule.xml | 23 -
.../java/chapters/receivers/socket/appender1.xml | 22 -
.../java/chapters/receivers/socket/appender2.xml | 28 --
.../java/chapters/receivers/socket/appender3.xml | 21 -
.../java/chapters/receivers/socket/appender4.xml | 27 --
.../java/chapters/receivers/socket/receiver1.xml | 26 --
.../java/chapters/receivers/socket/receiver2.xml | 32 --
.../java/chapters/receivers/socket/receiver3.xml | 28 --
.../java/chapters/receivers/socket/receiver4.xml | 34 --
logback-site/pom.xml | 2 +-
logback-site/src/site/pages/access.html | 4 +
logback-site/src/site/pages/beagle/index.html | 3 +
logback-site/src/site/pages/bugreport.html | 4 +
logback-site/src/site/pages/codes.html | 4 +
logback-site/src/site/pages/demo.html | 4 +
logback-site/src/site/pages/dependencies.html | 4 +
logback-site/src/site/pages/documentation.html | 3 +
logback-site/src/site/pages/download.html | 22 +-
logback-site/src/site/pages/faq.html | 4 +
logback-site/src/site/pages/index.html | 4 +
logback-site/src/site/pages/license.html | 4 +
logback-site/src/site/pages/mailinglist.html | 4 +
logback-site/src/site/pages/manual/appenders.html | 244 ++++++-----
.../src/site/pages/manual/configuration.html | 46 +-
logback-site/src/site/pages/manual/filters.html | 20 +-
logback-site/src/site/pages/manual/layouts.html | 8 +-
logback-site/src/site/pages/manual/menu.js | 14 +
logback-site/src/site/pages/manual/receivers.html | 14 +-
logback-site/src/site/pages/news.html | 56 ++-
logback-site/src/site/pages/reasonsToSwitch.html | 4 +
logback-site/src/site/pages/templates/creative.js | 2 +-
logback-site/src/site/pages/templates/right.js | 28 +-
logback-site/src/site/pages/volunteer.html | 4 +
pom.xml | 9 +-
src/main/clas/signed-clas.txt | 11 +-
252 files changed, 3761 insertions(+), 2970 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/logback.git
More information about the pkg-java-commits
mailing list