[apache-log4j2] 07/15: Merge tag 'upstream/2.6'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jul 8 14:22:05 UTC 2016


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-log4j2.

commit a0af2a86ab963e40d515a4d6bafb806187ecab23
Merge: 6302da3 379f55c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 8 15:34:05 2016 +0200

    Merge tag 'upstream/2.6'
    
    Upstream version 2.6

 BUILDING.txt                                       |    2 +-
 NOTICE.txt                                         |    2 +-
 README.md                                          |   23 +
 RELEASE-NOTES.txt                                  |  174 +-
 Vagrantfile                                        |    2 +-
 log4j-1.2-api/pom.xml                              |    7 +-
 .../src/main/java/org/apache/log4j/Category.java   |   34 +-
 .../log4j/config/Log4j1ConfigurationFactory.java   |  314 ++
 .../java/org/apache/log4j/spi/LoggerFactory.java   |    9 +-
 log4j-1.2-api/src/site/xdoc/index.xml              |    3 +-
 .../config/Log4j1ConfigurationFactoryTest.java     |   88 +
 .../log4j-console-EnhancedPatternLayout.properties |   19 +
 .../config-1.2/log4j-console-HtmlLayout.properties |   18 +
 .../log4j-console-PatternLayout.properties         |   19 +
 .../log4j-console-SimpleLayout.properties          |   18 +
 .../config-1.2/log4j-console-TTCCLayout.properties |   18 +
 .../config-1.2/log4j-console-XmlLayout.properties  |   18 +
 log4j-api/pom.xml                                  |   27 +-
 .../logging/log4j/CloseableThreadContext.java      |  159 ++
 .../main/java/org/apache/logging/log4j/Level.java  |   18 +-
 .../java/org/apache/logging/log4j/LogManager.java  |  136 +-
 .../main/java/org/apache/logging/log4j/Logger.java | 3008 +++++++++++++++++---
 .../org/apache/logging/log4j/MarkerManager.java    |   60 +-
 .../log4j/message/AbstractMessageFactory.java      |   12 +-
 .../log4j/message/BasicThreadInformation.java      |    2 +-
 .../log4j/message/DefaultFlowMessageFactory.java   |  207 ++
 .../apache/logging/log4j/message/EntryMessage.java |   46 +-
 .../apache/logging/log4j/message/ExitMessage.java  |   46 +-
 .../log4j/message/ExtendedThreadInformation.java   |    3 +-
 .../apache/logging/log4j/message/FlowMessage.java} |   73 +-
 .../logging/log4j/message/FlowMessageFactory.java  |   58 +
 .../logging/log4j/message/FormattedMessage.java    |  197 +-
 .../log4j/message/FormattedMessageFactory.java     |    7 +
 .../logging/log4j/message/LocalizedMessage.java    |    5 +
 .../log4j/message/LocalizedMessageFactory.java     |   11 +-
 .../org/apache/logging/log4j/message/Message.java  |   15 +
 .../logging/log4j/message/MessageFactory2.java     |  179 ++
 .../log4j/message/MessageFormatMessage.java        |   29 +-
 .../log4j/message/MessageFormatMessageFactory.java |    8 +-
 .../logging/log4j/message/ObjectArrayMessage.java  |    6 +-
 .../logging/log4j/message/ObjectMessage.java       |   27 +-
 ...terizedMessage.java => ParameterFormatter.java} |  489 ++--
 .../log4j/message/ParameterizedMessage.java        |  627 +---
 .../log4j/message/ParameterizedMessageFactory.java |   14 +-
 .../ParameterizedNoReferenceMessageFactory.java    |   51 +-
 .../logging/log4j/message/ReusableMessage.java     |   72 +
 .../log4j/message/ReusableMessageFactory.java      |  187 ++
 ...jectMessage.java => ReusableObjectMessage.java} |  109 +-
 .../message/ReusableParameterizedMessage.java      |  292 ++
 .../log4j/message/ReusableSimpleMessage.java       |  105 +
 .../logging/log4j/message/SimpleMessage.java       |   65 +-
 .../log4j/message/SimpleMessageFactory.java        |    3 +-
 .../log4j/message/StringFormattedMessage.java      |   31 +-
 .../message/StringFormatterMessageFactory.java     |    8 +-
 .../logging/log4j/message/ThreadDumpMessage.java   |   23 +-
 .../apache/logging/log4j/simple/SimpleLogger.java  |   83 +-
 .../logging/log4j/simple/SimpleLoggerContext.java  |   24 +-
 .../apache/logging/log4j/spi/AbstractLogger.java   | 1625 ++++++++++-
 .../apache/logging/log4j/spi/ExtendedLogger.java   |  394 ++-
 .../logging/log4j/spi/ExtendedLoggerWrapper.java   |   96 +-
 .../apache/logging/log4j/spi/LoggerContext.java    |    2 +
 .../apache/logging/log4j/spi/LoggerContextKey.java |    4 +-
 .../apache/logging/log4j/spi/LoggerRegistry.java   |  182 ++
 .../logging/log4j/spi/MessageFactory2Adapter.java  |  118 +
 .../org/apache/logging/log4j/spi/Provider.java     |    2 +-
 .../apache/logging/log4j/spi/StandardLevel.java    |    2 +-
 .../org/apache/logging/log4j/spi/Terminable.java   |   24 +-
 .../apache/logging/log4j/status/StatusLogger.java  |   95 +-
 .../org/apache/logging/log4j/util/LambdaUtil.java  |   24 +-
 .../org/apache/logging/log4j/util/LoaderUtil.java  |   12 +-
 .../apache/logging/log4j/util/LowLevelLogUtil.java |   67 +
 .../apache/logging/log4j/util/MessageSupplier.java |    2 +
 .../logging/log4j/util/PerformanceSensitive.java   |   37 +
 .../apache/logging/log4j/util/PropertiesUtil.java  |  166 +-
 .../apache/logging/log4j/util/ProviderUtil.java    |    2 +-
 .../apache/logging/log4j/util/ReflectionUtil.java  |   11 +-
 .../log4j/util/StringBuilderFormattable.java}      |   23 +-
 .../org/apache/logging/log4j/util/Strings.java     |   12 +
 .../java/org/apache/logging/log4j/util/Unbox.java  |  176 ++
 .../java/org/apache/log4j/util/StringsTest.java    |   36 -
 .../apache/logging/log4j/AbstractLoggerTest.java   |  395 ++-
 .../logging/log4j/CloseableThreadContextTest.java  |  188 ++
 .../org/apache/logging/log4j/EventLoggerTest.java  |    2 +-
 .../org/apache/logging/log4j/LambdaLoggerTest.java |  154 +-
 .../org/apache/logging/log4j/LogManagerTest.java   |    7 +
 .../apache/logging/log4j/LoggerSupplierTest.java   |  235 ++
 .../java/org/apache/logging/log4j/LoggerTest.java  |  970 ++++---
 .../java/org/apache/logging/log4j/TestLogger.java  |   73 +
 .../test/java/org/apache/logging/log4j/Timer.java  |  184 +-
 .../log4j/{osgi => junit}/BundleTestInfo.java      |   34 +-
 .../logging/log4j/{message => junit}/Mutable.java  |    7 +-
 .../logging/log4j/{osgi => junit}/OsgiRule.java    |   11 +-
 .../util => logging/log4j/junit}/SerialUtil.java   |    4 +-
 .../log4j/message/FormattedMessageTest.java        |   41 +-
 .../apache/logging/log4j/message/JsonMessage.java  |   66 +
 .../log4j/message/LocalizedMessageTest.java        |    1 +
 .../log4j/message/MessageFormatMessageTest.java    |   23 +-
 .../logging/log4j/message/ObjectMessageTest.java   |    3 +-
 .../log4j/message/ParameterFormatterTest.java      |  191 ++
 .../log4j/message/ParameterizedMessageTest.java    |   30 +-
 .../log4j/message/ReusableObjectMessageTest.java   |  122 +
 ....java => ReusableParameterizedMessageTest.java} |   51 +-
 .../log4j/message/ReusableSimpleMessageTest.java   |  122 +
 .../log4j/message/StringFormattedMessageTest.java  |   22 +-
 .../log4j/message/ThreadDumpMessageTest.java       |    6 +-
 .../logging/log4j/osgi/AbstractLoadBundleTest.java |  142 +-
 .../logging/log4j/util/PropertiesUtilTest.java     |   65 +
 .../logging/log4j/util/ReflectionUtilTest.java     |    2 +
 .../org/apache/logging/log4j/util/StringsTest.java |    9 +
 .../org/apache/logging/log4j/util/UnboxTest.java   |  157 +
 .../test/resources/PropertiesUtilTest.properties   |   29 +
 log4j-bom/pom.xml                                  |    4 +-
 log4j-core/pom.xml                                 |   27 +-
 .../logging/log4j/core/AbstractLifeCycle.java      |    6 +-
 .../logging/log4j/core/AbstractLogEvent.java       |   10 +
 .../org/apache/logging/log4j/core/Appender.java    |   10 +-
 .../java/org/apache/logging/log4j/core/Filter.java |  171 ++
 .../java/org/apache/logging/log4j/core/Layout.java |   22 +-
 .../org/apache/logging/log4j/core/LifeCycle.java   |    2 +-
 .../org/apache/logging/log4j/core/LogEvent.java    |   18 +-
 .../java/org/apache/logging/log4j/core/Logger.java |  259 +-
 .../apache/logging/log4j/core/LoggerContext.java   |   91 +-
 .../log4j/core/appender/AbstractAppender.java      |    2 -
 .../appender/AbstractOutputStreamAppender.java     |   53 +-
 .../core/appender/AbstractWriterAppender.java      |    2 -
 .../logging/log4j/core/appender/AsyncAppender.java |  217 +-
 .../log4j/core/appender/ConsoleAppender.java       |   20 +-
 .../log4j/core/appender/CountingNoOpAppender.java} |   41 +-
 .../log4j/core/appender/DefaultErrorHandler.java   |    9 +-
 .../log4j/core/appender/FailoverAppender.java      |    2 -
 .../logging/log4j/core/appender/FileAppender.java  |    7 +-
 .../logging/log4j/core/appender/FileManager.java   |   45 +-
 .../core/appender/MemoryMappedFileAppender.java    |   12 +-
 .../core/appender/MemoryMappedFileManager.java     |   37 +-
 .../log4j/core/appender/OutputStreamAppender.java  |    2 -
 .../log4j/core/appender/OutputStreamManager.java   |  165 +-
 .../core/appender/RandomAccessFileAppender.java    |   10 +-
 .../core/appender/RandomAccessFileManager.java     |   50 +-
 .../log4j/core/appender/RollingFileAppender.java   |    4 +-
 .../appender/RollingRandomAccessFileAppender.java  |   19 +-
 .../logging/log4j/core/appender/SmtpAppender.java  |    8 +-
 .../log4j/core/appender/SocketAppender.java        |   32 +-
 .../log4j/core/appender/SyslogAppender.java        |    1 -
 .../log4j/core/appender/TlsSyslogFrame.java        |   64 +-
 .../log4j/core/appender/WriterAppender.java        |    2 -
 .../core/appender/db/AbstractDatabaseAppender.java |    1 -
 .../log4j/core/appender/db/jdbc/JdbcAppender.java  |    1 -
 .../db/jpa/AbstractLogEventWrapperEntity.java      |   20 +
 .../core/appender/db/jpa/BasicLogEventEntity.java  |   22 +
 .../log4j/core/appender/db/jpa/JpaAppender.java    |   12 +-
 .../log4j/core/appender/mom/JmsAppender.java       |   11 +-
 .../log4j/core/appender/mom/JmsManager.java        |    2 +-
 .../core/appender/mom/jeromq/JeroMqAppender.java   |  234 +-
 .../core/appender/mom/jeromq/JeroMqManager.java    |  220 ++
 .../core/appender/mom/kafka/KafkaAppender.java     |   22 +-
 .../core/appender/mom/kafka/KafkaManager.java      |    4 +
 .../core/appender/rewrite/RewriteAppender.java     |    2 -
 .../appender/rolling/CronTriggeringPolicy.java     |    1 +
 .../appender/rolling/DefaultRolloverStrategy.java  |  190 +-
 .../core/appender/rolling/PatternProcessor.java    |  576 ++--
 .../core/appender/rolling/RollingFileManager.java  |  106 +-
 .../rolling/RollingRandomAccessFileManager.java    |   54 +-
 .../core/appender/rolling/action/DeleteAction.java |  432 ++-
 .../rolling/action/PathSortByModificationTime.java |    6 +-
 .../core/appender/routing/IdlePurgePolicy.java     |   99 +-
 .../core/appender/routing/RoutingAppender.java     |    3 +-
 .../logging/log4j/core/async/AsyncLogger.java      |  205 +-
 .../log4j/core/async/AsyncLoggerConfig.java        |   28 +-
 .../AsyncLoggerConfigDefaultExceptionHandler.java  |   54 +
 .../core/async/AsyncLoggerConfigDelegate.java      |   41 +-
 .../core/async/AsyncLoggerConfigDisruptor.java     |  168 +-
 .../log4j/core/async/AsyncLoggerContext.java       |    2 -
 .../async/AsyncLoggerDefaultExceptionHandler.java  |   52 +
 .../log4j/core/async/AsyncLoggerDisruptor.java     |   82 +-
 .../AsyncQueueFullPolicy.java}                     |   28 +-
 .../core/async/AsyncQueueFullPolicyFactory.java    |  101 +
 .../DefaultAsyncQueueFullPolicy.java}              |   29 +-
 .../core/async/DiscardingAsyncQueueFullPolicy.java |   72 +
 .../logging/log4j/core/async/DisruptorUtil.java    |  268 +-
 .../logging/log4j/core/async/EventRoute.java       |  100 +
 .../log4j/core/async/RingBufferLogEvent.java       |  252 +-
 .../core/async/RingBufferLogEventHandler.java      |   21 +-
 .../core/async/RingBufferLogEventTranslator.java   |   56 +-
 .../core/async/ThreadNameCachingStrategy.java      |    9 +-
 .../log4j/core/config/AbstractConfiguration.java   |  145 +-
 .../logging/log4j/core/config/AppenderControl.java |    5 +-
 .../log4j/core/config/AppenderControlArraySet.java |  126 +
 .../logging/log4j/core/config/Configuration.java   |   28 +-
 .../log4j/core/config/ConfigurationAware.java      |   21 +-
 .../log4j/core/config/ConfigurationFactory.java    |   66 +-
 .../log4j/core/config/ConfigurationScheduler.java  |    2 +-
 .../log4j/core/config/ConfigurationSource.java     |   51 +-
 .../log4j/core/config/ConfiguratonFileWatcher.java |    8 +-
 .../logging/log4j/core/config/Configurator.java    |   46 +-
 .../log4j/core/config/CronScheduledFuture.java     |   12 +-
 .../log4j/core/config/DefaultAdvertiser.java       |    5 +-
 .../log4j/core/config/DefaultConfiguration.java    |    2 -
 .../logging/log4j/core/config/LoggerConfig.java    |  105 +-
 .../log4j/core/config/NullConfiguration.java       |    1 -
 .../logging/log4j/core/config/OrderComparator.java |    4 +-
 .../core/config/ReliabilityStrategyFactory.java    |    5 +-
 .../builder/api/AppenderComponentBuilder.java      |    9 +-
 .../builder/api/AppenderRefComponentBuilder.java   |    9 +-
 .../api/CompositeFilterComponentBuilder.java       |   14 +-
 .../config/builder/api/ConfigurationBuilder.java   |   89 +
 ...uilder.java => FilterableComponentBuilder.java} |   13 +-
 ...tBuilder.java => LoggableComponentBuilder.java} |   19 +-
 .../config/builder/api/LoggerComponentBuilder.java |   16 +-
 .../builder/api/RootLoggerComponentBuilder.java    |   16 +-
 .../core/config/builder/api/package-info.java      |    2 +
 .../config/builder/impl/BuiltConfiguration.java    |   23 +-
 .../impl/DefaultAppenderComponentBuilder.java      |    2 +
 .../impl/DefaultAppenderRefComponentBuilder.java   |    2 +
 .../DefaultComponentAndConfigurationBuilder.java   |    2 +
 .../builder/impl/DefaultComponentBuilder.java      |   22 +-
 .../DefaultCompositeFilterComponentBuilder.java    |    2 +-
 .../builder/impl/DefaultConfigurationBuilder.java  |   86 +-
 .../impl/DefaultCustomLevelComponentBuilder.java   |    2 +-
 .../impl/DefaultFilterComponentBuilder.java        |    2 +-
 .../impl/DefaultLayoutComponentBuilder.java        |    2 +-
 .../impl/DefaultLoggerComponentBuilder.java        |   33 +-
 .../impl/DefaultRootLoggerComponentBuilder.java    |   31 +-
 .../impl/DefaultScriptComponentBuilder.java        |    2 +-
 .../impl/DefaultScriptFileComponentBuilder.java    |    2 +
 .../core/config/builder/impl/package-info.java     |    2 +
 .../config/composite/CompositeConfiguration.java   |  183 ++
 .../config/composite/DefaultMergeStrategy.java     |  270 ++
 .../MergeStrategy.java}                            |   39 +-
 .../{builder/impl => composite}/package-info.java  |    5 +-
 .../log4j/core/config/json/JsonConfiguration.java  |  551 ++--
 .../logging/log4j/core/config/plugins/Plugin.java  |    3 +
 .../core/config/plugins/processor/PluginCache.java |   12 +-
 .../core/config/plugins/processor/PluginEntry.java |    2 +-
 .../core/config/plugins/util/PluginBuilder.java    |   11 +-
 .../config/properties/PropertiesConfiguration.java |    8 +-
 .../properties/PropertiesConfigurationBuilder.java |  335 +++
 .../properties/PropertiesConfigurationFactory.java |  381 +--
 .../core/config/status/StatusConfiguration.java    |    5 +-
 .../log4j/core/config/xml/XmlConfiguration.java    |   16 +-
 .../log4j/core/config/yaml/YamlConfiguration.java  |    2 -
 .../logging/log4j/core/filter/AbstractFilter.java  |  206 +-
 .../log4j/core/filter/AbstractFilterable.java      |    2 -
 .../logging/log4j/core/filter/BurstFilter.java     |    7 +-
 .../logging/log4j/core/filter/CompositeFilter.java |  402 ++-
 .../log4j/core/filter/DynamicThresholdFilter.java  |   14 +-
 .../log4j/core/filter/LevelRangeFilter.java        |    2 -
 .../logging/log4j/core/filter/MapFilter.java       |    2 -
 .../logging/log4j/core/filter/MarkerFilter.java    |    2 -
 .../logging/log4j/core/filter/RegexFilter.java     |    2 -
 .../logging/log4j/core/filter/ScriptFilter.java    |    1 -
 .../log4j/core/filter/StructuredDataFilter.java    |    2 -
 .../log4j/core/filter/ThreadContextMapFilter.java  |    2 -
 .../logging/log4j/core/filter/ThresholdFilter.java |    2 -
 .../logging/log4j/core/filter/TimeFilter.java      |   37 +-
 .../log4j/core/impl/Log4jContextFactory.java       |   48 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java     |  204 +-
 .../logging/log4j/core/impl/MutableLogEvent.java   |  459 +++
 .../log4j/core/impl/ReusableLogEventFactory.java   |   88 +
 .../logging/log4j/core/jackson/Initializers.java   |   22 +-
 .../log4j/core/jackson/Log4jJsonModule.java        |   10 +-
 .../log4j/core/jackson/Log4jJsonObjectMapper.java  |   11 +-
 .../log4j/core/jackson/Log4jXmlObjectMapper.java   |    2 +-
 .../{Log4jJsonModule.java => Log4jYamlModule.java} |   14 +-
 ...bjectMapper.java => Log4jYamlObjectMapper.java} |   16 +-
 .../{LogEventMixIn.java => LogEventJsonMixIn.java} |   18 +-
 .../logging/log4j/core/jackson/LogEventMixIn.java  |   10 +
 .../org/apache/logging/log4j/core/jmx/Server.java  |   12 +-
 .../log4j/core/jmx/StatusLoggerAdminMBean.java     |    2 +-
 .../log4j/core/layout/AbstractCsvLayout.java       |  158 +-
 .../log4j/core/layout/AbstractJacksonLayout.java   |   40 +-
 .../logging/log4j/core/layout/AbstractLayout.java  |  116 +-
 .../log4j/core/layout/AbstractStringLayout.java    |  183 +-
 .../log4j/core/layout/ByteBufferDestination.java   |   47 +
 .../log4j/core/layout/CsvLogEventLayout.java       |  210 +-
 .../log4j/core/layout/CsvParameterLayout.java      |  206 +-
 .../apache/logging/log4j/core/layout/Encoder.java  |   26 +-
 .../logging/log4j/core/layout/GelfLayout.java      |  210 +-
 .../logging/log4j/core/layout/HtmlLayout.java      |    3 +-
 .../logging/log4j/core/layout/JacksonFactory.java  |   85 +-
 .../logging/log4j/core/layout/JsonLayout.java      |  107 +-
 .../core/layout/LockingStringBuilderEncoder.java   |   69 +
 .../log4j/core/layout/MarkerPatternSelector.java   |    1 -
 .../logging/log4j/core/layout/PatternLayout.java   |  247 +-
 .../logging/log4j/core/layout/PatternMatch.java    |   20 +-
 .../logging/log4j/core/layout/Rfc5424Layout.java   |   23 +-
 .../log4j/core/layout/SerializedLayout.java        |    4 +-
 .../log4j/core/layout/StringBuilderEncoder.java    |  128 +
 .../logging/log4j/core/layout/SyslogLayout.java    |    2 -
 .../log4j/core/layout/TextEncoderHelper.java       |  183 ++
 .../logging/log4j/core/layout/XmlLayout.java       |    6 +-
 .../logging/log4j/core/layout/YamlLayout.java      |  823 ++++++
 .../AbstractConfigurationAwareLookup.java}         |   16 +-
 .../logging/log4j/core/lookup/Interpolator.java    |    6 +-
 .../logging/log4j/core/lookup/JndiLookup.java      |    5 +-
 .../logging/log4j/core/lookup/Log4jLookup.java     |   60 +-
 .../logging/log4j/core/lookup/MapLookup.java       |    2 +-
 .../logging/log4j/core/lookup/StrSubstitutor.java  |   19 +-
 .../apache/logging/log4j/core/net/Facility.java    |  131 +-
 .../logging/log4j/core/net/MimeMessageBuilder.java |   15 +-
 .../log4j/core/net/MulticastDnsAdvertiser.java     |   34 +-
 .../apache/logging/log4j/core/net/Severity.java    |    2 +-
 .../apache/logging/log4j/core/net/SmtpManager.java |   65 +-
 .../logging/log4j/core/net/SslSocketManager.java   |    2 +-
 .../logging/log4j/core/net/TcpSocketManager.java   |   12 +-
 .../mom/jms/AbstractJmsReceiver.java}              |   36 +-
 .../log4j/core/net/mom/jms/JmsQueueReceiver.java   |   45 +-
 .../log4j/core/net/mom/jms/JmsTopicReceiver.java   |   44 +-
 .../logging/log4j/core/net/server/JmsServer.java   |   26 +-
 .../net/server/JsonInputStreamLogEventBridge.java  |    6 +-
 .../log4j/core/net/server/TcpSocketServer.java     |   19 +-
 .../net/ssl/AbstractKeyStoreConfiguration.java     |    8 +-
 .../log4j/core/net/ssl/SslConfiguration.java       |   16 +-
 .../apache/logging/log4j/core/osgi/Activator.java  |   13 +-
 .../logging/log4j/core/pattern/AnsiEscape.java     |    2 +-
 .../core/pattern/ClassNamePatternConverter.java    |    2 +-
 .../log4j/core/pattern/DatePatternConverter.java   |   81 +-
 .../core/pattern/EqualsReplacementConverter.java   |   48 +-
 .../pattern/ExtendedThrowablePatternConverter.java |    6 +-
 .../log4j/core/pattern/LoggerPatternConverter.java |    2 +-
 .../log4j/core/pattern/MaxLengthConverter.java     |  103 +
 .../core/pattern/MessagePatternConverter.java      |   20 +-
 .../log4j/core/pattern/NameAbbreviator.java        |  130 +-
 .../log4j/core/pattern/NamePatternConverter.java   |    7 +-
 .../log4j/core/pattern/NdcPatternConverter.java    |   52 +-
 .../log4j/core/pattern/PatternFormatter.java       |    9 +
 .../logging/log4j/core/pattern/PatternParser.java  |   15 +-
 .../pattern/RootThrowablePatternConverter.java     |    6 +-
 ...onverter.java => ThreadIdPatternConverter.java} |   22 +-
 ...verter.java => ThreadNamePatternConverter.java} |   12 +-
 ...er.java => ThreadPriorityPatternConverter.java} |   22 +-
 .../logging/log4j/core/script/ScriptManager.java   |    6 +-
 .../apache/logging/log4j/core/tools/Generate.java  |  470 ++-
 .../org/apache/logging/log4j/core/util/Assert.java |    7 +
 .../apache/logging/log4j/core/util/Constants.java  |   83 +-
 .../logging/log4j/core/util/CronExpression.java    |   30 +-
 .../core/util/DefaultShutdownCallbackRegistry.java |   64 +-
 .../log4j/core/util/ExtensionLanguageMapping.java  |    8 +-
 .../apache/logging/log4j/core/util/FileUtils.java  |    6 +-
 .../apache/logging/log4j/core/util/JsonUtils.java  |   93 +
 .../logging/log4j/core/util/KeyValuePair.java      |   25 +-
 .../logging/log4j/core/util/NanoClockFactory.java  |   84 -
 .../log4j/core/util/ObjectArrayIterator.java       |  179 ++
 .../logging/log4j/core/util/ReflectionUtil.java    |    4 +-
 .../log4j/core/util/StringBuilderWriter.java       |   26 +-
 .../logging/log4j/core/util/StringEncoder.java     |   12 +-
 .../apache/logging/log4j/core/util/Transform.java  |    3 +-
 .../logging/log4j/core/util/WatchManager.java      |   30 +-
 .../log4j/core/util/datetime/FastDateParser.java   |    8 +-
 .../log4j/core/util/datetime/FastDatePrinter.java  |    4 +-
 .../log4j/core/util/datetime/FixedDateFormat.java  |   30 +-
 .../log4j/core/util/datetime/FormatCache.java      |    4 +-
 log4j-core/src/main/resources/Log4j-config.xsd     |    7 +-
 log4j-core/src/main/resources/Log4j-events.dtd     |    4 +-
 log4j-core/src/main/resources/Log4j-events.xsd     |    2 +
 .../apache/logging/log4j/MarkerMixInJsonTest.java  |   31 +
 .../org/apache/logging/log4j/MarkerMixInTest.java  |    8 +-
 .../apache/logging/log4j/MarkerMixInXmlTest.java   |   31 +
 .../apache/logging/log4j/MarkerMixInYamlTest.java  |   31 +
 .../log4j/core/AppenderRefLevelJsonTest.java       |   12 +-
 .../logging/log4j/core/AppenderRefLevelTest.java   |   12 +-
 .../log4j/core/BasicConfigurationFactory.java      |    1 -
 .../log4j/core/CustomLevelsWithFiltersTest.java    |    8 +-
 ...est.java => GcFreeAsynchronousLoggingTest.java} |   31 +-
 .../logging/log4j/core/GcFreeLoggingTestUtil.java  |  176 ++
 ...st.java => GcFreeMixedSyncAyncLoggingTest.java} |   31 +-
 .../log4j/core/GcFreeSynchronousLoggingTest.java   |   22 +-
 .../apache/logging/log4j/core/Log4j1222Test.java   |   63 +
 .../apache/logging/log4j/core/LogEventTest.java    |    2 +
 .../org/apache/logging/log4j/core/LoggerTest.java  |   43 +-
 .../logging/log4j/core/LoggerUpdateTest.java       |   19 +-
 .../logging/log4j/core/PatternSelectorTest.java    |   28 +-
 ...nfigTest.java => PropertiesFileConfigTest.java} |    4 +-
 .../logging/log4j/core/StrictXmlConfigTest.java    |   13 +-
 .../logging/log4j/core/TimestampMessageTest.java   |   10 +-
 .../appender/AsyncAppenderQueueFullPolicyTest.java |  113 +
 .../log4j/core/appender/FileAppenderTest.java      |   21 +-
 .../appender/JsonCompleteFileAppenderTest.java     |    2 +-
 .../MemoryMappedFileAppenderLocationTest.java      |   16 +-
 .../MemoryMappedFileAppenderRemapTest.java         |    2 +-
 .../MemoryMappedFileAppenderSimpleTest.java        |    2 +-
 .../core/appender/MemoryMappedFileManagerTest.java |    4 +-
 .../appender/RandomAccessFileAppenderTests.java    |   15 +-
 .../core/appender/RandomAccessFileManagerTest.java |   22 +-
 ...ollingRandomAccessFileAppenderRolloverTest.java |   13 +-
 .../log4j/core/appender/SmtpAppenderTest.java      |   41 +-
 .../log4j/core/appender/SocketAppenderTest.java    |   15 +-
 .../log4j/core/appender/TlsSyslogFrameTest.java    |   53 +-
 .../core/appender/XmlCompleteFileAppenderTest.java |   82 +
 .../log4j/core/appender/XmlFileAppenderTest.java   |    1 +
 .../appender/db/AbstractDatabaseAppenderTest.java  |    2 -
 .../core/appender/db/jpa/JpaH2AppenderTest.java    |    2 +-
 .../appender/db/jpa/JpaHyperSqlAppenderTest.java   |    2 +-
 .../log4j/core/appender/db/jpa/TestBaseEntity.java |   12 +
 .../appender/mom/jeromq/JeroMqAppenderTest.java    |   18 +-
 .../core/appender/mom/kafka/KafkaAppenderTest.java |   41 +-
 .../log4j/core/appender/rolling/FileSizeTest.java  |   16 +-
 .../appender/rolling/PatternProcessorTest.java     |  225 +-
 .../RollingAppenderNoUnconditionalDeleteTest.java  |   22 +-
 .../appender/rolling/RollingAppenderSizeTest.java  |   20 +-
 ...ingRandomAccessFileManagerHeaderFooterTest.java |    5 +-
 .../RollingRandomAccessFileManagerTest.java        |   15 +-
 .../rolling/action/DeletingVisitorTest.java        |    2 +-
 .../rolling/action/ScriptConditionTest.java        |    6 +-
 .../routing/PropertiesRoutingAppenderTest.java     |    1 +
 .../core/appender/routing/RoutingAppenderTest.java |    1 +
 .../routing/RoutingAppenderWithPurgingTest.java    |   13 +-
 .../routing/RoutingDefaultAppenderTest.java        |    1 +
 .../log4j/core/async/AsyncLoggerTestNanoTime.java  |   15 +-
 .../async/AsyncLoggerTimestampMessageTest.java     |   15 +-
 .../async/AsyncQueueFullPolicyFactoryTest.java     |  114 +
 .../async/DefaultAsyncQueueFullPolicyTest.java     |   50 +
 .../async/DiscardingAsyncQueueFullPolicyTest.java  |  117 +
 .../log4j/core/async/RingBufferLogEventTest.java   |   10 +-
 .../log4j/core/async/perftest/IdleStrategy.java    |   37 +
 .../core/async/perftest/NoOpIdleStrategy.java}     |   27 +-
 .../log4j/core/async/perftest/PerfTest.java        |    8 +-
 .../log4j/core/async/perftest/PerfTestDriver.java  |    2 +-
 .../async/perftest/PerfTestResultFormatter.java    |    4 +-
 .../core/async/perftest/ResponseTimeTest.java      |  376 +++
 .../log4j/core/async/perftest/RunLog4j1.java       |    9 +-
 .../log4j/core/async/perftest/RunLog4j2.java       |    8 +-
 .../log4j/core/async/perftest/RunLogback.java      |    8 +-
 .../log4j/core/async/perftest/SimplePerfTest.java  |  148 +
 .../core/async/perftest/YieldIdleStrategy.java     |   22 +-
 .../core/config/AppenderControlArraySetTest.java   |  191 ++
 .../core/config/CompositeConfigurationTest.java    |  176 ++
 .../log4j/core/config/ConfigurationTest.java       |    3 +-
 .../log4j/core/config/CustomConfigurationTest.java |    2 +-
 .../log4j/core/config/TestConfigurator.java        |   56 +-
 .../core/filter/AbstractScriptFilterTest.java      |    4 +-
 .../DynamicThresholdFilterSerializationTest.java   |   47 -
 .../core/filter/DynamicThresholdFilterTest.java    |    4 +-
 .../log4j/core/filter/LevelRangeFilterTest.java    |    4 +-
 .../log4j/core/filter/MarkerFilterTest.java        |    6 +-
 .../logging/log4j/core/filter/RegexFilterTest.java |   11 +-
 .../core/filter/ThreadContextMapFilterTest.java    |   16 +-
 .../log4j/core/filter/ThresholdFilterTest.java     |    4 +-
 .../logging/log4j/core/filter/TimeFilterTest.java  |    2 +-
 .../log4j/core/impl/Log4jLogEventNanoTimeTest.java |   14 +-
 .../logging/log4j/core/impl/Log4jLogEventTest.java |  110 +-
 .../log4j/core/impl/MutableLogEventTest.java       |  278 ++
 .../core/impl/ReusableLogEventFactoryTest.java     |   99 +
 .../log4j/core/impl/ThrowableProxyTest.java        |   19 +-
 .../log4j/core/jackson/LevelMixInJsonTest.java     |   13 +-
 .../logging/log4j/core/jackson/LevelMixInTest.java |    9 +-
 .../log4j/core/jackson/LevelMixInXmlTest.java      |   22 +-
 .../log4j/core/jackson/LevelMixInYamlTest.java     |   13 +-
 .../core/jackson/StackTraceElementMixInTest.java   |    8 +-
 .../log4j/core/layout/CsvLogEventLayoutTest.java   |   44 +-
 .../layout/CsvParameterLayoutAllAsyncTest.java     |   69 +
 .../log4j/core/layout/CsvParameterLayoutTest.java  |   84 +-
 .../logging/log4j/core/layout/GelfLayoutTest.java  |  102 +-
 .../logging/log4j/core/layout/JsonLayoutTest.java  |   59 +-
 .../layout/PatternLayoutMainMapLookupTest.java     |    5 +-
 .../log4j/core/layout/PatternLayoutTest.java       |  357 ++-
 .../log4j/core/layout/SerializableLayoutTest.java  |   66 -
 .../core/layout/SpyByteBufferDestination.java      |   63 +
 .../core/layout/StringBuilderEncoderTest.java      |  277 ++
 .../{JsonLayoutTest.java => YamlLayoutTest.java}   |  149 +-
 .../logging/log4j/core/lookup/JndiLookupTest.java  |   18 +
 .../logging/log4j/core/lookup/Log4jLookupTest.java |   32 +-
 .../core/lookup/Log4jLookupWithSpacesTest.java     |   16 +-
 .../logging/log4j/core/lookup/MapLookupTest.java   |   25 +
 .../core/net/server/AbstractSocketServerTest.java  |   12 +-
 .../{ThreadNameFilter.java => ThreadIdFilter.java} |   10 +-
 .../log4j/core/net/server/ThreadNameFilter.java    |    3 +
 ...adNameFilter.java => ThreadPriorityFilter.java} |   10 +-
 .../log4j/core/net/ssl/SslConfigurationTest.java   |   27 +-
 .../core/pattern/DatePatternConverterTest.java     |   29 +-
 .../pattern/EqualsReplacementConverterTest.java    |   63 +-
 .../log4j/core/pattern/MaxLengthConverterTest.java |   73 +
 .../core/pattern/MessagePatternConverterTest.java  |    8 +-
 .../log4j/core/pattern/NameAbbreviatorTest.java    |   14 +-
 .../log4j/core/pattern/PatternParserTest.java      |  113 +-
 .../core/pattern/ThreadIdPatternConverterTest.java |   17 +-
 .../pattern/ThreadNamePatternConverterTest.java    |   17 +-
 .../ThreadPriorityPatternConverterTest.java        |   17 +-
 .../apache/logging/log4j/core/util/Compare.java    |  134 -
 .../log4j/core/util/CronExpressionTest.java        |    1 -
 .../log4j/core/util/NanoClockFactoryTest.java      |   65 -
 .../logging/log4j/core/util/WatchManagerTest.java  |    8 +-
 .../core/util/datetime/FixedDateFormatTest.java    |    8 +-
 .../org/apache/logging/log4j/junit/CleanFiles.java |   32 +-
 .../logging/log4j/junit/LoggerContextRule.java     |   11 +
 .../log4j/test/appender/AlwaysFailAppender.java    |   13 +-
 ...waysFailAppender.java => BlockingAppender.java} |   36 +-
 .../log4j/test/appender/DeadlockAppender.java      |   13 +-
 .../log4j/test/appender/EncodingListAppender.java  |   80 +
 .../log4j/test/appender/FailOnceAppender.java      |   13 +-
 .../log4j/test/appender/InMemoryAppender.java      |    2 -
 .../logging/log4j/test/appender/ListAppender.java  |   30 +-
 .../log4j/test/appender/UsesLoggingAppender.java   |   22 +-
 .../logging/log4j/test/layout/BasicLayout.java     |    1 -
 .../log4j/test/layout/SerializableLayout.java      |   48 -
 .../src/test/resources/JeroMqAppenderTest.xml      |    3 +-
 .../resources/JsonCompleteFileAppenderTest.xml     |    4 +-
 .../src/test/resources/KafkaAppenderTest.xml       |   11 +-
 ...AccessFileAppenderLocationPropsTest.properties} |   37 +-
 .../src/test/resources/csvParamsMixedAsync.xml     |   13 +
 .../{JeroMqAppenderTest.xml => csvParamsSync.xml}  |   57 +-
 log4j-core/src/test/resources/gcFreeLogging.xml    |   60 +
 .../test/resources/gcFreeMixedSyncAsyncLogging.xml |   71 +
 .../src/test/resources/log4j-asynch-queue-full.xml |   38 +
 .../src/test/resources/log4j-comp-appender.json    |   34 +
 .../src/test/resources/log4j-comp-appender.xml     |   39 +
 .../src/test/resources/log4j-comp-filter.json      |    9 +
 .../src/test/resources/log4j-comp-filter.xml       |   34 +
 .../src/test/resources/log4j-comp-logger.json      |   42 +
 .../src/test/resources/log4j-comp-logger.xml       |   41 +
 .../src/test/resources/log4j-comp-properties.json  |   16 +
 ...4j-rolling-xy.xml => log4j-comp-properties.xml} |   33 +-
 .../test/resources/log4j-comp-reconfig.properties  |   59 +
 .../src/test/resources/log4j-comp-reconfig.xml     |   39 +
 .../{log4j-rolling-xy.xml => log4j-rolling-xz.xml} |    2 +-
 .../src/test/resources/log4j-routing.properties    |    9 -
 .../resources/log4j-scriptFile-filters.properties  |    8 -
 .../src/test/resources/log4j-test1.properties      |   58 +
 .../src/test/resources/log4j-test2.properties      |   59 +
 .../log4j2-properties-root-only.properties         |    6 -
 .../test/resources/log4j2-properties.properties    |    9 -
 .../test/resources/perf-CountingNoOpAppender.xml   |   12 +
 .../src/test/resources/perf/SimplePerfTest.bat     |   47 +
 .../src/test/resources/perf/SimplePerfTest.sh      |   57 +
 .../src/test/resources/perf/runResponseTm.sh       |   62 +
 log4j-distribution/.gitignore                      |    2 +
 log4j-distribution/pom.xml                         |    2 +-
 log4j-flume-ng/pom.xml                             |    2 +-
 .../log4j/flume/appender/FlumeAppender.java        |    1 -
 .../log4j/flume/appender/FlumeAvroManager.java     |    3 +-
 .../logging/log4j/flume/appender/FlumeEvent.java   |   18 +
 log4j-flume-ng/src/site/xdoc/index.xml.vm          |    1 +
 .../flume/appender/FlumeEmbeddedAppenderTest.java  |   10 +-
 log4j-iostreams/pom.xml                            |    2 +-
 .../org/apache/logging/log4j/io/IoBuilder.java     |   12 +-
 log4j-iostreams/src/site/xdoc/index.xml            |    1 +
 .../logging/log4j/io/AbstractStreamTest.java       |    2 +-
 log4j-jcl/pom.xml                                  |    2 +-
 log4j-jcl/src/site/xdoc/index.xml                  |    3 +-
 log4j-jmx-gui/pom.xml                              |    6 +-
 log4j-jmx-gui/src/site/xdoc/index.xml              |    3 +-
 log4j-jul/pom.xml                                  |    2 +-
 .../org/apache/logging/log4j/jul/ApiLogger.java    |   10 +-
 .../logging/log4j/jul/DefaultLevelConverter.java   |    4 +-
 log4j-jul/src/site/xdoc/index.xml                  |    1 +
 .../logging/log4j/jul/AbstractLoggerTest.java      |   21 +-
 .../jul/BracketInNotInterpolatedMessageTest.java   |   56 +
 log4j-liquibase/pom.xml                            |    2 +-
 log4j-liquibase/src/site/xdoc/index.xml            |    3 +-
 log4j-nosql/pom.xml                                |    2 +-
 .../log4j/nosql/appender/NoSqlAppender.java        |    1 -
 .../log4j/nosql/appender/NoSqlDatabaseManager.java |    2 +
 log4j-nosql/src/site/xdoc/index.xml.vm             |    1 +
 .../nosql/appender/NoSqlDatabaseManagerTest.java   |   32 +-
 log4j-perf/pom.xml                                 |    2 +-
 .../log4j/message/ParameterFormatterBenchmark.java |  186 ++
 ...bstractStringLayoutStringEncodingBenchmark.java |  266 ++
 .../perf/jmh/AsyncAppenderLog4j1Benchmark.java     |  119 +-
 ...a => AsyncAppenderLog4j1LocationBenchmark.java} |   55 +-
 .../perf/jmh/AsyncAppenderLog4j2Benchmark.java     |  124 +-
 ...a => AsyncAppenderLog4j2LocationBenchmark.java} |   49 +-
 .../perf/jmh/AsyncAppenderLogbackBenchmark.java    |  122 +-
 ... => AsyncAppenderLogbackLocationBenchmark.java} |   61 +-
 .../log4j/perf/jmh/AsyncLoggersBenchmark.java      |  141 +-
 ...ark.java => AsyncLoggersLocationBenchmark.java} |   48 +-
 .../log4j/perf/jmh/CollectionsBenchmark.java       |   12 +-
 .../log4j/perf/jmh/FileAppenderBenchmark.java      |   97 +-
 ...hmark.java => FileAppenderParamsBenchmark.java} |  112 +-
 .../log4j/perf/jmh/GelfLayoutBenchmark.java        |  111 +
 .../jmh/Log4j2AppenderComparisonBenchmark.java     |  221 ++
 .../log4j/perf/jmh/LoggerConfigBenchmark.java      |    8 +-
 .../logging/log4j/perf/jmh/MDCFilterBenchmark.java |   91 +
 .../log4j/perf/jmh/MarkerFilterBenchmark.java      |  105 +
 .../log4j/perf/jmh/MemoryHandlerJULBenchmark.java  |  165 ++
 .../jmh/MemoryHandlerJULLocationBenchmark.java     |   74 +
 .../perf/jmh/ParameterizedMessageBenchmark.java    |  289 +-
 ... => ParameterizedMessageInliningBenchmark.java} |    6 +-
 .../log4j/perf/jmh/PatternLayoutBenchmark.java     |  175 +-
 .../logging/log4j/perf/jmh/SimpleBenchmark.java    |   17 +
 .../log4j/perf/jmh/TextEncoderHelperBenchmark.java |  240 ++
 .../ThreadLocalVsConcurrentHashMapBenchmark.java   |  186 +-
 .../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java |    3 +-
 .../logging/log4j/perf/jmh/VarargsBenchmark.java   |   17 +-
 .../logging/log4j/perf/nogc/AbstractLogger.java    |   82 +-
 .../logging/log4j/perf/nogc/ClassicLogger.java     |   36 +-
 .../logging/log4j/perf/nogc/DemoAppender.java      |   71 +
 .../apache/logging/log4j/perf/nogc/NoGcLayout.java |  134 +
 .../apache/logging/log4j/perf/nogc/NoGcLogger.java |   27 +-
 .../logging/log4j/perf/nogc/NoGcMessage.java       |  106 +
 .../perf/nogc/NoGcMessagePatternConverter.java     |   23 +-
 .../log4j/perf/nogc}/ParameterizedMessage.java     |    7 +-
 .../org/apache/logging/log4j/perf/nogc/Test.java   |  114 +
 .../log4j/perf/util/BenchmarkMessageParams.java    |   37 +-
 .../logging/log4j/perf/util/DemoAppender.java      |   71 +
 .../logging/log4j/perf/util/NoOpJULHandler.java    |   27 +-
 .../logging/log4j/perf/util/NoOpLog4jAppender.java |   30 +-
 .../log4j/perf/util/NoOpLogbackAppender.java       |   19 +-
 .../main/resources/log4j2-appenderComparison.xml   |   68 +
 .../main/resources/log4j2-markerFilter-perf.xml    |   31 +
 .../resources/log4j2-threadContextFilter-perf.xml  |   33 +
 .../main/resources/logback-markerFilter-perf.xml   |   33 +
 .../src/main/resources/logback-mdcFilter-perf.xml  |   34 +
 .../resources/perf-WithoutAnyAppender-location.xml |   28 +
 .../src/main/resources/perf-WithoutAnyAppender.xml |   28 +
 .../perf-log4j12-async-location-noOpAppender.xml   |   31 +
 .../resources/perf-log4j12-async-noOpAppender.xml  |   30 +
 .../perf-logback-async-location-noOpAppender.xml   |   31 +
 .../resources/perf-logback-async-noOpAppender.xml  |   31 +
 .../resources/perf5AsyncApndNoLoc-noOpAppender.xml |   31 +
 .../perf5AsyncApndWithLoc-noOpAppender.xml         |   31 +
 log4j-samples/.gitignore                           |    1 +
 log4j-samples/configuration/pom.xml                |    2 +-
 .../configuration/CustomConfigurationFactory.java  |    2 -
 .../configuration/CustomConfigurationTest.java     |    2 +-
 log4j-samples/flume-common/pom.xml                 |    2 +-
 log4j-samples/flume-embedded/pom.xml               |    4 +-
 log4j-samples/flume-remote/pom.xml                 |    6 +-
 log4j-samples/loggerProperties/pom.xml             |    2 +-
 .../apache/logging/log4j/lookup/CustomLookup.java  |    3 +-
 .../logging/log4j/lookup/CustomMapMessage.java     |    1 +
 .../logging/log4j/lookup/MapMessageLookup.java     |    6 +-
 log4j-samples/pom.xml                              |    2 +-
 log4j-slf4j-impl/pom.xml                           |    2 +-
 .../java/org/apache/logging/slf4j/Log4jLogger.java |    3 +-
 log4j-slf4j-impl/src/site/xdoc/index.xml           |    3 +-
 .../org/apache/logging/slf4j/Log4j1222Test.java    |   42 +-
 log4j-taglib/pom.xml                               |    2 +-
 .../log4j/taglib/Log4jTaglibLoggerContext.java     |   28 +-
 log4j-taglib/src/site/xdoc/index.xml               |    3 +-
 .../logging/log4j/taglib/CatchingTagTest.java      |   49 +-
 .../{EntryTagTest.java => EnterTagTest.java}       |   44 +-
 .../apache/logging/log4j/taglib/ExitTagTest.java   |   42 +-
 .../logging/log4j/taglib/IfEnabledTagTest.java     |   26 +-
 .../log4j/taglib/LoggingMessageTagSupportTest.java |   38 +-
 .../logging/log4j/taglib/SetLoggerTagTest.java     |   23 +-
 .../{FatalTagTest.java => TagLevelTest.java}       |   37 +-
 .../logging/log4j/taglib/TagUtilsLevelTest.java    |   61 +
 .../logging/log4j/taglib/TagUtilsScopeTest.java    |   56 +
 .../apache/logging/log4j/taglib/TagUtilsTest.java  |  114 -
 .../apache/logging/log4j/taglib/TraceTagTest.java  |   32 -
 .../apache/logging/log4j/taglib/WarnTagTest.java   |   32 -
 log4j-to-slf4j/pom.xml                             |    2 +-
 .../java/org/apache/logging/slf4j/SLF4JLogger.java |   77 +-
 .../apache/logging/slf4j/SLF4JLoggerContext.java   |   32 +-
 .../logging/slf4j/SLF4JLoggerContextFactory.java   |  125 +-
 log4j-to-slf4j/src/site/xdoc/index.xml             |    7 +-
 .../java/org/apache/logging/slf4j/LoggerTest.java  |  346 +--
 log4j-web/pom.xml                                  |    2 +-
 .../log4j/web/Log4jServletContextListener.java     |    3 +-
 .../logging/log4j/web/Log4jWebInitializerImpl.java |    7 +-
 .../log4j/web/ServletRequestThreadContext.java     |   45 +
 .../log4j/web/appender/ServletAppender.java        |    6 +-
 log4j-web/src/site/xdoc/index.xml                  |    3 +-
 .../log4j/web/Log4jServletContextListenerTest.java |   11 -
 pom.xml                                            |   93 +-
 src/changes/announcement.vm                        |    8 +-
 src/changes/changes.xml                            |  327 +++
 src/site/pdf.xml                                   |    1 +
 .../images/AsyncWithLocationThrpt1T-labeled.png    |  Bin 0 -> 23273 bytes
 .../resources/images/AsyncWithLocationThrpt1T.png  |  Bin 0 -> 17751 bytes
 .../Log4j2AppenderThroughputComparison-linux.png   |  Bin 0 -> 37494 bytes
 .../Log4j2AppenderThroughputComparison-windows.png |  Bin 0 -> 36089 bytes
 .../images/MarkerFilterCostComparison.png          |  Bin 0 -> 22737 bytes
 src/site/resources/images/ParamMsgThrpt1-4T.png    |  Bin 0 -> 37465 bytes
 .../ResponseTimeAsyncClassicVsGcFree-label.png     |  Bin 0 -> 31148 bytes
 .../ResponseTimeAsyncLogging16Threads at 8kEach.png   |  Bin 0 -> 29429 bytes
 ...ncLogging16Threads at 8kEachLog4j2Only-labeled.png |  Bin 0 -> 41663 bytes
 .../ResponseTimeAsyncLogging1Thread at 128k.png       |  Bin 0 -> 25701 bytes
 .../ResponseTimeAsyncLogging4Threads at 16kEach.png   |  Bin 0 -> 32664 bytes
 .../images/ResponseTimeSyncClassicVsGcFree.png     |  Bin 0 -> 33240 bytes
 .../ResponseTimeVsServiceTimeAsyncLoggers.png      |  Bin 0 -> 34779 bytes
 .../images/SyncThroughputLoggerComparisonLinux.png |  Bin 0 -> 33718 bytes
 .../SynchronousFileResponseTime2T32k-labeled.png   |  Bin 0 -> 31907 bytes
 .../images/ThreadContextFilterCostComparison.png   |  Bin 0 -> 17874 bytes
 .../images/garbage-free2.6-SyncThroughputLinux.png |  Bin 0 -> 24197 bytes
 .../log4j-2.5-FlightRecording-thumbnail40pct.png   |  Bin 0 -> 57992 bytes
 .../resources/images/log4j-2.5-FlightRecording.png |  Bin 0 -> 68628 bytes
 .../log4j-2.6-FlightRecording-thumbnail40pct.png   |  Bin 0 -> 45221 bytes
 .../resources/images/log4j-2.6-FlightRecording.png |  Bin 0 -> 50481 bytes
 src/site/site.xml                                  |   30 +-
 src/site/xdoc/articles.xml                         |    8 +
 src/site/xdoc/faq.xml                              |  323 ++-
 src/site/xdoc/index.xml                            |   19 +-
 src/site/xdoc/manual/appenders.xml                 |  106 +-
 src/site/xdoc/manual/async.xml                     |  511 ++--
 src/site/xdoc/manual/configuration.xml.vm          |  238 +-
 src/site/xdoc/manual/customconfig.xml              |   46 +-
 src/site/xdoc/manual/filters.xml                   |    4 +-
 src/site/xdoc/manual/flowtracing.xml               |   39 +-
 src/site/xdoc/manual/garbagefree.xml               |  497 ++++
 src/site/xdoc/manual/index.xml                     |   12 +-
 src/site/xdoc/manual/layouts.xml.vm                |  419 ++-
 src/site/xdoc/manual/markers.xml                   |    5 +-
 src/site/xdoc/manual/migration.xml                 |   24 +-
 src/site/xdoc/manual/thread-context.xml            |  312 +-
 src/site/xdoc/performance.xml                      |  435 ++-
 src/site/xdoc/runtime-dependencies.xml             |   35 +-
 src/site/xdoc/thanks.xml                           |   39 +-
 697 files changed, 33865 insertions(+), 10684 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git



More information about the pkg-java-commits mailing list