merged master into LOG4J2-1010&LOG4J2-1447
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4d9b9f3b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4d9b9f3b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4d9b9f3b Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext Commit: 4d9b9f3b66f9c816b876fb23c38ae8b45411ddf9 Parents: 07f3fad 139f57b Author: rpopma <rpo...@apache.org> Authored: Sun Aug 28 21:23:07 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Sun Aug 28 21:23:07 2016 +0900 ---------------------------------------------------------------------- log4j-api-scala_2.10/.gitignore | 3 + log4j-api-scala_2.10/pom.xml | 150 +++++ .../org/apache/logging/log4j/scala/Logger.scala | 592 +++++++++++++++++++ .../logging/log4j/scala/LoggerMacro.scala | 425 +++++++++++++ .../apache/logging/log4j/scala/Logging.scala | 30 + .../apache/logging/log4j/scala/LoggerTest.scala | 550 +++++++++++++++++ log4j-api-scala_2.11/.gitignore | 3 + log4j-api-scala_2.11/pom.xml | 150 +++++ .../org/apache/logging/log4j/scala/Logger.scala | 592 +++++++++++++++++++ .../logging/log4j/scala/LoggerMacro.scala | 425 +++++++++++++ .../apache/logging/log4j/scala/Logging.scala | 30 + .../apache/logging/log4j/scala/LoggerTest.scala | 550 +++++++++++++++++ log4j-bom/pom.xml | 12 + .../log4j/core/jackson/Initializers.java | 10 +- .../log4j/core/jackson/Log4jJsonModule.java | 9 +- .../core/jackson/Log4jJsonObjectMapper.java | 6 +- .../log4j/core/jackson/Log4jXmlModule.java | 6 +- .../core/jackson/Log4jXmlObjectMapper.java | 9 +- .../log4j/core/jackson/Log4jYamlModule.java | 9 +- .../core/jackson/Log4jYamlObjectMapper.java | 6 +- .../ThrowableProxyWithoutStacktraceMixIn.java | 77 +++ .../log4j/core/layout/JacksonFactory.java | 22 +- .../logging/log4j/core/layout/JsonLayout.java | 14 +- .../logging/log4j/core/layout/XmlLayout.java | 15 +- .../logging/log4j/core/layout/YamlLayout.java | 13 +- .../server/JsonInputStreamLogEventBridge.java | 2 +- .../logging/log4j/MarkerMixInXmlTest.java | 2 +- .../log4j/core/jackson/LevelMixInJsonTest.java | 2 +- .../jackson/StackTraceElementMixInTest.java | 2 +- .../log4j/core/layout/JsonLayoutTest.java | 59 +- .../log4j/core/layout/LogEventFixtures.java | 6 +- .../log4j/core/layout/XmlLayoutTest.java | 59 +- .../log4j/core/layout/YamlLayoutTest.java | 55 +- .../net/server/AbstractSocketServerTest.java | 4 +- log4j-samples/pom.xml | 1 + log4j-samples/scala-api/pom.xml | 65 ++ .../scala-api/src/main/resources/log4j2.xml | 32 + .../logging/log4j/scalasample/LoggingApp.scala | 31 + pom.xml | 12 + src/changes/changes.xml | 6 + src/site/site.xml | 1 + src/site/xdoc/manual/layouts.xml.vm | 15 + src/site/xdoc/manual/scala-api.xml | 91 +++ src/site/xdoc/runtime-dependencies.xml | 7 + 44 files changed, 4056 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4d9b9f3b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java ---------------------------------------------------------------------- diff --cc log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java index 7d361f0,fd4e10d..dc1f81a --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Initializers.java @@@ -45,10 -45,11 +45,11 @@@ class Initializers // Log4j API classes: we do not want to edit those with Jackson annotations because the API module should not depend on Jackson. context.setMixInAnnotations(Marker.class, MarkerMixIn.class); context.setMixInAnnotations(Level.class, LevelMixIn.class); - context.setMixInAnnotations(LogEvent.class, LogEventMixIn.class); + context.setMixInAnnotations(LogEvent.class, LogEventWithContextListMixIn.class); // Log4j Core classes: we do not want to bring in Jackson at runtime if we do not have to. context.setMixInAnnotations(ExtendedStackTraceElement.class, ExtendedStackTraceElementMixIn.class); - context.setMixInAnnotations(ThrowableProxy.class, ThrowableProxyMixIn.class); + context.setMixInAnnotations(ThrowableProxy.class, + includeStacktrace ? ThrowableProxyMixIn.class : ThrowableProxyWithoutStacktraceMixIn.class); } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4d9b9f3b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java ---------------------------------------------------------------------- diff --cc log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java index 19e32df,980ba37..468f25c --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/LogEventFixtures.java @@@ -81,10 -80,9 +81,10 @@@ class LogEventFixtures return expected; } - static void assertEqualLogEvents(final LogEvent expected, final LogEvent actual, final boolean includeSource, + static void assertEqualLogEvents(final LogEvent expected, final LogEvent actual, final boolean includeSource, - final boolean includeContext) { + final boolean includeContext, final boolean includeStacktrace) { assertEquals(expected.getClass(), actual.getClass()); + assertEquals(includeContext ? expected.getContextData() : ContextDataFactory.createContextData(), actual.getContextData()); assertEquals(includeContext ? expected.getContextMap() : Collections.EMPTY_MAP, actual.getContextMap()); assertEquals(expected.getContextStack(), actual.getContextStack()); assertEquals(expected.getLevel(), actual.getLevel());