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/30 14:46:05 UTC
[21/50] logging-log4j2 git commit: merged master into LOG4J2-1528
merged master into LOG4J2-1528
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/557a4c87
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/557a4c87
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/557a4c87
Branch: refs/heads/LOG4J2-1349-gcfree-threadcontext
Commit: 557a4c87597895beed9d9861d8dc1a3e9f6ceb65
Parents: 7a1cd3a 139f57b
Author: rpopma <rp...@apache.org>
Authored: Sun Aug 28 19:26:06 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Aug 28 19:26:06 2016 +0900
----------------------------------------------------------------------
.../config/Log4j1ConfigurationFactory.java | 311 +---------
.../log4j/config/Log4j1ConfigurationParser.java | 327 ++++++++++
.../apache/log4j/BasicConfigurationFactory.java | 13 +-
.../config/Log4j1ConfigurationFactoryTest.java | 29 +-
...g4j-console-EnhancedPatternLayout.properties | 3 +-
.../log4j-console-HtmlLayout.properties | 1 -
.../log4j-console-PatternLayout.properties | 1 -
.../log4j-console-SimpleLayout.properties | 1 -
.../log4j-console-TTCCLayout.properties | 1 -
.../log4j-console-XmlLayout.properties | 1 -
.../log4j-file-SimpleLayout.properties | 17 +
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 +++++++++++++++++
.../java/org/apache/logging/log4j/Logger.java | 20 +
.../org/apache/logging/log4j/ThreadContext.java | 55 +-
.../log4j/spi/DefaultThreadContextMap.java | 6 +-
.../logging/log4j/spi/ThreadContextMap.java | 13 +-
.../logging/log4j/spi/ThreadContextMap2.java | 40 ++
.../logging/log4j/spi/ThreadContextStack.java | 1 +
log4j-bom/pom.xml | 12 +
.../logging/log4j/core/AbstractLifeCycle.java | 8 +
.../apache/logging/log4j/core/LifeCycle.java | 13 +
.../logging/log4j/core/LoggerContext.java | 140 ++++-
.../log4j/core/appender/AbstractManager.java | 19 +-
.../core/appender/ConfigurationFactoryData.java | 50 ++
.../log4j/core/appender/ConsoleAppender.java | 4 -
.../log4j/core/appender/FileAppender.java | 28 +-
.../log4j/core/appender/FileManager.java | 58 +-
.../core/appender/OutputStreamManager.java | 26 +-
.../core/appender/RandomAccessFileAppender.java | 2 +-
.../core/appender/RandomAccessFileManager.java | 27 +-
.../core/appender/RollingFileAppender.java | 372 +++++++-----
.../RollingRandomAccessFileAppender.java | 2 +-
.../log4j/core/appender/WriterManager.java | 2 +-
.../appender/db/AbstractDatabaseManager.java | 2 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../core/appender/mom/jeromq/JeroMqManager.java | 2 +-
.../core/appender/mom/kafka/KafkaAppender.java | 7 +-
.../core/appender/mom/kafka/KafkaManager.java | 185 +++---
.../appender/rolling/RollingFileManager.java | 68 ++-
.../rolling/RollingRandomAccessFileManager.java | 32 +-
.../core/appender/rolling/TriggeringPolicy.java | 2 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 3 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 3 +-
.../log4j/core/async/DaemonThreadFactory.java | 53 --
.../log4j/core/async/RingBufferLogEvent.java | 4 +-
.../core/config/AbstractConfiguration.java | 42 +-
.../log4j/core/config/AppenderControl.java | 3 +-
.../log4j/core/config/Configuration.java | 8 +
.../log4j/core/config/ConfigurationFactory.java | 86 +--
.../core/config/ConfigurationScheduler.java | 23 +-
.../core/config/ConfiguratonFileWatcher.java | 10 +-
.../logging/log4j/core/config/Configurator.java | 36 +-
.../log4j/core/config/DefaultConfiguration.java | 2 +-
.../logging/log4j/core/config/LoggerConfig.java | 36 +-
.../log4j/core/config/NullConfiguration.java | 2 +-
.../builder/api/ConfigurationBuilder.java | 7 +
.../config/builder/impl/BuiltConfiguration.java | 5 +-
.../impl/DefaultConfigurationBuilder.java | 45 +-
.../DefaultCustomLevelComponentBuilder.java | 2 +-
.../composite/CompositeConfiguration.java | 4 +-
.../config/composite/DefaultMergeStrategy.java | 1 +
.../core/config/json/JsonConfiguration.java | 14 +-
.../config/json/JsonConfigurationFactory.java | 5 +-
.../config/plugins/PluginBuilderFactory.java | 1 +
.../config/plugins/PluginConfiguration.java | 1 +
.../core/config/plugins/PluginFactory.java | 2 +-
.../log4j/core/config/plugins/PluginNode.java | 1 +
.../core/config/plugins/util/PluginBuilder.java | 2 -
.../config/plugins/util/PluginRegistry.java | 1 -
.../core/config/plugins/util/ResolverUtil.java | 13 +-
.../properties/PropertiesConfiguration.java | 8 +-
.../PropertiesConfigurationBuilder.java | 16 +-
.../PropertiesConfigurationFactory.java | 13 +-
.../log4j/core/config/xml/XmlConfiguration.java | 47 +-
.../config/xml/XmlConfigurationFactory.java | 6 +-
.../core/config/yaml/YamlConfiguration.java | 7 +-
.../config/yaml/YamlConfigurationFactory.java | 5 +-
.../core/filter/DynamicThresholdFilter.java | 85 ++-
.../log4j/core/impl/Log4jContextFactory.java | 6 +-
.../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/jmx/LoggerContextAdmin.java | 4 +-
.../apache/logging/log4j/core/jmx/Server.java | 19 +-
.../log4j/core/layout/JacksonFactory.java | 22 +-
.../logging/log4j/core/layout/JsonLayout.java | 14 +-
.../log4j/core/layout/PatternLayout.java | 4 +-
.../logging/log4j/core/layout/XmlLayout.java | 15 +-
.../logging/log4j/core/layout/YamlLayout.java | 13 +-
.../logging/log4j/core/net/JndiManager.java | 2 +-
.../logging/log4j/core/net/SmtpManager.java | 2 +-
.../core/net/server/AbstractSocketServer.java | 7 +-
.../log4j/core/net/server/JmsServer.java | 10 +-
.../server/JsonInputStreamLogEventBridge.java | 2 +-
.../log4j/core/script/ScriptManager.java | 1 -
.../core/selector/BasicContextSelector.java | 131 ++--
.../apache/logging/log4j/core/util/Assert.java | 38 --
.../logging/log4j/core/util/Constants.java | 11 -
.../util/DefaultShutdownCallbackRegistry.java | 7 +
.../logging/log4j/core/util/Log4jThread.java | 138 ++---
.../log4j/core/util/Log4jThreadFactory.java | 99 ++++
.../logging/log4j/MarkerMixInXmlTest.java | 2 +-
.../log4j/core/BasicConfigurationFactory.java | 6 +-
.../log4j/core/appender/FileAppenderTest.java | 48 +-
.../core/appender/OutputStreamAppenderTest.java | 2 +-
.../appender/RandomAccessFileManagerTest.java | 18 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 10 +-
.../RandomRollingAppenderOnStartupTest.java | 2 +-
.../RollingAppenderCronOnceADayTest.java | 125 ++++
.../rolling/RollingAppenderCronTest.java | 2 +-
.../RollingAppenderCustomDeleteActionTest.java | 2 +-
...lingAppenderDeleteAccumulatedCount1Test.java | 2 +-
...lingAppenderDeleteAccumulatedCount2Test.java | 2 +-
...ollingAppenderDeleteAccumulatedSizeTest.java | 2 +-
.../RollingAppenderDeleteMaxDepthTest.java | 2 +-
.../RollingAppenderDeleteNestedTest.java | 2 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 2 +-
.../RollingAppenderDeleteScriptTest.java | 2 +-
...ollingAppenderNoUnconditionalDeleteTest.java | 2 +-
.../rolling/RollingAppenderOnStartupTest.java | 2 +-
.../rolling/RollingAppenderSizeTest.java | 45 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 4 +-
.../rolling/RollingAppenderTimeTest.java | 2 +-
.../rolling/RollingFileAppenderAccessTest.java | 61 +-
...RandomAccessFileManagerHeaderFooterTest.java | 3 +-
.../RollingRandomAccessFileManagerTest.java | 24 +-
.../core/async/RingBufferLogEventTest.java | 18 +-
.../core/config/CompositeConfigurationTest.java | 34 +-
.../log4j/core/config/ConfigurationTest.java | 6 +
.../builder/ConfigurationAssemblerTest.java | 35 +-
.../builder/CustomConfigurationFactory.java | 18 +-
.../plugins/util/PluginManagerPackagesTest.java | 2 +-
.../util/ResolverUtilCustomProtocolTest.java | 208 +++++++
.../config/plugins/util/ResolverUtilTest.java | 126 ++--
.../core/filter/DynamicThresholdFilterTest.java | 17 +
.../log4j/core/jackson/LevelMixInJsonTest.java | 2 +-
.../jackson/StackTraceElementMixInTest.java | 2 +-
.../core/layout/CsvParameterLayoutTest.java | 59 +-
.../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 +-
.../logging/log4j/junit/LoggerContextRule.java | 27 +-
.../junit/URLStreamHandlerFactoryRule.java | 96 +++
.../log4j-comp-logger-attr-override.json | 38 ++
.../test/resources/log4j-comp-logger-root.xml | 44 ++
.../test/resources/log4j-rolling-7z-lazy.xml | 59 ++
.../test/resources/log4j-rolling-bzip2-lazy.xml | 60 ++
.../resources/log4j-rolling-cron-once-a-day.xml | 47 ++
.../src/test/resources/log4j-rolling-cron.xml | 2 +-
.../src/test/resources/log4j-rolling-cron2.xml | 2 +-
.../resources/log4j-rolling-deflate-lazy.xml | 60 ++
.../test/resources/log4j-rolling-gz-lazy.xml | 59 ++
.../resources/log4j-rolling-pack200-lazy.xml | 60 ++
.../test/resources/log4j-rolling-xz-lazy.xml | 60 ++
.../test/resources/log4j-rolling-zip-lazy.xml | 60 ++
.../flume/appender/AbstractFlumeManager.java | 2 +-
.../flume/appender/FlumePersistentManager.java | 30 +-
.../configuration/CustomConfiguration.java | 13 +-
.../CustomConfigurationFactory.java | 12 +-
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 +
.../org/apache/logging/slf4j/MDCContextMap.java | 7 +-
.../org/apache/logging/log4j/web/WebLookup.java | 8 -
pom.xml | 14 +-
src/changes/changes.xml | 99 +++-
src/site/site.xml | 1 +
src/site/xdoc/manual/appenders.xml | 18 +-
src/site/xdoc/manual/customconfig.xml | 10 +-
src/site/xdoc/manual/extending.xml | 8 +-
src/site/xdoc/manual/layouts.xml.vm | 15 +
src/site/xdoc/manual/scala-api.xml | 91 +++
src/site/xdoc/runtime-dependencies.xml | 7 +
192 files changed, 7381 insertions(+), 1523 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/557a4c87/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ConfigurationBuilder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/557a4c87/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java
----------------------------------------------------------------------