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 2016/08/28 12:24:57 UTC
[36/50] logging-log4j2 git commit: Merge branch 'master' into
LOG4J-1181
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/02be6e1f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/02be6e1f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/02be6e1f
Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Commit: 02be6e1fdefad83647eac0d8cfeeca4487996823
Parents: 3250c19 6b2573a
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon Jul 25 13:55:48 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon Jul 25 13:55:48 2016 +0200
----------------------------------------------------------------------
.../org/apache/logging/log4j/LoggerTest.java | 2 +-
.../logging/log4j/core/LoggerContext.java | 13 +-
.../log4j/core/impl/ExtendedClassInfo.java | 23 +-
.../core/impl/ExtendedStackTraceElement.java | 46 +-
.../log4j/core/impl/ThrowableFormatOptions.java | 541 ++++---
.../logging/log4j/core/impl/ThrowableProxy.java | 1390 +++++++++---------
.../ExtendedThrowablePatternConverter.java | 3 +-
.../log4j/core/pattern/HtmlTextRenderer.java | 38 +
.../log4j/core/pattern/JAnsiTextRenderer.java | 334 +++++
.../core/pattern/MessagePatternConverter.java | 62 +-
.../log4j/core/pattern/PlainTextRenderer.java | 40 +
.../pattern/RootThrowablePatternConverter.java | 2 +-
.../log4j/core/pattern/TextRenderer.java | 46 +
.../apache/logging/log4j/core/util/Loader.java | 5 +
.../log4j/FormatterLoggerManualExample.java | 7 +-
.../apache/logging/log4j/LogRolloverTest.java | 18 +-
.../ConsoleAppenderAnsiMessagesMain.java | 110 +-
.../ConsoleAppenderAnsiStyleJira180Main.java | 119 +-
.../ConsoleAppenderAnsiStyleJira272Main.java | 121 +-
.../ConsoleAppenderAnsiStyleJira319Main.java | 123 +-
.../ConsoleAppenderAnsiStyleLayoutMain.java | 149 +-
.../ConsoleAppenderAnsiStyleNameLayoutMain.java | 11 +-
...nsoleAppenderDefaultSuppressedThrowable.java | 131 +-
...nsoleAppenderHighlightLayoutDefaultMain.java | 11 +-
...nsoleAppenderHighlightLayoutLogbackMain.java | 11 +-
.../ConsoleAppenderHighlightLayoutMain.java | 11 +-
.../ConsoleAppenderJAnsiMessageMain.java | 154 +-
.../ConsoleAppenderJAnsiXExceptionMain.java | 76 +
.../ConsoleAppenderNoAnsiStyleLayoutMain.java | 145 +-
.../log4j/core/appender/Jira739Test.java | 103 +-
.../core/appender/ProgressConsoleTest.java | 7 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 2 -
.../rolling/RollingAppenderCronTest.java | 2 -
.../log4j/core/config/ConfiguratorTest.java | 5 +-
.../log4j/core/config/TestConfigurator.java | 24 +-
.../core/config/TestConfiguratorError.java | 13 +-
.../builder/ConfigurationAssemblerTest.java | 5 +-
.../core/filter/DynamicThresholdFilterTest.java | 26 +-
.../core/impl/ThrowableFormatOptionsTest.java | 208 ++-
.../lookup/MainInputArgumentsLookupTest.java | 11 +-
.../core/pattern/MessageJansiConverterTest.java | 62 +
.../pattern/MessageStyledConverterTest.java | 62 +
.../src/test/resources/log4j-message-ansi.xml | 34 +
.../src/test/resources/log4j-message-styled.xml | 34 +
.../test/resources/log4j2-console-msg-ansi.xml | 31 +
.../log4j2-console-xex-ansi-custom.xml | 31 +
.../resources/log4j2-console-xex-ansi-kirk.xml | 31 +
.../test/resources/log4j2-console-xex-ansi.xml | 31 +
src/changes/changes.xml | 8 +-
src/site/xdoc/articles.xml | 46 +-
src/site/xdoc/manual/layouts.xml.vm | 95 +-
51 files changed, 2941 insertions(+), 1672 deletions(-)
----------------------------------------------------------------------