Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4d4cc894 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4d4cc894 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4d4cc894 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 4d4cc8941d708ea8c42d4e48cd374eaeef6c1110 Parents: bdba469 2fe34f7 Author: rpopma <rpo...@apache.org> Authored: Fri Aug 19 16:14:27 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Fri Aug 19 16:14:27 2016 +0900 ---------------------------------------------------------------------- log4j-1.2-api/pom.xml | 4 + .../config/Log4j1ConfigurationFactory.java | 70 +++++-- .../apache/log4j/layout/Log4j1XmlLayout.java | 161 +++++++++++++++ .../pattern/Log4j1MdcPatternConverter.java | 91 +++++++++ .../pattern/Log4j1NdcPatternConverter.java | 63 ++++++ .../config/Log4j1ConfigurationFactoryTest.java | 37 ++-- .../log4j/layout/Log4j1XmlLayoutTest.java | 84 ++++++++ .../pattern/Log4j1MdcPatternConverterTest.java | 79 ++++++++ .../pattern/Log4j1NdcPatternConverterTest.java | 74 +++++++ ...g4j-console-EnhancedPatternLayout.properties | 2 +- .../log4j-console-HtmlLayout.properties | 2 + .../log4j-console-TTCCLayout.properties | 2 + .../log4j-console-XmlLayout.properties | 4 +- .../logging/log4j/CloseableThreadContext.java | 2 +- .../org/apache/logging/log4j/ThreadContext.java | 13 ++ .../log4j/spi/DefaultThreadContextMap.java | 16 +- .../logging/log4j/spi/ThreadContextMap.java | 70 ++++--- .../log4j/CloseableThreadContextTest.java | 11 +- .../logging/log4j/ThreadContextHolder.java | 79 ++++++++ .../apache/logging/log4j/ThreadContextTest.java | 21 ++ .../log4j/junit/ThreadContextMapRule.java | 37 ++++ .../logging/log4j/junit/ThreadContextRule.java | 78 ++++++++ .../log4j/junit/ThreadContextStackRule.java | 37 ++++ .../log4j/spi/DefaultThreadContextMapTest.java | 26 ++- .../builder/api/ConfigurationBuilder.java | 12 +- .../impl/DefaultConfigurationBuilder.java | 10 + .../PropertiesConfigurationBuilder.java | 2 + .../logging/log4j/core/layout/HtmlLayout.java | 14 ++ .../log4j/core/layout/PatternLayout.java | 2 +- .../logging/log4j/core/StrictXmlConfigTest.java | 1 - .../ContextStackJsonAttributeConverterTest.java | 19 +- .../core/filter/DynamicThresholdFilterTest.java | 6 +- .../core/layout/CsvLogEventLayoutTest.java | 8 +- .../core/layout/CsvParameterLayoutTest.java | 15 +- .../log4j/core/layout/GelfLayoutTest.java | 12 +- .../log4j/core/layout/HtmlLayoutTest.java | 7 +- .../layout/PatternLayoutLookupDateTest.java | 28 +++ .../log4j/core/layout/PatternLayoutTest.java | 16 +- .../log4j/core/layout/Rfc5424LayoutTest.java | 21 +- .../log4j/core/layout/SerializedLayoutTest.java | 7 +- .../log4j/core/layout/SyslogLayoutTest.java | 9 +- .../log4j/core/layout/XmlLayoutTest.java | 7 +- .../core/pattern/MdcPatternConverterTest.java | 29 +-- .../pattern/MessagePatternConverterTest.java | 197 ++++++++++--------- .../core/pattern/NdcPatternConverterTest.java | 77 ++++++++ .../core/pattern/RegexReplacementTest.java | 17 +- .../test/resources/log4j2-properties.properties | 1 + log4j-nosql/pom.xml | 5 + .../appender/NoSqlDatabaseManagerTest.java | 5 + .../org/apache/logging/slf4j/MDCContextMap.java | 9 + pom.xml | 2 +- src/changes/changes.xml | 19 +- src/site/site.xml | 2 + src/site/xdoc/manual/configuration.xml.vm | 6 +- src/site/xdoc/manual/extending.xml | 14 +- 55 files changed, 1380 insertions(+), 262 deletions(-) ----------------------------------------------------------------------
