Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure 07f3fad7f -> 4d9b9f3b6
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/88044f34 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/88044f34 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/88044f34 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 88044f34c47680697e1a960e581fde5b052eb1a6 Parents: b61f043 aed2298 Author: Mikael Ståldal <mikael.stal...@magine.com> Authored: Sun Jun 19 21:01:30 2016 +0200 Committer: Mikael Ståldal <mikael.stal...@magine.com> Committed: Sun Jun 19 21:01:30 2016 +0200 ---------------------------------------------------------------------- .../logging/log4j/message/ObjectMessage.java | 14 +++ .../log4j/message/ParameterizedMessage.java | 15 ++- .../log4j/message/ReusableObjectMessage.java | 14 +++ .../org/apache/logging/log4j/util/Unbox.java | 4 +- .../core/appender/MemoryMappedFileManager.java | 2 + .../core/appender/OutputStreamManager.java | 2 +- .../rolling/OnStartupTriggeringPolicy.java | 4 - .../rolling/action/FileRenameAction.java | 4 - .../log4j/core/config/Configuration.java | 6 +- .../log4j/core/config/ConfigurationFactory.java | 19 ++-- .../logging/log4j/core/config/Configurator.java | 3 +- .../builder/api/ConfigurationBuilder.java | 1 - .../config/builder/impl/BuiltConfiguration.java | 1 + .../config/composite/DefaultMergeStrategy.java | 3 +- .../log4j/core/filter/CompositeFilter.java | 7 +- .../log4j/core/jackson/LogEventJsonMixIn.java | 2 - .../core/layout/AbstractJacksonLayout.java | 1 - .../log4j/core/layout/AbstractStringLayout.java | 12 +++ .../log4j/core/layout/CsvParameterLayout.java | 1 - .../logging/log4j/core/layout/GelfLayout.java | 37 ++++--- .../log4j/core/pattern/NameAbbreviator.java | 102 +++++++++---------- .../core/GcFreeMixedSyncAyncLoggingTest.java | 1 - .../core/GcFreeSynchronousLoggingTest.java | 1 - .../AsyncAppenderQueueFullPolicyTest.java | 6 +- .../ConsoleAppenderAnsiStyleLayoutMain.java | 40 ++++++-- .../ConsoleAppenderJAnsiMessageMain.java | 75 ++++++++++++++ .../log4j/core/appender/FileAppenderTest.java | 37 ++++--- .../rolling/OnStartupTriggeringPolicyTest.java | 16 +-- .../RandomRollingAppenderOnStartupTest.java | 6 +- .../rolling/RollingAppenderOnStartupTest.java | 13 +-- .../rolling/RollingAppenderSizeTest.java | 4 +- .../core/config/CompositeConfigurationTest.java | 6 -- .../core/filter/AbstractFilterableTest.java | 12 ++- .../log4j/core/impl/MutableLogEventTest.java | 1 - .../core/impl/ReusableLogEventFactoryTest.java | 2 + .../core/layout/AbstractStringLayoutTest.java | 72 +++++++++++++ .../layout/CsvParameterLayoutAllAsyncTest.java | 1 - .../log4j/test/appender/BlockingAppender.java | 3 - ...ractStringLayoutStringEncodingBenchmark.java | 4 +- .../AsyncAppenderLog4j2LocationBenchmark.java | 2 - .../perf/jmh/AsyncAppenderLogbackBenchmark.java | 1 - .../AsyncAppenderLogbackLocationBenchmark.java | 2 - .../perf/jmh/AsyncLoggersLocationBenchmark.java | 2 - .../jmh/MemoryHandlerJULLocationBenchmark.java | 2 - .../perf/jmh/ThreadsafeDateFormatBenchmark.java | 6 +- pom.xml | 4 +- src/changes/changes.xml | 18 +++- src/site/xdoc/manual/configuration.xml.vm | 11 +- src/site/xdoc/manual/messages.xml | 24 ++++- 49 files changed, 425 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/88044f34/pom.xml ----------------------------------------------------------------------
