You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/08/31 06:37:32 UTC
[11/12] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-952
Merge branch 'master' into LOG4J2-952
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6238c47e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6238c47e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6238c47e
Branch: refs/heads/LOG4J2-952
Commit: 6238c47e3a4f4b63f368b994983d6e319b2569d6
Parents: 7e73c96 546f4d0
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sun Aug 30 19:33:16 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Aug 30 19:33:16 2015 -0700
----------------------------------------------------------------------
.../org/apache/log4j/CallerInformationTest.java | 130 +++----
.../test/java/org/apache/log4j/LoggingTest.java | 86 ++---
.../apache/logging/log4j/spi/LoggerContext.java | 4 +-
.../org/apache/logging/log4j/core/Logger.java | 12 +-
.../logging/log4j/core/config/Configurator.java | 2 +-
.../apache/logging/log4j/PerformanceRun.java | 4 +-
.../log4j/core/AppenderRefLevelJsonTest.java | 4 +-
.../log4j/core/AppenderRefLevelTest.java | 4 +-
.../log4j/core/CollectionLoggingTest.java | 4 +-
.../log4j/core/CustomLevelsOverrideTest.java | 4 +-
.../logging/log4j/core/CustomLevelsTest.java | 4 +-
.../log4j/core/CustomLevelsWithFiltersTest.java | 4 +-
.../apache/logging/log4j/core/DeadlockTest.java | 4 +-
.../logging/log4j/core/ExtendedLevelTest.java | 4 +-
.../logging/log4j/core/FileConfigTest.java | 4 +-
.../apache/logging/log4j/core/HostNameTest.java | 4 +-
.../apache/logging/log4j/core/LevelTest.java | 4 +-
.../logging/log4j/core/LogEventFactoryTest.java | 4 +-
.../logging/log4j/core/LoggerDateTest.java | 4 +-
.../apache/logging/log4j/core/LoggerTest.java | 8 +-
.../logging/log4j/core/LoggerUpdateTest.java | 4 +-
.../apache/logging/log4j/core/LookupTest.java | 4 +-
.../log4j/core/ShutdownDisabledTest.java | 4 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 4 +-
.../apache/logging/log4j/core/ThreadedTest.java | 4 +-
.../log4j/core/TimestampMessageTest.java | 4 +-
.../apache/logging/log4j/core/XmlEvents.java | 4 +-
.../appender/AsyncAppenderNoLocationTest.java | 4 +-
.../core/appender/FailoverAppenderTest.java | 4 +-
.../appender/JsonCompleteFileAppenderTest.java | 4 +-
.../appender/RandomAccessFileAppenderTests.java | 6 +-
.../core/appender/mom/JmsAppenderTest.java | 4 +-
.../appender/rewrite/RewriteAppenderTest.java | 4 +-
.../rolling/RollingAppenderSizeTest.java | 6 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 4 +-
.../rolling/RollingAppenderTimeTest.java | 4 +-
...RandomAccessFileManagerHeaderFooterTest.java | 4 +-
.../appender/routing/RoutingAppenderTest.java | 4 +-
.../routing/RoutingAppenderWithJndiTest.java | 4 +-
.../routing/RoutingDefaultAppenderTest.java | 4 +-
.../log4j/core/async/AsyncRootReloadTest.java | 4 +-
.../core/config/AbstractLog4j2_1100Test.java | 4 +-
.../log4j/core/config/ConfigurationTest.java | 6 +-
.../core/config/CustomConfigurationTest.java | 4 +-
.../log4j/core/config/FileOutputTest.java | 4 +-
.../core/config/MissingRootLoggerTest.java | 4 +-
.../config/ReconfigurationDeadlockTest.java | 4 +-
.../logging/log4j/core/config/XIncludeTest.java | 6 +-
.../core/config/xml/XmlLoggerPropsTest.java | 4 +-
.../log4j/core/filter/BurstFilterTest.java | 4 +-
.../log4j/core/lookup/ContextMapLookupTest.java | 4 +-
.../core/lookup/MarkerLookupConfigTest.java | 4 +-
.../log4j/core/net/SocketMessageLossTest.java | 4 +-
.../log4j/core/net/SocketReconnectTest.java | 4 +-
.../logging/log4j/core/net/SocketTest.java | 4 +-
.../core/pattern/CallerInformationTest.java | 4 +-
.../core/pattern/ExtendedThrowableTest.java | 4 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 4 +-
.../core/pattern/RegexReplacementTest.java | 4 +-
.../log4j/core/pattern/RootThrowableTest.java | 4 +-
.../log4j/core/pattern/StyleConverterTest.java | 4 +-
.../log4j/core/pattern/ThrowableTest.java | 4 +-
.../core/util/ShutdownCallbackRegistryTest.java | 4 +-
.../log4j/junit/InitialLoggerContext.java | 144 --------
.../logging/log4j/junit/LoggerContextRule.java | 144 ++++++++
.../log4j/test/appender/ListAppender.java | 4 +-
.../logging/log4j/io/AbstractStreamTest.java | 118 +++---
.../log4j/io/IoBuilderCallerInfoTesting.java | 110 +++---
.../apache/logging/log4j/io/IoBuilderTest.java | 102 +++---
.../log4j/io/LoggerPrintWriterJdbcH2Test.java | 190 +++++-----
.../log4j/jcl/CallerInformationTest.java | 134 +++----
.../apache/logging/log4j/jcl/LoggerTest.java | 130 +++----
.../apache/logging/log4j/jul/CoreLogger.java | 2 +-
.../log4j/jul/DefaultLevelConverter.java | 3 +
.../logging/log4j/jul/LevelConverter.java | 2 +-
.../logging/log4j/jul/LevelTranslator.java | 4 +-
.../log4j/jul/CallerInformationTest.java | 156 ++++----
.../logging/log4j/jul/CoreLoggerTest.java | 20 +
.../log4j/jul/DefaultLevelConverterTest.java | 31 ++
.../log4j/nosql/appender/MongoDbTest.java | 74 ++--
.../logging/slf4j/CallerInformationTest.java | 134 +++----
.../org/apache/logging/slf4j/LoggerTest.java | 364 +++++++++----------
.../org/apache/logging/slf4j/OptionalTest.java | 138 +++----
.../org/apache/logging/slf4j/SerializeTest.java | 94 ++---
src/changes/changes.xml | 6 +
85 files changed, 1324 insertions(+), 1258 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6238c47e/log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configurator.java
----------------------------------------------------------------------