[apache-log4j2] branch master updated (d9b114b -> d96e0c3)

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


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

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

      from  d9b114b   Update changelog
       new  7421690   Exclude the minified JavaScript files from the upstream tarball
      adds  682c51a   Imported Upstream version 2.4.1
       new  dfbffc8   Merge tag 'upstream/2.4.1'
       new  ae40b1f   Fixed the compatibility with jackson and mongodb
      adds  0b0c34a   Imported Upstream version 2.5
       new  79083e4   Merge tag 'upstream/2.5'
       new  fd0952a   New dependencies on groovy and libbsh-java
       new  6302da3   Standards-Version updated to 3.9.8
      adds  379f55c   Imported Upstream version 2.6
       new  a0af2a8   Merge tag 'upstream/2.6'
       new  700fe1c   New dependency on libwoodstox-java
       new  24eae1c   Ignore the new test dependencies
       new  90d8a96   Ignore the clirr-maven-plugin
       new  c416a88   Exclude the site from the upstream tarball
      adds  2db0322   Imported Upstream version 2.6.1
       new  44e55d9   Merge tag 'upstream/2.6.1'
       new  43b1948   Refreshed the patches
       new  a342b2f   Use a secure Vcs-Git URL
       new  d96e0c3   Upload to unstable

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 BUILDING.txt                                       |   21 +-
 NOTICE.txt                                         |    2 +-
 README.md                                          |   23 +
 RELEASE-NOTES.txt                                  |  134 +-
 Vagrantfile                                        |    2 +-
 checkstyle.xml                                     |    7 +
 debian/changelog                                   |   14 +
 debian/control                                     |    9 +-
 debian/copyright                                   |   41 +-
 debian/maven.ignoreRules                           |    4 +
 debian/maven.rules                                 |    2 +
 debian/patches/01-disable-kafka-appender.patch     |    2 +-
 debian/patches/02-jackson-compatibility.patch      |   14 +
 debian/patches/03-mongodb-compatibility.patch      |   14 +
 debian/patches/series                              |    2 +
 log4j-1.2-api/pom.xml                              |    7 +-
 .../src/main/java/org/apache/log4j/Category.java   |   34 +-
 .../src/main/java/org/apache/log4j/LogManager.java |  444 +-
 .../log4j/config/Log4j1ConfigurationFactory.java   |  314 +
 .../java/org/apache/log4j/spi/LoggerFactory.java   |    9 +-
 log4j-1.2-api/src/site/xdoc/index.xml              |    3 +-
 .../test/java/org/apache/log4j/LogWithMDCTest.java |   52 +
 .../java/org/apache/log4j/LogWithRouteTest.java    |   53 +
 .../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 +
 .../src/test/resources/log-RouteWithMDC.xml        |   47 +
 log4j-1.2-api/src/test/resources/logWithMDC.xml    |   40 +
 log4j-api/pom.xml                                  |   27 +-
 .../logging/log4j/CloseableThreadContext.java      |  166 +
 .../java/org/apache/logging/log4j/EventLogger.java |    4 +-
 .../main/java/org/apache/logging/log4j/Level.java  |   97 +-
 .../java/org/apache/logging/log4j/LogManager.java  |  324 +-
 .../main/java/org/apache/logging/log4j/Logger.java | 3297 +++++--
 .../main/java/org/apache/logging/log4j/Marker.java |   40 +-
 .../org/apache/logging/log4j/MarkerManager.java    |   81 +-
 .../org/apache/logging/log4j/ThreadContext.java    |  143 +-
 .../log4j/message/AbstractMessageFactory.java      |  104 +-
 .../log4j/message/BasicThreadInformation.java      |    2 +-
 .../log4j/message/DefaultFlowMessageFactory.java   |  207 +
 .../apache/logging/log4j/message/EntryMessage.java |   26 +
 .../apache/logging/log4j/message/ExitMessage.java  |   26 +
 .../log4j/message/ExtendedThreadInformation.java   |    3 +-
 .../apache/logging/log4j/message/FlowMessage.java  |   39 +
 .../logging/log4j/message/FlowMessageFactory.java  |   58 +
 .../logging/log4j/message/FormattedMessage.java    |  201 +-
 .../log4j/message/FormattedMessageFactory.java     |  100 +-
 .../logging/log4j/message/LocalizedMessage.java    |   26 +-
 .../log4j/message/LocalizedMessageFactory.java     |   24 +-
 .../apache/logging/log4j/message/MapMessage.java   |   11 +
 .../org/apache/logging/log4j/message/Message.java  |   15 +
 .../logging/log4j/message/MessageFactory2.java     |  180 +
 .../log4j/message/MessageFormatMessage.java        |   29 +-
 .../log4j/message/MessageFormatMessageFactory.java |  101 +-
 .../logging/log4j/message/ObjectArrayMessage.java  |    6 +-
 .../logging/log4j/message/ObjectMessage.java       |   27 +-
 .../logging/log4j/message/ParameterFormatter.java  |  637 ++
 .../log4j/message/ParameterizedMessage.java        |  627 +-
 .../log4j/message/ParameterizedMessageFactory.java |  110 +-
 .../ParameterizedNoReferenceMessageFactory.java    |  107 +
 .../logging/log4j/message/ReusableMessage.java     |   72 +
 .../log4j/message/ReusableMessageFactory.java      |  187 +
 .../log4j/message/ReusableObjectMessage.java       |  118 +
 .../message/ReusableParameterizedMessage.java      |  317 +
 .../log4j/message/ReusableSimpleMessage.java       |  105 +
 .../logging/log4j/message/SimpleMessage.java       |   65 +-
 .../log4j/message/SimpleMessageFactory.java        |  147 +
 .../log4j/message/StringFormattedMessage.java      |   37 +-
 .../message/StringFormatterMessageFactory.java     |  104 +-
 .../logging/log4j/message/StructuredDataId.java    |   39 +-
 .../log4j/message/StructuredDataMessage.java       |   12 +
 .../logging/log4j/message/ThreadDumpMessage.java   |   23 +-
 .../apache/logging/log4j/simple/SimpleLogger.java  |  103 +-
 .../logging/log4j/simple/SimpleLoggerContext.java  |   31 +-
 .../log4j/simple/SimpleLoggerContextFactory.java   |    6 +-
 .../apache/logging/log4j/spi/AbstractLogger.java   | 1600 +++-
 .../logging/log4j/spi/AbstractLoggerAdapter.java   |   14 +-
 .../logging/log4j/spi/DefaultThreadContextMap.java |   22 +-
 .../log4j/spi/DefaultThreadContextStack.java       |   70 +-
 .../apache/logging/log4j/spi/ExtendedLogger.java   |  394 +-
 .../logging/log4j/spi/ExtendedLoggerWrapper.java   |  108 +-
 .../apache/logging/log4j/spi/LoggerContext.java    |   18 +
 .../apache/logging/log4j/spi/LoggerContextKey.java |   47 +
 .../apache/logging/log4j/spi/LoggerRegistry.java   |  182 +
 .../logging/log4j/spi/MessageFactory2Adapter.java  |  118 +
 .../org/apache/logging/log4j/spi/Provider.java     |   45 +-
 .../apache/logging/log4j/spi/StandardLevel.java    |   12 +-
 .../org/apache/logging/log4j/spi/Terminable.java   |   32 +
 .../apache/logging/log4j/status/StatusData.java    |   14 +-
 .../apache/logging/log4j/status/StatusLogger.java  |  134 +-
 .../java/org/apache/logging/log4j/util/Chars.java  |   17 +-
 .../apache/logging/log4j/util/EnglishEnums.java    |    6 +-
 .../org/apache/logging/log4j/util/LambdaUtil.java  |   26 +-
 .../org/apache/logging/log4j/util/LoaderUtil.java  |   84 +-
 .../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  |  230 +-
 .../apache/logging/log4j/util/ProviderUtil.java    |   40 +-
 .../apache/logging/log4j/util/ReflectionUtil.java  |   69 +-
 .../log4j/util/StringBuilderFormattable.java       |   33 +
 .../apache/logging/log4j/util/StringBuilders.java  |   27 +-
 .../org/apache/logging/log4j/util/Strings.java     |   41 +-
 .../java/org/apache/logging/log4j/util/Unbox.java  |  172 +
 .../java/org/apache/log4j/util/SerialUtil.java     |   65 -
 .../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  |  957 +-
 .../java/org/apache/logging/log4j/TestLogger.java  |   73 +
 .../apache/logging/log4j/TestLoggerContext.java    |   14 +-
 .../test/java/org/apache/logging/log4j/Timer.java  |  184 +-
 .../apache/logging/log4j/junit/BundleTestInfo.java |   66 +
 .../org/apache/logging/log4j/junit/Mutable.java    |   35 +
 .../org/apache/logging/log4j/junit/OsgiRule.java   |   68 +
 .../org/apache/logging/log4j/junit/SerialUtil.java |   65 +
 .../log4j/message/FormattedMessageTest.java        |   41 +-
 .../apache/logging/log4j/message/JsonMessage.java  |   66 +
 .../log4j/message/LocalizedMessageTest.java        |    1 +
 .../logging/log4j/message/MapMessageTest.java      |   11 +
 .../log4j/message/MessageFormatMessageTest.java    |   23 +-
 .../org/apache/logging/log4j/message/Mutable.java  |   34 -
 .../logging/log4j/message/ObjectMessageTest.java   |    3 +-
 .../log4j/message/ParameterFormatterTest.java      |  191 +
 .../log4j/message/ParameterizedMessageTest.java    |   30 +-
 .../log4j/message/ReusableObjectMessageTest.java   |  122 +
 .../message/ReusableParameterizedMessageTest.java  |  141 +
 .../log4j/message/ReusableSimpleMessageTest.java   |  122 +
 .../log4j/message/StringFormattedMessageTest.java  |   22 +-
 .../log4j/message/StructuredDataMessageTest.java   |   14 +-
 .../log4j/message/ThreadDumpMessageTest.java       |    6 +-
 .../logging/log4j/osgi/AbstractLoadBundleTest.java |  142 +-
 .../apache/logging/log4j/osgi/BundleTestInfo.java  |   84 -
 .../org/apache/logging/log4j/osgi/OsgiRule.java    |   69 -
 .../apache/logging/log4j/util/LambdaUtilTest.java  |    2 +-
 .../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/.gitignore                               |    1 +
 log4j-bom/pom.xml                                  |   10 +-
 log4j-core/pom.xml                                 |   43 +-
 .../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 +-
 .../logging/log4j/core/LogEventListener.java       |    3 +
 .../java/org/apache/logging/log4j/core/Logger.java |  403 +-
 .../apache/logging/log4j/core/LoggerContext.java   |  339 +-
 .../apache/logging/log4j/core/StringLayout.java    |   33 +
 .../log4j/core/appender/AbstractAppender.java      |   49 +-
 .../log4j/core/appender/AbstractManager.java       |   26 +
 .../appender/AbstractOutputStreamAppender.java     |   86 +-
 .../core/appender/AbstractWriterAppender.java      |  122 +
 .../logging/log4j/core/appender/AsyncAppender.java |  260 +-
 .../log4j/core/appender/ConsoleAppender.java       |  177 +-
 .../log4j/core/appender/CountingNoOpAppender.java  |   56 +
 .../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   |   47 +-
 .../core/appender/MemoryMappedFileAppender.java    |   15 +-
 .../core/appender/MemoryMappedFileManager.java     |   69 +-
 .../log4j/core/appender/OutputStreamAppender.java  |  189 +
 .../log4j/core/appender/OutputStreamManager.java   |  184 +-
 .../core/appender/RandomAccessFileAppender.java    |   10 +-
 .../core/appender/RandomAccessFileManager.java     |   59 +-
 .../log4j/core/appender/RollingFileAppender.java   |    9 +-
 .../appender/RollingRandomAccessFileAppender.java  |   23 +-
 .../logging/log4j/core/appender/SmtpAppender.java  |    8 +-
 .../log4j/core/appender/SocketAppender.java        |  166 +-
 .../log4j/core/appender/SyslogAppender.java        |    1 -
 .../log4j/core/appender/TlsSyslogFrame.java        |   94 +-
 .../log4j/core/appender/WriterAppender.java        |  181 +
 .../logging/log4j/core/appender/WriterManager.java |  149 +
 .../core/appender/db/AbstractDatabaseAppender.java |    1 -
 .../core/appender/db/AbstractDatabaseManager.java  |    6 +-
 .../log4j/core/appender/db/jdbc/JdbcAppender.java  |    1 -
 .../core/appender/db/jdbc/JdbcDatabaseManager.java |    4 +-
 .../db/jpa/AbstractLogEventWrapperEntity.java      |   20 +
 .../core/appender/db/jpa/BasicLogEventEntity.java  |   22 +
 .../log4j/core/appender/db/jpa/JpaAppender.java    |   12 +-
 .../core/appender/db/jpa/JpaDatabaseManager.java   |    2 +-
 .../converter/ContextStackAttributeConverter.java  |    2 +-
 .../ContextStackJsonAttributeConverter.java        |    2 +-
 .../appender/db/jpa/converter/package-info.java    |   11 +-
 .../log4j/core/appender/mom/JmsAppender.java       |   11 +-
 .../log4j/core/appender/mom/JmsManager.java        |    2 +-
 .../core/appender/mom/jeromq/JeroMqAppender.java   |  259 +-
 .../core/appender/mom/jeromq/JeroMqManager.java    |  220 +
 .../core/appender/mom/jeromq/package-info.java     |   23 +
 .../core/appender/mom/kafka/KafkaAppender.java     |  207 +-
 .../core/appender/mom/kafka/KafkaManager.java      |    7 +-
 .../core/appender/mom/kafka/package-info.java      |   23 +
 .../core/appender/rewrite/RewriteAppender.java     |    2 -
 .../rolling/CompositeTriggeringPolicy.java         |   12 +-
 .../appender/rolling/CronTriggeringPolicy.java     |  132 +
 .../appender/rolling/DefaultRolloverStrategy.java  |  307 +-
 .../log4j/core/appender/rolling/FileSize.java      |   90 +
 .../rolling/OnStartupTriggeringPolicy.java         |   48 +-
 .../core/appender/rolling/PatternProcessor.java    |  576 +-
 .../core/appender/rolling/RollingFileManager.java  |  172 +-
 .../rolling/RollingRandomAccessFileManager.java    |  104 +-
 .../rolling/SizeBasedTriggeringPolicy.java         |   67 +-
 .../rolling/TimeBasedTriggeringPolicy.java         |   12 +-
 .../appender/rolling/action/AbstractAction.java    |    5 +
 .../rolling/action/AbstractPathAction.java         |  163 +
 .../rolling/action/CommonsCompressAction.java      |   30 +-
 .../appender/rolling/action/CompositeAction.java   |    9 +
 .../core/appender/rolling/action/DeleteAction.java |  214 +
 .../appender/rolling/action/DeletingVisitor.java   |   97 +
 .../core/appender/rolling/action/Duration.java     |  257 +
 .../appender/rolling/action/FileRenameAction.java  |   74 +-
 .../appender/rolling/action/GzCompressAction.java  |   12 +
 .../rolling/action/IfAccumulatedFileCount.java     |  113 +
 .../rolling/action/IfAccumulatedFileSize.java      |  116 +
 .../log4j/core/appender/rolling/action/IfAll.java  |  116 +
 .../log4j/core/appender/rolling/action/IfAny.java  |   86 +
 .../core/appender/rolling/action/IfFileName.java   |  149 +
 .../appender/rolling/action/IfLastModified.java    |  113 +
 .../log4j/core/appender/rolling/action/IfNot.java  |   77 +
 .../appender/rolling/action/PathCondition.java     |   44 +
 .../rolling/action/PathSortByModificationTime.java |   89 +
 .../core/appender/rolling/action/PathSorter.java   |   27 +
 .../rolling/action/PathWithAttributes.java         |   59 +
 .../appender/rolling/action/ScriptCondition.java   |  118 +
 .../appender/rolling/action/SortingVisitor.java    |   58 +
 .../appender/rolling/action/ZipCompressAction.java |   37 +-
 .../core/appender/routing/IdlePurgePolicy.java     |  155 +
 .../log4j/core/appender/routing/PurgePolicy.java   |   47 +
 .../core/appender/routing/RoutingAppender.java     |   35 +-
 .../logging/log4j/core/async/AsyncLogger.java      |  529 +-
 .../log4j/core/async/AsyncLoggerConfig.java        |   63 +-
 .../AsyncLoggerConfigDefaultExceptionHandler.java  |   54 +
 .../core/async/AsyncLoggerConfigDelegate.java      |   61 +
 .../core/async/AsyncLoggerConfigDisruptor.java     |  364 +
 .../log4j/core/async/AsyncLoggerConfigHelper.java  |  401 -
 .../log4j/core/async/AsyncLoggerContext.java       |   80 +-
 .../core/async/AsyncLoggerContextSelector.java     |   47 +-
 .../async/AsyncLoggerDefaultExceptionHandler.java  |   52 +
 .../log4j/core/async/AsyncLoggerDisruptor.java     |  236 +
 .../log4j/core/async/AsyncQueueFullPolicy.java     |   38 +
 .../core/async/AsyncQueueFullPolicyFactory.java    |  101 +
 .../log4j/core/async/DaemonThreadFactory.java      |   12 +-
 .../core/async/DefaultAsyncQueueFullPolicy.java    |   37 +
 .../core/async/DiscardingAsyncQueueFullPolicy.java |   72 +
 .../logging/log4j/core/async/DisruptorUtil.java    |  150 +
 .../logging/log4j/core/async/EventRoute.java       |  100 +
 .../log4j/core/async/RingBufferLogEvent.java       |  278 +-
 .../core/async/RingBufferLogEventHandler.java      |   21 +-
 .../core/async/RingBufferLogEventTranslator.java   |   66 +-
 .../core/async/ThreadNameCachingStrategy.java      |   62 +
 .../log4j/core/config/AbstractConfiguration.java   |  555 +-
 .../logging/log4j/core/config/AppenderControl.java |   29 +-
 .../log4j/core/config/AppenderControlArraySet.java |  126 +
 .../logging/log4j/core/config/AppendersPlugin.java |    5 +-
 .../config/AwaitCompletionReliabilityStrategy.java |  332 +-
 .../AwaitUnconditionallyReliabilityStrategy.java   |  242 +-
 .../logging/log4j/core/config/Configuration.java   |   68 +-
 .../log4j/core/config/ConfigurationAware.java      |   33 +
 .../log4j/core/config/ConfigurationFactory.java    |   69 +-
 .../log4j/core/config/ConfigurationMonitor.java    |   37 -
 .../log4j/core/config/ConfigurationScheduler.java  |  189 +
 .../log4j/core/config/ConfigurationSource.java     |  130 +-
 .../log4j/core/config/ConfiguratonFileWatcher.java |   70 +
 .../logging/log4j/core/config/Configurator.java    |  656 +-
 .../log4j/core/config/CronScheduledFuture.java     |   76 +
 .../log4j/core/config/DefaultAdvertiser.java       |    7 +-
 .../log4j/core/config/DefaultConfiguration.java    |   30 +-
 .../core/config/DefaultConfigurationMonitor.java   |   39 -
 .../core/config/DefaultReliabilityStrategy.java    |  210 +-
 .../core/config/FileConfigurationMonitor.java      |  118 -
 .../core/config/LockingReliabilityStrategy.java    |  252 +-
 .../logging/log4j/core/config/LoggerConfig.java    |  124 +-
 .../log4j/core/config/NullConfiguration.java       |    4 +-
 .../logging/log4j/core/config/OrderComparator.java |    4 +-
 .../log4j/core/config/PropertiesPlugin.java        |    2 +-
 .../log4j/core/config/ReliabilityStrategy.java     |   17 +-
 .../core/config/ReliabilityStrategyFactory.java    |  139 +-
 .../logging/log4j/core/config/Scheduled.java       |   32 +
 .../logging/log4j/core/config/ScriptsPlugin.java   |   43 +
 .../builder/api/AppenderComponentBuilder.java      |    9 +-
 .../builder/api/AppenderRefComponentBuilder.java   |    9 +-
 .../log4j/core/config/builder/api/Component.java   |    4 +-
 .../api/CompositeFilterComponentBuilder.java       |   14 +-
 .../config/builder/api/ConfigurationBuilder.java   |  139 +
 .../builder/api/ConfigurationBuilderFactory.java   |    2 +-
 .../builder/api/FilterableComponentBuilder.java    |   34 +
 .../builder/api/LoggableComponentBuilder.java      |   33 +
 .../config/builder/api/LoggerComponentBuilder.java |   16 +-
 .../builder/api/RootLoggerComponentBuilder.java    |   16 +-
 .../config/builder/api/ScriptComponentBuilder.java |   25 +
 .../builder/api/ScriptFileComponentBuilder.java    |   32 +
 .../core/config/builder/api/package-info.java      |   22 +
 .../config/builder/impl/BuiltConfiguration.java    |   46 +-
 .../impl/DefaultAppenderComponentBuilder.java      |    2 +
 .../impl/DefaultAppenderRefComponentBuilder.java   |    2 +
 .../DefaultComponentAndConfigurationBuilder.java   |    2 +
 .../builder/impl/DefaultComponentBuilder.java      |   23 +-
 .../DefaultCompositeFilterComponentBuilder.java    |    2 +-
 .../builder/impl/DefaultConfigurationBuilder.java  |  127 +-
 .../impl/DefaultCustomLevelComponentBuilder.java   |    2 +-
 .../impl/DefaultFilterComponentBuilder.java        |    2 +-
 .../impl/DefaultLayoutComponentBuilder.java        |    2 +-
 .../impl/DefaultLoggerComponentBuilder.java        |   33 +-
 .../impl/DefaultRootLoggerComponentBuilder.java    |   31 +-
 .../impl/DefaultScriptComponentBuilder.java        |   38 +
 .../impl/DefaultScriptFileComponentBuilder.java    |   59 +
 .../core/config/builder/impl/package-info.java     |   22 +
 .../config/composite/CompositeConfiguration.java   |  183 +
 .../config/composite/DefaultMergeStrategy.java     |  270 +
 .../log4j/core/config/composite/MergeStrategy.java |   41 +
 .../log4j/core/config/composite/package-info.java  |   21 +
 .../log4j/core/config/json/JsonConfiguration.java  |  545 +-
 .../logging/log4j/core/config/plugins/Plugin.java  |    9 +-
 .../config/plugins/PluginBuilderAttribute.java     |    6 +-
 .../core/config/plugins/PluginBuilderFactory.java  |    6 +-
 .../log4j/core/config/plugins/PluginFactory.java   |    3 +
 .../core/config/plugins/PluginVisitorStrategy.java |    6 +-
 .../core/config/plugins/convert/TypeConverter.java |    6 +-
 .../plugins/convert/TypeConverterRegistry.java     |    2 +-
 .../config/plugins/convert/TypeConverters.java     |   29 +-
 .../log4j/core/config/plugins/package-info.java    |    6 +-
 .../core/config/plugins/processor/PluginCache.java |   18 +-
 .../core/config/plugins/processor/PluginEntry.java |    8 +-
 .../config/plugins/processor/PluginProcessor.java  |   51 +-
 .../config/plugins/processor/package-info.java     |    8 +-
 .../core/config/plugins/util/PluginBuilder.java    |   61 +-
 .../core/config/plugins/util/PluginRegistry.java   |    6 +-
 .../core/config/plugins/util/ResolverUtil.java     |   10 +-
 .../core/config/plugins/util/package-info.java     |    8 +-
 .../plugins/validation/ConstraintValidator.java    |    5 +-
 .../validation/validators/RequiredValidator.java   |   22 +-
 .../plugins/visitors/AbstractPluginVisitor.java    |   45 +-
 .../plugins/visitors/PluginAttributeVisitor.java   |    6 +-
 .../visitors/PluginBuilderAttributeVisitor.java    |    6 +-
 .../visitors/PluginConfigurationVisitor.java       |    6 +-
 .../plugins/visitors/PluginElementVisitor.java     |    8 +-
 .../config/plugins/visitors/PluginNodeVisitor.java |    8 +-
 .../plugins/visitors/PluginValueVisitor.java       |    6 +-
 .../config/plugins/visitors/PluginVisitor.java     |    6 +-
 .../config/plugins/visitors/PluginVisitors.java    |    7 +-
 .../core/config/plugins/visitors/package-info.java |    8 +-
 .../config/properties/PropertiesConfiguration.java |   10 +-
 .../properties/PropertiesConfigurationBuilder.java |  367 +
 .../properties/PropertiesConfigurationFactory.java |  318 +-
 .../log4j/core/config/properties/package-info.java |   20 +
 .../core/config/status/StatusConfiguration.java    |   11 +-
 .../log4j/core/config/xml/XmlConfiguration.java    |  198 +-
 .../log4j/core/config/yaml/YamlConfiguration.java  |    2 -
 .../logging/log4j/core/filter/AbstractFilter.java  |  206 +-
 .../log4j/core/filter/AbstractFilterable.java      |   16 +-
 .../logging/log4j/core/filter/BurstFilter.java     |    7 +-
 .../logging/log4j/core/filter/CompositeFilter.java |  419 +-
 .../log4j/core/filter/DynamicThresholdFilter.java  |   14 +-
 .../log4j/core/filter/LevelRangeFilter.java        |    6 +-
 .../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    |  154 +
 .../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       |   84 +-
 .../logging/log4j/core/impl/Log4jLogEvent.java     |  238 +-
 .../logging/log4j/core/impl/MutableLogEvent.java   |  459 +
 .../log4j/core/impl/ReusableLogEventFactory.java   |   88 +
 .../logging/log4j/core/jackson/Initializers.java   |   22 +-
 .../core/jackson/ListOfMapEntryDeserializer.java   |    2 +-
 .../core/jackson/ListOfMapEntrySerializer.java     |   11 +-
 .../log4j/core/jackson/Log4jJsonModule.java        |   10 +-
 .../log4j/core/jackson/Log4jJsonObjectMapper.java  |   11 +-
 .../log4j/core/jackson/Log4jXmlObjectMapper.java   |    2 +-
 .../log4j/core/jackson/Log4jYamlModule.java        |   54 +
 .../log4j/core/jackson/Log4jYamlObjectMapper.java  |   48 +
 .../log4j/core/jackson/LogEventJsonMixIn.java      |  140 +
 .../logging/log4j/core/jackson/LogEventMixIn.java  |   10 +
 .../logging/log4j/core/jackson/MapEntry.java       |    6 +-
 .../log4j/core/jackson/MessageSerializer.java      |    2 +
 .../logging/log4j/core/jmx/LoggerContextAdmin.java |    5 -
 .../log4j/core/jmx/LoggerContextAdminMBean.java    |    9 -
 .../logging/log4j/core/jmx/RingBufferAdmin.java    |    8 +-
 .../org/apache/logging/log4j/core/jmx/Server.java  |   31 +-
 .../log4j/core/jmx/StatusLoggerAdminMBean.java     |    2 +-
 .../log4j/core/layout/AbstractCsvLayout.java       |  158 +-
 .../log4j/core/layout/AbstractJacksonLayout.java   |   41 +-
 .../logging/log4j/core/layout/AbstractLayout.java  |  118 +-
 .../log4j/core/layout/AbstractStringLayout.java    |  202 +-
 .../log4j/core/layout/ByteBufferDestination.java   |   47 +
 .../log4j/core/layout/CsvLogEventLayout.java       |  212 +-
 .../log4j/core/layout/CsvParameterLayout.java      |  205 +-
 .../apache/logging/log4j/core/layout/Encoder.java  |   36 +
 .../logging/log4j/core/layout/GelfLayout.java      |  236 +-
 .../logging/log4j/core/layout/HtmlLayout.java      |   30 +-
 .../logging/log4j/core/layout/JacksonFactory.java  |   85 +-
 .../logging/log4j/core/layout/JsonLayout.java      |  107 +-
 .../core/layout/LockingStringBuilderEncoder.java   |   69 +
 .../log4j/core/layout/MarkerPatternSelector.java   |  124 +
 .../logging/log4j/core/layout/PatternLayout.java   |  303 +-
 .../logging/log4j/core/layout/PatternMatch.java    |  142 +
 .../logging/log4j/core/layout/PatternSelector.java |   30 +
 .../logging/log4j/core/layout/Rfc5424Layout.java   |  108 +-
 .../log4j/core/layout/ScriptPatternSelector.java   |  144 +
 .../log4j/core/layout/SerializedLayout.java        |    4 +-
 .../log4j/core/layout/StringBuilderEncoder.java    |  128 +
 .../logging/log4j/core/layout/SyslogLayout.java    |    4 +-
 .../log4j/core/layout/TextEncoderHelper.java       |  183 +
 .../logging/log4j/core/layout/XmlLayout.java       |    9 +-
 .../logging/log4j/core/layout/YamlLayout.java      |  823 ++
 .../lookup/AbstractConfigurationAwareLookup.java   |   35 +
 .../logging/log4j/core/lookup/AbstractLookup.java  |    2 +-
 .../logging/log4j/core/lookup/Interpolator.java    |    6 +-
 .../logging/log4j/core/lookup/JndiLookup.java      |    5 +-
 .../logging/log4j/core/lookup/Log4jLookup.java     |   69 +-
 .../logging/log4j/core/lookup/MainMapLookup.java   |   22 +-
 .../logging/log4j/core/lookup/MapLookup.java       |   46 +-
 .../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     |  135 +-
 .../apache/logging/log4j/core/net/Priority.java    |    2 +-
 .../apache/logging/log4j/core/net/Protocol.java    |    4 +-
 .../apache/logging/log4j/core/net/Severity.java    |    2 +-
 .../apache/logging/log4j/core/net/SmtpManager.java |   77 +-
 .../logging/log4j/core/net/SslSocketManager.java   |    2 +-
 .../logging/log4j/core/net/TcpSocketManager.java   |   12 +-
 .../core/net/mom/jms/AbstractJmsReceiver.java      |   48 +
 .../log4j/core/net/mom/jms/JmsQueueReceiver.java   |   45 +-
 .../log4j/core/net/mom/jms/JmsTopicReceiver.java   |   44 +-
 .../log4j/core/net/mom/jms/package-info.java       |    2 +-
 .../core/net/server/AbstractSocketServer.java      |    3 +-
 .../core/net/server/InputStreamLogEventBridge.java |    2 +-
 .../logging/log4j/core/net/server/JmsServer.java   |   27 +-
 .../net/server/JsonInputStreamLogEventBridge.java  |    6 +-
 .../core/net/server/SecureTcpSocketServer.java     |    4 +-
 .../log4j/core/net/server/TcpSocketServer.java     |  108 +-
 .../log4j/core/net/server/UdpSocketServer.java     |   41 +-
 .../net/ssl/AbstractKeyStoreConfiguration.java     |    8 +-
 .../log4j/core/net/ssl/SslConfiguration.java       |   16 +-
 .../core/net/ssl/StoreConfigurationException.java  |   30 +-
 .../apache/logging/log4j/core/osgi/Activator.java  |   19 +-
 .../logging/log4j/core/osgi/package-info.java      |    6 +-
 .../logging/log4j/core/pattern/AnsiEscape.java     |    2 +-
 .../core/pattern/ClassNamePatternConverter.java    |    2 +-
 .../log4j/core/pattern/DatePatternConverter.java   |  147 +-
 .../EqualsIgnoreCaseReplacementConverter.java      |  101 +
 .../core/pattern/EqualsReplacementConverter.java   |  121 +
 .../pattern/ExtendedThrowablePatternConverter.java |    6 +-
 .../logging/log4j/core/pattern/FormattingInfo.java |    2 +
 .../core/pattern/LiteralPatternConverter.java      |   12 +
 .../core/pattern/LogEventPatternConverter.java     |    4 +
 .../log4j/core/pattern/LoggerPatternConverter.java |    2 +-
 .../log4j/core/pattern/MapPatternConverter.java    |    4 +-
 .../log4j/core/pattern/MarkerPatternConverter.java |    2 +-
 .../pattern/MarkerSimpleNamePatternConverter.java  |   58 +
 .../log4j/core/pattern/MaxLengthConverter.java     |  103 +
 .../log4j/core/pattern/MdcPatternConverter.java    |    6 +-
 .../core/pattern/MessagePatternConverter.java      |   20 +-
 .../log4j/core/pattern/NameAbbreviator.java        |  130 +-
 .../log4j/core/pattern/NamePatternConverter.java   |    7 +-
 .../core/pattern/NanoTimePatternConverter.java     |   14 +-
 .../log4j/core/pattern/NdcPatternConverter.java    |   52 +-
 .../log4j/core/pattern/PatternFormatter.java       |    9 +
 .../logging/log4j/core/pattern/PatternParser.java  |   15 +-
 .../pattern/RootThrowablePatternConverter.java     |    6 +-
 .../logging/log4j/core/pattern/StyleConverter.java |   52 +-
 .../core/pattern/ThreadIdPatternConverter.java     |   61 +
 .../core/pattern/ThreadNamePatternConverter.java   |   59 +
 .../log4j/core/pattern/ThreadPatternConverter.java |   59 -
 .../pattern/ThreadPriorityPatternConverter.java    |   61 +
 .../VariablesNotEmptyReplacementConverter.java     |   91 +
 .../logging/log4j/core/script/AbstractScript.java  |   47 +
 .../apache/logging/log4j/core/script/Script.java   |   62 +
 .../logging/log4j/core/script/ScriptFile.java      |  128 +
 .../logging/log4j/core/script/ScriptManager.java   |  253 +
 .../logging/log4j/core/script/ScriptRef.java       |   73 +
 .../logging/log4j/core/script/package-info.java    |   20 +
 .../core/selector/ClassLoaderContextSelector.java  |   46 +-
 .../apache/logging/log4j/core/tools/Generate.java  |  470 +-
 .../org/apache/logging/log4j/core/util/Assert.java |    7 +
 .../apache/logging/log4j/core/util/Builder.java    |    6 +-
 .../logging/log4j/core/util/CachedClock.java       |    2 +-
 .../logging/log4j/core/util/ClockFactory.java      |   10 +-
 .../log4j/core/util/CloseShieldOutputStream.java   |   57 +
 .../logging/log4j/core/util/CloseShieldWriter.java |   46 +
 .../logging/log4j/core/util/CoarseCachedClock.java |    2 +-
 .../apache/logging/log4j/core/util/Constants.java  |   95 +-
 .../logging/log4j/core/util/CronExpression.java    | 1631 ++++
 .../core/util/DefaultShutdownCallbackRegistry.java |   66 +-
 .../logging/log4j/core/util/DummyNanoClock.java    |   96 +-
 .../log4j/core/util/ExtensionLanguageMapping.java  |   71 +
 .../apache/logging/log4j/core/util/FileUtils.java  |   25 +-
 .../logging/log4j/core/util/FileWatcher.java       |   27 +
 .../apache/logging/log4j/core/util/IOUtils.java    |  130 +
 .../apache/logging/log4j/core/util/Integers.java   |   24 +-
 .../apache/logging/log4j/core/util/JndiCloser.java |    5 +-
 .../apache/logging/log4j/core/util/JsonUtils.java  |   93 +
 .../logging/log4j/core/util/KeyValuePair.java      |   33 +-
 .../org/apache/logging/log4j/core/util/Loader.java |    6 +-
 .../logging/log4j/core/util/Log4jThread.java       |   69 +
 .../logging/log4j/core/util/NanoClockFactory.java  |   82 -
 .../apache/logging/log4j/core/util/NetUtils.java   |   10 +-
 .../logging/log4j/core/util/NullOutputStream.java  |    2 +-
 .../log4j/core/util/ObjectArrayIterator.java       |  179 +
 .../apache/logging/log4j/core/util/Patterns.java   |    5 +-
 .../logging/log4j/core/util/ReflectionUtil.java    |    6 +-
 .../apache/logging/log4j/core/util/SetUtils.java   |    9 +-
 .../log4j/core/util/StringBuilderWriter.java       |  168 +
 .../logging/log4j/core/util/StringEncoder.java     |  111 +
 .../apache/logging/log4j/core/util/Throwables.java |   36 +-
 .../apache/logging/log4j/core/util/Transform.java  |    3 +-
 .../apache/logging/log4j/core/util/UuidUtil.java   |   23 +-
 .../logging/log4j/core/util/WatchManager.java      |  120 +
 .../log4j/core/util/datetime/DateParser.java       |   44 +-
 .../log4j/core/util/datetime/DatePrinter.java      |   12 +-
 .../log4j/core/util/datetime/FastDateFormat.java   |  481 +-
 .../log4j/core/util/datetime/FastDateParser.java   |  503 +-
 .../log4j/core/util/datetime/FastDatePrinter.java  |  361 +-
 .../log4j/core/util/datetime/FixedDateFormat.java  |  646 +-
 .../log4j/core/util/datetime/FormatCache.java      |  173 +-
 .../log4j/core/util/datetime/package-info.java     |   20 +
 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 +
 log4j-core/src/site/xdoc/index.xml                 |   23 +-
 .../apache/logging/log4j/MarkerMixInJsonTest.java  |   31 +
 .../org/apache/logging/log4j/MarkerMixInTest.java  |   10 +-
 .../apache/logging/log4j/MarkerMixInXmlTest.java   |   31 +
 .../apache/logging/log4j/MarkerMixInYamlTest.java  |   31 +
 .../logging/log4j/categories/PerformanceTests.java |    6 +-
 .../logging/log4j/categories/package-info.java     |    6 +-
 .../log4j/core/AppenderRefLevelJsonTest.java       |   12 +-
 .../logging/log4j/core/AppenderRefLevelTest.java   |   12 +-
 .../log4j/core/BasicConfigurationFactory.java      |    1 -
 .../log4j/core/CustomLevelsWithFiltersTest.java    |    8 +-
 .../apache/logging/log4j/core/FileConfigTest.java  |   69 -
 .../log4j/core/GcFreeAsynchronousLoggingTest.java  |   41 +
 .../logging/log4j/core/GcFreeLoggingTestUtil.java  |  176 +
 .../log4j/core/GcFreeMixedSyncAyncLoggingTest.java |   41 +
 .../log4j/core/GcFreeSynchronousLoggingTest.java   |   40 +
 .../apache/logging/log4j/core/HostNameTest.java    |    2 +-
 .../apache/logging/log4j/core/Log4j1222Test.java   |   63 +
 .../apache/logging/log4j/core/LogEventTest.java    |    9 +-
 .../apache/logging/log4j/core/LoggerDateTest.java  |    2 +-
 .../log4j/core/LoggerSerializationTest.java        |    2 -
 .../org/apache/logging/log4j/core/LoggerTest.java  |   73 +-
 .../logging/log4j/core/LoggerUpdateTest.java       |   19 +-
 .../org/apache/logging/log4j/core/LookupTest.java  |    2 +-
 .../logging/log4j/core/PatternSelectorTest.java    |  103 +
 .../log4j/core/PropertiesFileConfigTest.java       |   69 +
 .../logging/log4j/core/StrictXmlConfigTest.java    |   13 +-
 .../logging/log4j/core/TimestampMessageTest.java   |   10 +-
 .../appender/AsyncAppenderQueueFullPolicyTest.java |  113 +
 .../appender/AsyncAppenderShutdownTimeoutTest.java |   42 +
 .../log4j/core/appender/AsyncAppenderTest.java     |   32 +-
 .../core/appender/ConfigurationTestUtils.java      |   37 +
 .../log4j/core/appender/ConsoleAppenderTest.java   |   16 +-
 .../log4j/core/appender/FileAppenderTest.java      |   21 +-
 .../log4j/core/appender/HangingAppender.java       |   87 +
 .../log4j/core/appender/InMemoryAppenderTest.java  |   82 +
 .../appender/JsonCompleteFileAppenderTest.java     |    7 +-
 .../MemoryMappedFileAppenderLocationTest.java      |   25 +-
 .../MemoryMappedFileAppenderRemapTest.java         |   11 +-
 .../MemoryMappedFileAppenderSimpleTest.java        |   11 +-
 .../core/appender/MemoryMappedFileManagerTest.java |    4 +-
 .../core/appender/OutputStreamAppenderTest.java    |  185 +-
 .../appender/RandomAccessFileAppenderTests.java    |   20 +-
 .../core/appender/RandomAccessFileManagerTest.java |   42 +-
 ...ollingRandomAccessFileAppenderRolloverTest.java |   13 +-
 .../log4j/core/appender/SmtpAppenderTest.java      |   41 +-
 .../log4j/core/appender/SocketAppenderTest.java    |   51 +-
 .../log4j/core/appender/TlsSyslogFrameTest.java    |   53 +-
 .../log4j/core/appender/WriterAppenderTest.java    |  104 +
 .../core/appender/XmlCompactFileAppenderTest.java  |    4 +-
 .../core/appender/XmlCompleteFileAppenderTest.java |   86 +-
 .../log4j/core/appender/XmlFileAppenderTest.java   |    5 +-
 .../appender/XmlRandomAccessFileAppenderTest.java  |    4 +-
 .../appender/db/AbstractDatabaseAppenderTest.java  |    2 -
 .../appender/db/jdbc/AbstractJdbcAppenderTest.java |    5 +-
 .../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 |  246 +-
 .../log4j/core/appender/rolling/FileSizeTest.java  |   36 +
 .../rolling/OnStartupTriggeringPolicyTest.java     |   69 +-
 .../appender/rolling/PatternProcessorTest.java     |  225 +-
 .../appender/rolling/RollingAppenderCronTest.java  |  111 +
 .../RollingAppenderCustomDeleteActionTest.java     |  102 +
 ...RollingAppenderDeleteAccumulatedCount1Test.java |  121 +
 ...RollingAppenderDeleteAccumulatedCount2Test.java |  122 +
 .../RollingAppenderDeleteAccumulatedSizeTest.java  |   89 +
 .../rolling/RollingAppenderDeleteMaxDepthTest.java |  120 +
 .../rolling/RollingAppenderDeleteNestedTest.java   |  121 +
 .../RollingAppenderDeleteScriptFri13thTest.java    |   88 +
 .../rolling/RollingAppenderDeleteScriptTest.java   |   85 +
 .../RollingAppenderNoUnconditionalDeleteTest.java  |  108 +
 .../rolling/RollingAppenderOnStartupTest.java      |  100 +
 .../appender/rolling/RollingAppenderSizeTest.java  |   69 +-
 ...ingRandomAccessFileManagerHeaderFooterTest.java |    7 +-
 .../RollingRandomAccessFileManagerTest.java        |   15 +-
 .../appender/rolling/action/CountingCondition.java |   62 +
 .../appender/rolling/action/DeleteActionTest.java  |  119 +
 .../rolling/action/DeletingVisitorTest.java        |  135 +
 .../rolling/action/DummyFileAttributes.java        |   86 +
 .../core/appender/rolling/action/DurationTest.java |  149 +
 .../appender/rolling/action/FixedCondition.java    |   44 +
 .../rolling/action/IfAccumulatedFileCountTest.java |   75 +
 .../rolling/action/IfAccumulatedFileSizeTest.java  |  130 +
 .../core/appender/rolling/action/IfAllTest.java    |   54 +
 .../core/appender/rolling/action/IfAnyTest.java    |   52 +
 .../appender/rolling/action/IfFileNameTest.java    |  131 +
 .../rolling/action/IfLastModifiedTest.java         |   97 +
 .../core/appender/rolling/action/IfNotTest.java    |   52 +
 .../action/PathSortByModificationTimeTest.java     |   93 +
 .../rolling/action/ScriptConditionTest.java        |  130 +
 .../rolling/action/SortingVisitorTest.java         |   94 +
 .../appender/routing/JsonRoutingAppender2Test.java |   40 +-
 .../appender/routing/JsonRoutingAppenderTest.java  |   40 +-
 .../routing/PropertiesRoutingAppenderTest.java     |    1 +
 .../core/appender/routing/RoutingAppenderTest.java |    1 +
 .../routing/RoutingAppenderWithJndiTest.java       |    4 +-
 .../routing/RoutingAppenderWithPurgingTest.java    |  114 +
 .../routing/RoutingDefaultAppenderTest.java        |    3 +-
 ...AsyncLoggerContextSelectorInitialStateTest.java |   30 +
 .../core/async/AsyncLoggerContextSelectorTest.java |   14 +-
 .../log4j/core/async/AsyncLoggerLocationTest.java  |    6 +-
 .../logging/log4j/core/async/AsyncLoggerTest.java  |   20 +-
 .../log4j/core/async/AsyncLoggerTestNanoTime.java  |   22 +-
 .../core/async/AsyncLoggerThreadContextTest.java   |    2 +-
 .../async/AsyncLoggerThreadNameStrategyTest.java   |   24 +-
 .../async/AsyncLoggerTimestampMessageTest.java     |   17 +-
 .../async/AsyncLoggersWithAsyncAppenderTest.java   |   37 +-
 .../AsyncLoggersWithAsyncLoggerConfigTest.java     |   37 +-
 .../async/AsyncQueueFullPolicyFactoryTest.java     |  114 +
 .../async/DefaultAsyncQueueFullPolicyTest.java     |   50 +
 .../async/DiscardingAsyncQueueFullPolicyTest.java  |  117 +
 .../log4j/core/async/RingBufferLogEventTest.java   |   10 +-
 .../log4j/core/async/perftest/IPerfTestRunner.java |    6 +-
 .../log4j/core/async/perftest/IdleStrategy.java    |   37 +
 .../log4j/core/async/perftest/MtPerfTest.java      |  112 -
 .../core/async/perftest/MultiThreadPerfTest.java   |  112 +
 .../core/async/perftest/NoOpIdleStrategy.java      |   37 +
 .../log4j/core/async/perftest/PerfTest.java        |   13 +-
 .../log4j/core/async/perftest/PerfTestDriver.java  |  215 +-
 .../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     |   32 +
 .../log4j/core/config/AbstractLog4j2_1100Test.java |  136 +-
 .../core/config/AppenderControlArraySetTest.java   |  191 +
 .../core/config/CompositeConfigurationTest.java    |  176 +
 .../log4j/core/config/ConfigurationTest.java       |   14 +-
 .../log4j/core/config/ConfiguratorTest.java        |   94 +-
 .../log4j/core/config/CustomConfigurationTest.java |    2 +-
 .../log4j/core/config/MissingRootLoggerTest.java   |    4 +-
 .../core/config/ReconfigurationDeadlockTest.java   |    2 +-
 .../log4j/core/config/TestConfigurator.java        |  104 +-
 .../logging/log4j/core/config/XIncludeTest.java    |   11 +-
 .../config/builder/ConfigurationAssemblerTest.java |   14 +-
 .../config/builder/CustomConfigurationFactory.java |    9 +-
 .../config/plugins/convert/TypeConvertersTest.java |    9 +-
 .../core/config/plugins/processor/FakePlugin.java  |    6 +-
 .../plugins/processor/PluginProcessorTest.java     |    6 +-
 .../plugins/util/PluginManagerPackagesTest.java    |    2 +-
 .../PropertiesConfigurationRootLoggerOnlyTest.java |   60 +
 .../properties/PropertiesConfigurationTest.java    |   22 +-
 .../properties/RollingFilePropertiesTest.java      |   23 +-
 .../log4j/core/filter/AbstractFilterableTest.java  |  281 +
 .../core/filter/AbstractScriptFilterTest.java      |   74 +
 .../DynamicThresholdFilterSerializationTest.java   |   47 -
 .../core/filter/DynamicThresholdFilterTest.java    |    4 +-
 .../log4j/core/filter/LevelRangeFilterTest.java    |    4 +-
 .../logging/log4j/core/filter/MapFilterTest.java   |   23 +-
 .../log4j/core/filter/MarkerFilterTest.java        |    6 +-
 .../logging/log4j/core/filter/RegexFilterTest.java |   11 +-
 .../filter/ScriptFileFilterPropertiesTest.java     |   37 +
 .../log4j/core/filter/ScriptFileFilterTest.java    |   37 +
 .../log4j/core/filter/ScriptFilterTest.java        |   37 +
 .../log4j/core/filter/ScriptRefFilterTest.java     |   37 +
 .../core/filter/StructuredDataFilterTest.java      |   15 +-
 .../core/filter/ThreadContextMapFilterTest.java    |   16 +-
 .../log4j/core/filter/ThresholdFilterTest.java     |    4 +-
 .../logging/log4j/core/filter/TimeFilterTest.java  |    2 +-
 .../log4j/core/impl/Log4jLogEventNanoTimeTest.java |   16 +-
 .../logging/log4j/core/impl/Log4jLogEventTest.java |  122 +-
 .../log4j/core/impl/MutableLogEventTest.java       |  278 +
 .../core/impl/ReusableLogEventFactoryTest.java     |   99 +
 .../log4j/core/impl/ThrowableProxyTest.java        |   19 +-
 .../log4j/core/jackson/LevelMixInJsonTest.java     |   29 +
 .../logging/log4j/core/jackson/LevelMixInTest.java |   13 +-
 .../log4j/core/jackson/LevelMixInXmlTest.java      |   32 +
 .../log4j/core/jackson/LevelMixInYamlTest.java     |   29 +
 .../core/jackson/StackTraceElementMixInTest.java   |    8 +-
 .../log4j/core/layout/CsvLogEventLayoutTest.java   |  306 +-
 .../layout/CsvParameterLayoutAllAsyncTest.java     |   69 +
 .../log4j/core/layout/CsvParameterLayoutTest.java  |  304 +-
 .../logging/log4j/core/layout/GelfLayoutTest.java  |  104 +-
 .../logging/log4j/core/layout/HtmlLayoutTest.java  |    2 +-
 .../logging/log4j/core/layout/JsonLayoutTest.java  |   61 +-
 .../layout/PatternLayoutMainMapLookupTest.java     |  127 +-
 .../log4j/core/layout/PatternLayoutTest.java       |  361 +-
 .../log4j/core/layout/PatternSelectorTest.java     |   65 +
 .../log4j/core/layout/Rfc5424LayoutTest.java       |    2 +-
 .../log4j/core/layout/SerializedLayoutTest.java    |    2 +-
 .../core/layout/SpyByteBufferDestination.java      |   63 +
 .../core/layout/StringBuilderEncoderTest.java      |  277 +
 .../log4j/core/layout/SyslogLayoutTest.java        |    2 +-
 .../logging/log4j/core/layout/XmlLayoutTest.java   |    2 +-
 .../logging/log4j/core/layout/YamlLayoutTest.java  |  284 +
 .../logging/log4j/core/lookup/JndiLookupTest.java  |   18 +
 .../logging/log4j/core/lookup/Log4jLookupTest.java |   43 +-
 .../core/lookup/Log4jLookupWithSpacesTest.java     |   46 +-
 .../logging/log4j/core/lookup/MapLookupTest.java   |   25 +
 .../core/net/server/AbstractSocketServerTest.java  |   44 +-
 .../core/net/server/SslXmlSocketServerTest.java    |    7 +-
 .../core/net/server/TcpJsonSocketServerTest.java   |    3 +-
 .../net/server/TcpSerializedSocketServerTest.java  |    3 +-
 .../core/net/server/TcpXmlSocketServerTest.java    |    3 +-
 .../log4j/core/net/server/ThreadIdFilter.java      |   40 +
 .../log4j/core/net/server/ThreadNameFilter.java    |   39 +
 .../core/net/server/ThreadPriorityFilter.java      |   40 +
 .../core/net/server/UdpJsonSocketServerTest.java   |    3 +-
 .../net/server/UdpSerializedSocketServerTest.java  |    5 +-
 .../core/net/server/UdpXmlSocketServerTest.java    |    3 +-
 .../log4j/core/net/ssl/SslConfigurationTest.java   |   32 +-
 .../core/pattern/DatePatternConverterTest.java     |   93 +-
 .../EqualsIgnoreCaseReplacementConverterTest.java  |   63 +
 .../pattern/EqualsReplacementConverterTest.java    |  108 +
 .../core/pattern/MarkerPatternConverterTest.java   |    3 +-
 .../MarkerSimpleNamePatternConverterTest.java      |   47 +
 .../log4j/core/pattern/MaxLengthConverterTest.java |   73 +
 .../core/pattern/MessagePatternConverterTest.java  |    8 +-
 .../log4j/core/pattern/NameAbbreviatorTest.java    |   14 +-
 .../log4j/core/pattern/PatternParserTest.java      |  115 +-
 .../core/pattern/ThreadIdPatternConverterTest.java |   39 +
 .../pattern/ThreadNamePatternConverterTest.java    |   39 +
 .../ThreadPriorityPatternConverterTest.java        |   39 +
 .../VariablesNotEmptyReplacementConverterTest.java |   78 +
 .../core/tools/GenerateExtendedLoggerTest.java     |   29 +-
 .../apache/logging/log4j/core/util/Compare.java    |  139 -
 .../log4j/core/util/CronExpressionTest.java        |   67 +
 .../core/util/KeyValuePairSerializationTest.java   |   39 -
 .../log4j/core/util/NanoClockFactoryTest.java      |   65 -
 .../logging/log4j/core/util/NetUtilsTest.java      |    3 +-
 .../log4j/core/util/PropertiesUtilTest.java        |   42 -
 .../logging/log4j/core/util/ThrowablesTest.java    |   19 +
 .../log4j/core/util/UnexpectedFormatException.java |    6 +-
 .../logging/log4j/core/util/WatchManagerTest.java  |   92 +
 .../core/util/datetime/FixedDateFormatTest.java    |   23 +-
 .../org/apache/logging/log4j/junit/CleanFiles.java |   32 +-
 .../logging/log4j/junit/LoggerContextRule.java     |  141 +-
 .../apache/logging/log4j/junit/package-info.java   |    6 +-
 .../MutableLogEventWithReusableParamMsgTest.java   |   53 +
 .../logging/log4j/test/AvailablePortFinder.java    |    6 +-
 .../log4j/test/appender/AlwaysFailAppender.java    |   13 +-
 .../log4j/test/appender/BlockingAppender.java      |   61 +
 .../log4j/test/appender/DeadlockAppender.java      |   11 +-
 .../log4j/test/appender/EncodingListAppender.java  |   80 +
 .../log4j/test/appender/FailOnceAppender.java      |   13 +-
 .../log4j/test/appender/InMemoryAppender.java      |    2 -
 .../logging/log4j/test/appender/ListAppender.java  |   94 +-
 .../log4j/test/appender/UsesLoggingAppender.java   |   22 +-
 .../logging/log4j/test/layout/BasicLayout.java     |    8 +-
 .../src/test/resources/JeroMqAppenderTest.xml      |    5 +-
 .../resources/JsonCompleteFileAppenderTest.xml     |    4 +-
 .../src/test/resources/KafkaAppenderTest.xml       |    8 +
 .../test/resources/LOG4J2-1100/log4j2-good.yaml    |    2 +-
 log4j-core/src/test/resources/LOG4J2-739.xml       |    2 +-
 log4j-core/src/test/resources/LOG4J2-807.xml       |    2 +-
 ...mAccessFileAppenderLocationPropsTest.properties |   35 +
 .../src/test/resources/csvParamsMixedAsync.xml     |   13 +
 .../{log4j-list.xml => csvParamsSync.xml}          |    0
 log4j-core/src/test/resources/gcFreeLogging.xml    |   60 +
 .../test/resources/gcFreeMixedSyncAsyncLogging.xml |   71 +
 .../src/test/resources/log4j-asynch-queue-full.xml |   38 +
 .../resources/log4j-asynch-shutdownTimeout.xml     |   37 +
 .../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 +
 .../src/test/resources/log4j-comp-properties.xml   |   34 +
 .../test/resources/log4j-comp-reconfig.properties  |   59 +
 .../src/test/resources/log4j-comp-reconfig.xml     |   39 +
 .../src/test/resources/log4j-customLevels.xml      |    2 +-
 .../test/resources/log4j-customLevelsOverride.xml  |    2 +-
 .../resources/log4j-customLevelsWithFilters.xml    |    2 +-
 log4j-core/src/test/resources/log4j-filetest.xml   |    2 +-
 .../src/test/resources/log4j-marker-lookup.yaml    |    2 +-
 .../src/test/resources/log4j-patternSelector.xml   |   80 +
 .../src/test/resources/log4j-rolling-cron.xml      |   54 +
 .../src/test/resources/log4j-rolling-cron2.xml     |   54 +
 ...g4j-rolling-with-custom-delete-accum-count1.xml |   49 +
 ...g4j-rolling-with-custom-delete-accum-count2.xml |   49 +
 ...log4j-rolling-with-custom-delete-accum-size.xml |   48 +
 .../log4j-rolling-with-custom-delete-maxdepth.xml  |   47 +
 .../log4j-rolling-with-custom-delete-nested.xml    |   51 +
 ...j-rolling-with-custom-delete-script-fri13th.xml |   76 +
 .../log4j-rolling-with-custom-delete-script.xml    |   76 +
 ...j-rolling-with-custom-delete-unconditional1.xml |   46 +
 ...j-rolling-with-custom-delete-unconditional2.xml |   47 +
 ...j-rolling-with-custom-delete-unconditional3.xml |   47 +
 .../resources/log4j-rolling-with-custom-delete.xml |   47 +
 log4j-core/src/test/resources/log4j-rolling-xy.xml |   59 -
 log4j-core/src/test/resources/log4j-rolling-xz.xml |   59 +
 .../src/test/resources/log4j-rolling.properties    |   24 +-
 .../src/test/resources/log4j-routing-purge.xml     |   81 +
 .../src/test/resources/log4j-routing.properties    |    9 -
 .../src/test/resources/log4j-script-filters.xml    |   60 +
 .../resources/log4j-scriptFile-filters.properties  |   55 +
 .../test/resources/log4j-scriptFile-filters.xml    |   43 +
 .../src/test/resources/log4j-scriptRef-filters.xml |   47 +
 .../src/test/resources/log4j-test1.properties      |   58 +
 .../src/test/resources/log4j-test2.properties      |   59 +
 log4j-core/src/test/resources/log4j-test4.xml      |   36 +
 log4j-core/src/test/resources/log4j2-962.xml       |    2 +-
 .../log4j2-properties-root-only.properties         |   32 +
 .../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-core/src/test/resources/perf9MMapNoLoc.xml   |    2 +-
 log4j-core/src/test/resources/rollover-test.xml    |    2 +-
 .../src/test/resources/scripts/filter.groovy       |    6 +
 log4j-core/src/test/resources/scripts/filter.js    |    7 +
 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 +
 .../flume/appender/FlumePersistentManager.java     |   16 +-
 log4j-flume-ng/src/site/xdoc/index.xml.vm          |    1 +
 .../log4j/flume/appender/FlumeAppenderTest.java    |    2 +-
 .../flume/appender/FlumeEmbeddedAppenderTest.java  |   10 +-
 .../src/test/resources/default_embedded.xml        |    4 +-
 log4j-flume-ng/src/test/resources/embedded.xml     |    4 +-
 log4j-iostreams/pom.xml                            |    2 +-
 .../org/apache/logging/log4j/io/IoBuilder.java     |   12 +-
 log4j-iostreams/src/site/xdoc/index.xml            |    1 +
 .../log4j/io/AbstractLoggerOutputStreamTest.java   |   15 +-
 .../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 +-
 .../apache/logging/log4j/jul/ApiLoggerAdapter.java |   80 +-
 .../logging/log4j/jul/CoreLoggerAdapter.java       |   80 +-
 .../logging/log4j/jul/DefaultLevelConverter.java   |    4 +-
 log4j-jul/src/site/xdoc/index.xml                  |    1 +
 .../logging/log4j/jul/AbstractLoggerTest.java      |  124 +-
 .../apache/logging/log4j/jul/ApiLoggerTest.java    |   16 +-
 .../jul/BracketInNotInterpolatedMessageTest.java   |   56 +
 .../apache/logging/log4j/jul/CoreLoggerTest.java   |    8 +
 log4j-jul/src/test/resources/log4j2-test.xml       |    4 +
 log4j-liquibase/pom.xml                            |    2 +-
 log4j-liquibase/src/site/xdoc/index.xml            |    3 +-
 log4j-nosql/pom.xml                                |    2 +-
 .../nosql/appender/AbstractNoSqlConnection.java    |   48 +
 .../log4j/nosql/appender/NoSqlAppender.java        |    1 -
 .../log4j/nosql/appender/NoSqlDatabaseManager.java |    2 +
 .../nosql/appender/couchdb/CouchDbConnection.java  |  145 +-
 .../nosql/appender/mongodb/MongoDbConnection.java  |  215 +-
 .../nosql/appender/mongodb/MongoDbProvider.java    |   85 +-
 log4j-nosql/src/site/xdoc/index.xml.vm             |    1 +
 .../log4j/nosql/appender/MongoDbAuthTest.java      |   37 +
 .../nosql/appender/NoSqlDatabaseManagerTest.java   |   32 +-
 .../src/test/resources/log4j2-mongodb-auth.xml     |   30 +
 log4j-perf/pom.xml                                 |    2 +-
 .../log4j/message/ParameterFormatterBenchmark.java |  186 +
 ...bstractStringLayoutStringEncodingBenchmark.java |  266 +
 .../perf/jmh/AsyncAppenderLog4j1Benchmark.java     |  119 +-
 .../jmh/AsyncAppenderLog4j1LocationBenchmark.java  |   71 +
 .../perf/jmh/AsyncAppenderLog4j2Benchmark.java     |  124 +-
 .../jmh/AsyncAppenderLog4j2LocationBenchmark.java  |   75 +
 .../perf/jmh/AsyncAppenderLogbackBenchmark.java    |  122 +-
 .../jmh/AsyncAppenderLogbackLocationBenchmark.java |   77 +
 .../log4j/perf/jmh/AsyncLoggersBenchmark.java      |  141 +-
 .../perf/jmh/AsyncLoggersLocationBenchmark.java    |   84 +
 .../log4j/perf/jmh/CollectionsBenchmark.java       |   24 +-
 .../log4j/perf/jmh/FileAppenderBenchmark.java      |  105 +-
 .../perf/jmh/FileAppenderParamsBenchmark.java      |  170 +
 .../log4j/perf/jmh/GelfLayoutBenchmark.java        |  111 +
 .../log4j/perf/jmh/JdbcAppenderBenchmark.java      |    5 +-
 .../jmh/Log4j2AppenderComparisonBenchmark.java     |  221 +
 .../log4j/perf/jmh/LoggerConfigBenchmark.java      |   10 +-
 .../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 +-
 .../jmh/ParameterizedMessageInliningBenchmark.java |  332 +
 .../log4j/perf/jmh/PatternLayoutBenchmark.java     |  191 +-
 .../perf/jmh/PatternLayoutComparisonBenchmark.java |    4 +-
 .../logging/log4j/perf/jmh/SimpleBenchmark.java    |   17 +
 .../log4j/perf/jmh/StringEncodingBenchmark.java    |  242 +-
 .../log4j/perf/jmh/TextEncoderHelperBenchmark.java |  240 +
 .../ThreadLocalVsConcurrentHashMapBenchmark.java   |   94 +
 .../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java |  217 +
 .../perf/jmh/ThreadsafeDateFormatBenchmark.java    |    4 +-
 .../logging/log4j/perf/jmh/VarargsBenchmark.java   |   17 +-
 .../logging/log4j/perf/nogc/AbstractLogger.java    |   46 +
 .../logging/log4j/perf/nogc/ClassicLogger.java     |   39 +
 .../logging/log4j/perf/nogc/DemoAppender.java      |   71 +
 .../apache/logging/log4j/perf/nogc/NoGcLayout.java |  134 +
 .../apache/logging/log4j/perf/nogc/NoGcLogger.java |   39 +
 .../logging/log4j/perf/nogc/NoGcMessage.java       |  106 +
 .../perf/nogc/NoGcMessagePatternConverter.java     |   81 +
 .../log4j/perf/nogc/ParameterizedMessage.java      |  757 ++
 .../org/apache/logging/log4j/perf/nogc/Test.java   |  114 +
 .../log4j/perf/util/BenchmarkMessageParams.java    |   42 +
 .../logging/log4j/perf/util/DemoAppender.java      |   71 +
 .../logging/log4j/perf/util/NoOpJULHandler.java    |   41 +
 .../logging/log4j/perf/util/NoOpLog4jAppender.java |   44 +
 .../log4j/perf/util/NoOpLogbackAppender.java       |   33 +
 .../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 +-
 .../log4j/configuration/CustomConfiguration.java   |    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  |   11 +-
 .../logging/log4j/lookup/CustomMapMessage.java     |    3 +-
 .../logging/log4j/lookup/MapMessageLookup.java     |   16 +-
 .../apache/logging/log4j/CustomPropertiesTest.java |    8 +-
 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    |   58 +
 log4j-taglib/pom.xml                               |    2 +-
 .../log4j/taglib/Log4jTaglibLoggerContext.java     |   39 +-
 log4j-taglib/src/site/xdoc/index.xml               |    3 +-
 .../logging/log4j/taglib/CatchingTagTest.java      |   49 +-
 .../apache/logging/log4j/taglib/DebugTagTest.java  |   32 -
 .../apache/logging/log4j/taglib/DumpTagTest.java   |  243 +-
 .../apache/logging/log4j/taglib/EnterTagTest.java  |   79 +
 .../apache/logging/log4j/taglib/EntryTagTest.java  |   99 -
 .../apache/logging/log4j/taglib/ErrorTagTest.java  |   32 -
 .../apache/logging/log4j/taglib/ExitTagTest.java   |   42 +-
 .../apache/logging/log4j/taglib/FatalTagTest.java  |   32 -
 .../logging/log4j/taglib/IfEnabledTagTest.java     |   26 +-
 .../apache/logging/log4j/taglib/InfoTagTest.java   |   32 -
 .../log4j/taglib/LoggingMessageTagSupportTest.java |   38 +-
 .../logging/log4j/taglib/SetLoggerTagTest.java     |   23 +-
 .../apache/logging/log4j/taglib/TagLevelTest.java  |   57 +
 .../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   |   39 +-
 .../logging/slf4j/SLF4JLoggerContextFactory.java   |  125 +-
 log4j-to-slf4j/src/site/xdoc/index.xml             |    7 +-
 .../logging/slf4j/CallerInformationTest.java       |  130 +-
 .../apache/logging/slf4j/InitialLoggerContext.java |   71 -
 .../apache/logging/slf4j/LoggerContextRule.java    |   72 +
 .../java/org/apache/logging/slf4j/LoggerTest.java  |   36 +-
 log4j-web/pom.xml                                  |    2 +-
 .../log4j/web/Log4jServletContextListener.java     |    3 +-
 .../logging/log4j/web/Log4jWebInitializerImpl.java |   25 +-
 .../log4j/web/ServletRequestThreadContext.java     |   45 +
 .../log4j/web/appender/ServletAppender.java        |    6 +-
 log4j-web/src/site/xdoc/index.xml                  |   19 +-
 .../log4j/web/Log4jServletContextListenerTest.java |   11 -
 .../log4j/web/Log4jWebInitializerImplTest.java     |   74 +-
 .../resources/WEB-INF/classes/log4j-servlet.xml    |   64 +-
 pom.xml                                            |  122 +-
 src/changes/announcement.vm                        |   26 +-
 src/changes/changes.xml                            |  564 +-
 src/site/apt/download.apt.vm                       |   79 -
 src/site/custom/project-info-report.properties     |  333 -
 src/site/pdf.xml                                   |   58 -
 src/site/resources/css/bootstrap.css               | 5893 -------------
 src/site/resources/css/bootstrap.min.css           |    9 -
 src/site/resources/css/site.css                    |   95 -
 src/site/resources/images/Log4jClasses.jpg         |  Bin 31443 -> 0 bytes
 .../resources/images/async-average-latency.png     |  Bin 69022 -> 0 bytes
 .../images/async-latency-histogram-64-threads.png  |  Bin 68474 -> 0 bytes
 .../images/async-max-latency-99.99pct.png          |  Bin 76617 -> 0 bytes
 .../images/async-throughput-comparison.png         |  Bin 66734 -> 0 bytes
 .../resources/images/async-vs-sync-throughput.png  |  Bin 60459 -> 0 bytes
 src/site/resources/images/collapsed.gif            |  Bin 820 -> 0 bytes
 src/site/resources/images/expanded.gif             |  Bin 52 -> 0 bytes
 .../resources/images/jmx-jconsole-editconfig.png   |  Bin 74904 -> 0 bytes
 src/site/resources/images/jmx-jconsole-mbeans.png  |  Bin 61770 -> 0 bytes
 .../resources/images/jmx-jconsole-statuslogger.png |  Bin 90738 -> 0 bytes
 .../resources/images/jmx-standalone-editconfig.png |  Bin 66682 -> 0 bytes
 .../images/jmx-standalone-statuslogger.png         |  Bin 83934 -> 0 bytes
 src/site/resources/images/logo.jpg                 |  Bin 14818 -> 0 bytes
 src/site/resources/images/ls-logo.jpg              |  Bin 41915 -> 0 bytes
 src/site/resources/images/maven-feather.png        |  Bin 3330 -> 0 bytes
 src/site/resources/images/whichjar-2.1.png         |  Bin 68404 -> 0 bytes
 src/site/resources/images/whichjar-slf4j-2.1.png   |  Bin 26700 -> 0 bytes
 src/site/resources/images/whichjar-slf4j.png       |  Bin 26809 -> 0 bytes
 src/site/resources/images/whichjar.png             |  Bin 69068 -> 0 bytes
 src/site/resources/images/whichjar.xlsx            |  Bin 14687 -> 0 bytes
 .../resources/img/glyphicons-halflings-white.png   |  Bin 8777 -> 0 bytes
 src/site/resources/img/glyphicons-halflings.png    |  Bin 12799 -> 0 bytes
 src/site/resources/js/bootstrap.js                 | 2027 -----
 src/site/resources/js/bootstrap.min.js             |    6 -
 src/site/resources/js/jquery.js                    | 9266 --------------------
 src/site/resources/js/jquery.min.js                |    4 -
 src/site/resources/js/prettify.js                  | 1477 ----
 src/site/resources/js/prettify.min.js              |   41 -
 src/site/resources/js/site.js                      |  106 -
 src/site/resources/pdf-config.xml                  |   47 -
 src/site/site.vm                                   |  515 --
 src/site/site.xml                                  |  242 -
 src/site/xdoc/articles.xml                         |  121 -
 src/site/xdoc/build.xml.vm                         |   71 -
 src/site/xdoc/changelog.xml                        |   45 -
 src/site/xdoc/faq.xml                              |  250 -
 src/site/xdoc/guidelines.xml                       |  361 -
 src/site/xdoc/index.xml                            |  126 -
 src/site/xdoc/javadoc.xml                          |  109 -
 src/site/xdoc/javastyle.xml                        |  805 --
 src/site/xdoc/manual/api.xml                       |  164 -
 src/site/xdoc/manual/appenders.xml                 | 3454 --------
 src/site/xdoc/manual/architecture.xml              |  737 --
 src/site/xdoc/manual/async.xml                     |  962 --
 src/site/xdoc/manual/configuration.xml.vm          | 1725 ----
 src/site/xdoc/manual/customconfig.xml              |  284 -
 src/site/xdoc/manual/customloglevels.xml.vm        |  339 -
 src/site/xdoc/manual/eventlogging.xml              |  145 -
 src/site/xdoc/manual/extending.xml                 |  401 -
 src/site/xdoc/manual/filters.xml                   |  746 --
 src/site/xdoc/manual/flowtracing.xml               |  249 -
 src/site/xdoc/manual/index.xml                     |  144 -
 src/site/xdoc/manual/jmx.xml.vm                    |  189 -
 src/site/xdoc/manual/layouts.xml.vm                | 1711 ----
 src/site/xdoc/manual/logsep.xml                    |  123 -
 src/site/xdoc/manual/lookups.xml                   |  493 --
 src/site/xdoc/manual/markers.xml                   |  104 -
 src/site/xdoc/manual/messages.xml                  |  270 -
 src/site/xdoc/manual/migration.xml                 |  322 -
 src/site/xdoc/manual/plugins.xml                   |  228 -
 src/site/xdoc/manual/thread-context.xml            |  139 -
 src/site/xdoc/manual/webapp.xml                    |  425 -
 src/site/xdoc/maven-artifacts.xml.vm               |  381 -
 src/site/xdoc/performance.xml                      |  258 -
 src/site/xdoc/runtime-dependencies.xml             |  224 -
 1082 files changed, 59154 insertions(+), 51901 deletions(-)
 create mode 100644 README.md
 create mode 100644 debian/patches/02-jackson-compatibility.patch
 create mode 100644 debian/patches/03-mongodb-compatibility.patch
 create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationFactory.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/LogWithMDCTest.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/LogWithRouteTest.java
 create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-console-EnhancedPatternLayout.properties
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-console-HtmlLayout.properties
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-console-PatternLayout.properties
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-console-SimpleLayout.properties
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-console-TTCCLayout.properties
 create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-console-XmlLayout.properties
 create mode 100644 log4j-1.2-api/src/test/resources/log-RouteWithMDC.xml
 create mode 100644 log4j-1.2-api/src/test/resources/logWithMDC.xml
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/DefaultFlowMessageFactory.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/EntryMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ExitMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/FlowMessageFactory.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterFormatter.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ParameterizedNoReferenceMessageFactory.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableMessageFactory.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableObjectMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableParameterizedMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/ReusableSimpleMessage.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/message/SimpleMessageFactory.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerContextKey.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/LoggerRegistry.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/MessageFactory2Adapter.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/Terminable.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/LowLevelLogUtil.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/PerformanceSensitive.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilderFormattable.java
 create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/Unbox.java
 delete mode 100644 log4j-api/src/test/java/org/apache/log4j/util/SerialUtil.java
 delete mode 100644 log4j-api/src/test/java/org/apache/log4j/util/StringsTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/CloseableThreadContextTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/LoggerSupplierTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/BundleTestInfo.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/Mutable.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/OsgiRule.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/SerialUtil.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/JsonMessage.java
 delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/Mutable.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/ParameterFormatterTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableObjectMessageTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableParameterizedMessageTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableSimpleMessageTest.java
 delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/osgi/BundleTestInfo.java
 delete mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/osgi/OsgiRule.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/util/PropertiesUtilTest.java
 create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/util/UnboxTest.java
 create mode 100644 log4j-api/src/test/resources/PropertiesUtilTest.properties
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/StringLayout.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractWriterAppender.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/CountingNoOpAppender.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamAppender.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterAppender.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/WriterManager.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/JeroMqManager.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/jeromq/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/mom/kafka/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/CronTriggeringPolicy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileSize.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteAction.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitor.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/Duration.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCount.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSize.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAll.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfAny.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileName.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModified.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/IfNot.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathCondition.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTime.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathSorter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PathWithAttributes.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptCondition.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitor.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/PurgePolicy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDefaultExceptionHandler.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDelegate.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigDisruptor.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDefaultExceptionHandler.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerDisruptor.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactory.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/DefaultAsyncQueueFullPolicy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/DiscardingAsyncQueueFullPolicy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/DisruptorUtil.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/EventRoute.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/ThreadNameCachingStrategy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControlArraySet.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationAware.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationMonitor.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationScheduler.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfiguratonFileWatcher.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/CronScheduledFuture.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/Scheduled.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/ScriptsPlugin.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/FilterableComponentBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/LoggableComponentBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ScriptComponentBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/ScriptFileComponentBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/api/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultScriptComponentBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultScriptFileComponentBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/CompositeConfiguration.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/DefaultMergeStrategy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/MergeStrategy.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/composite/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationBuilder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/config/properties/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/filter/ScriptFilter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactory.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jYamlModule.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jYamlObjectMapper.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LogEventJsonMixIn.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ByteBufferDestination.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/Encoder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LockingStringBuilderEncoder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/MarkerPatternSelector.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternMatch.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternSelector.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/ScriptPatternSelector.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/layout/YamlLayout.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/AbstractConfigurationAwareLookup.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/net/mom/jms/AbstractJmsReceiver.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MaxLengthConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadIdPatternConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadNamePatternConverter.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPatternConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThreadPriorityPatternConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/script/AbstractScript.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/script/Script.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptManager.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptRef.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/script/package-info.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/CloseShieldOutputStream.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/CloseShieldWriter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/CronExpression.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExtensionLanguageMapping.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/IOUtils.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/JsonUtils.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThread.java
 delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/NanoClockFactory.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/ObjectArrayIterator.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringBuilderWriter.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/StringEncoder.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
 create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/MarkerMixInJsonTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/MarkerMixInXmlTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/MarkerMixInYamlTest.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeAsynchronousLoggingTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeLoggingTestUtil.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeMixedSyncAyncLoggingTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/GcFreeSynchronousLoggingTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/PatternSelectorTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/PropertiesFileConfigTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderQueueFullPolicyTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderShutdownTimeoutTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConfigurationTestUtils.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/InMemoryAppenderTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/WriterAppenderTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/FileSizeTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCustomDeleteActionTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount1Test.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedCount2Test.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteAccumulatedSizeTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteMaxDepthTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteNestedTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptFri13thTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDeleteScriptTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderNoUnconditionalDeleteTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/CountingCondition.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DeleteActionTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DeletingVisitorTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DummyFileAttributes.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/DurationTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/FixedCondition.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileCountTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAccumulatedFileSizeTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAllTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfAnyTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfFileNameTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfLastModifiedTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/IfNotTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/PathSortByModificationTimeTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/ScriptConditionTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/action/SortingVisitorTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelectorInitialStateTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncQueueFullPolicyFactoryTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/DefaultAsyncQueueFullPolicyTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/DiscardingAsyncQueueFullPolicyTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/IdleStrategy.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/MtPerfTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/MultiThreadPerfTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/NoOpIdleStrategy.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/ResponseTimeTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/SimplePerfTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/YieldIdleStrategy.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/AppenderControlArraySetTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/CompositeConfigurationTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/properties/PropertiesConfigurationRootLoggerOnlyTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterableTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractScriptFilterTest.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterSerializationTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ScriptFileFilterPropertiesTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ScriptFileFilterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ScriptFilterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ScriptRefFilterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ReusableLogEventFactoryTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInJsonTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInXmlTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/jackson/LevelMixInYamlTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/CsvParameterLayoutAllAsyncTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternSelectorTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SpyByteBufferDestination.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/StringBuilderEncoderTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/YamlLayoutTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadIdFilter.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadNameFilter.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/net/server/ThreadPriorityFilter.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsIgnoreCaseReplacementConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/EqualsReplacementConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MarkerSimpleNamePatternConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/MaxLengthConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThreadIdPatternConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThreadNamePatternConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThreadPriorityPatternConverterTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/VariablesNotEmptyReplacementConverterTest.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/util/Compare.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/util/CronExpressionTest.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/util/KeyValuePairSerializationTest.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/util/NanoClockFactoryTest.java
 delete mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/util/PropertiesUtilTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/util/WatchManagerTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/message/MutableLogEventWithReusableParamMsgTest.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/test/appender/BlockingAppender.java
 create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/test/appender/EncodingListAppender.java
 create mode 100644 log4j-core/src/test/resources/RollingRandomAccessFileAppenderLocationPropsTest.properties
 create mode 100644 log4j-core/src/test/resources/csvParamsMixedAsync.xml
 copy log4j-core/src/test/resources/{log4j-list.xml => csvParamsSync.xml} (100%)
 create mode 100644 log4j-core/src/test/resources/gcFreeLogging.xml
 create mode 100644 log4j-core/src/test/resources/gcFreeMixedSyncAsyncLogging.xml
 create mode 100644 log4j-core/src/test/resources/log4j-asynch-queue-full.xml
 create mode 100644 log4j-core/src/test/resources/log4j-asynch-shutdownTimeout.xml
 create mode 100644 log4j-core/src/test/resources/log4j-comp-appender.json
 create mode 100644 log4j-core/src/test/resources/log4j-comp-appender.xml
 create mode 100644 log4j-core/src/test/resources/log4j-comp-filter.json
 create mode 100644 log4j-core/src/test/resources/log4j-comp-filter.xml
 create mode 100644 log4j-core/src/test/resources/log4j-comp-logger.json
 create mode 100644 log4j-core/src/test/resources/log4j-comp-logger.xml
 create mode 100644 log4j-core/src/test/resources/log4j-comp-properties.json
 create mode 100644 log4j-core/src/test/resources/log4j-comp-properties.xml
 create mode 100644 log4j-core/src/test/resources/log4j-comp-reconfig.properties
 create mode 100644 log4j-core/src/test/resources/log4j-comp-reconfig.xml
 create mode 100644 log4j-core/src/test/resources/log4j-patternSelector.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-cron.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-cron2.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count1.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-count2.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-accum-size.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-maxdepth.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-nested.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-script-fri13th.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-script.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional1.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional2.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete-unconditional3.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-with-custom-delete.xml
 delete mode 100644 log4j-core/src/test/resources/log4j-rolling-xy.xml
 create mode 100644 log4j-core/src/test/resources/log4j-rolling-xz.xml
 create mode 100644 log4j-core/src/test/resources/log4j-routing-purge.xml
 create mode 100644 log4j-core/src/test/resources/log4j-script-filters.xml
 create mode 100644 log4j-core/src/test/resources/log4j-scriptFile-filters.properties
 create mode 100644 log4j-core/src/test/resources/log4j-scriptFile-filters.xml
 create mode 100644 log4j-core/src/test/resources/log4j-scriptRef-filters.xml
 create mode 100644 log4j-core/src/test/resources/log4j-test1.properties
 create mode 100644 log4j-core/src/test/resources/log4j-test2.properties
 create mode 100644 log4j-core/src/test/resources/log4j-test4.xml
 create mode 100644 log4j-core/src/test/resources/log4j2-properties-root-only.properties
 create mode 100644 log4j-core/src/test/resources/perf-CountingNoOpAppender.xml
 create mode 100644 log4j-core/src/test/resources/perf/SimplePerfTest.bat
 create mode 100644 log4j-core/src/test/resources/perf/SimplePerfTest.sh
 create mode 100644 log4j-core/src/test/resources/perf/runResponseTm.sh
 create mode 100644 log4j-core/src/test/resources/scripts/filter.groovy
 create mode 100644 log4j-core/src/test/resources/scripts/filter.js
 create mode 100644 log4j-distribution/.gitignore
 create mode 100644 log4j-jul/src/test/java/org/apache/logging/log4j/jul/BracketInNotInterpolatedMessageTest.java
 create mode 100644 log4j-nosql/src/main/java/org/apache/logging/log4j/nosql/appender/AbstractNoSqlConnection.java
 create mode 100644 log4j-nosql/src/test/java/org/apache/logging/log4j/nosql/appender/MongoDbAuthTest.java
 create mode 100644 log4j-nosql/src/test/resources/log4j2-mongodb-auth.xml
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/message/ParameterFormatterBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AbstractStringLayoutStringEncodingBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j1LocationBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLog4j2LocationBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncAppenderLogbackLocationBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/AsyncLoggersLocationBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/FileAppenderParamsBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/GelfLayoutBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/Log4j2AppenderComparisonBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MDCFilterBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MarkerFilterBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/MemoryHandlerJULLocationBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ParameterizedMessageInliningBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/TextEncoderHelperBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsConcurrentHashMapBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/AbstractLogger.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ClassicLogger.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/DemoAppender.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLayout.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcLogger.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessagePatternConverter.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/ParameterizedMessage.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/Test.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/BenchmarkMessageParams.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/DemoAppender.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpJULHandler.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpLog4jAppender.java
 create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/util/NoOpLogbackAppender.java
 create mode 100644 log4j-perf/src/main/resources/log4j2-appenderComparison.xml
 create mode 100644 log4j-perf/src/main/resources/log4j2-markerFilter-perf.xml
 create mode 100644 log4j-perf/src/main/resources/log4j2-threadContextFilter-perf.xml
 create mode 100644 log4j-perf/src/main/resources/logback-markerFilter-perf.xml
 create mode 100644 log4j-perf/src/main/resources/logback-mdcFilter-perf.xml
 create mode 100644 log4j-perf/src/main/resources/perf-WithoutAnyAppender-location.xml
 create mode 100644 log4j-perf/src/main/resources/perf-WithoutAnyAppender.xml
 create mode 100644 log4j-perf/src/main/resources/perf-log4j12-async-location-noOpAppender.xml
 create mode 100644 log4j-perf/src/main/resources/perf-log4j12-async-noOpAppender.xml
 create mode 100644 log4j-perf/src/main/resources/perf-logback-async-location-noOpAppender.xml
 create mode 100644 log4j-perf/src/main/resources/perf-logback-async-noOpAppender.xml
 create mode 100644 log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml
 create mode 100644 log4j-perf/src/main/resources/perf5AsyncApndWithLoc-noOpAppender.xml
 create mode 100644 log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/DebugTagTest.java
 create mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EnterTagTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ErrorTagTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/FatalTagTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/InfoTagTest.java
 create mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/TagLevelTest.java
 create mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/TagUtilsLevelTest.java
 create mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/TagUtilsScopeTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/TagUtilsTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/TraceTagTest.java
 delete mode 100644 log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/WarnTagTest.java
 delete mode 100644 log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/InitialLoggerContext.java
 create mode 100644 log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerContextRule.java
 create mode 100644 log4j-web/src/main/java/org/apache/logging/log4j/web/ServletRequestThreadContext.java
 delete mode 100644 src/site/apt/download.apt.vm
 delete mode 100644 src/site/custom/project-info-report.properties
 delete mode 100644 src/site/pdf.xml
 delete mode 100644 src/site/resources/css/bootstrap.css
 delete mode 100644 src/site/resources/css/bootstrap.min.css
 delete mode 100644 src/site/resources/css/site.css
 delete mode 100755 src/site/resources/images/Log4jClasses.jpg
 delete mode 100644 src/site/resources/images/async-average-latency.png
 delete mode 100644 src/site/resources/images/async-latency-histogram-64-threads.png
 delete mode 100644 src/site/resources/images/async-max-latency-99.99pct.png
 delete mode 100644 src/site/resources/images/async-throughput-comparison.png
 delete mode 100644 src/site/resources/images/async-vs-sync-throughput.png
 delete mode 100644 src/site/resources/images/collapsed.gif
 delete mode 100644 src/site/resources/images/expanded.gif
 delete mode 100644 src/site/resources/images/jmx-jconsole-editconfig.png
 delete mode 100644 src/site/resources/images/jmx-jconsole-mbeans.png
 delete mode 100644 src/site/resources/images/jmx-jconsole-statuslogger.png
 delete mode 100644 src/site/resources/images/jmx-standalone-editconfig.png
 delete mode 100644 src/site/resources/images/jmx-standalone-statuslogger.png
 delete mode 100644 src/site/resources/images/logo.jpg
 delete mode 100755 src/site/resources/images/ls-logo.jpg
 delete mode 100644 src/site/resources/images/maven-feather.png
 delete mode 100644 src/site/resources/images/whichjar-2.1.png
 delete mode 100644 src/site/resources/images/whichjar-slf4j-2.1.png
 delete mode 100644 src/site/resources/images/whichjar-slf4j.png
 delete mode 100644 src/site/resources/images/whichjar.png
 delete mode 100644 src/site/resources/images/whichjar.xlsx
 delete mode 100644 src/site/resources/img/glyphicons-halflings-white.png
 delete mode 100644 src/site/resources/img/glyphicons-halflings.png
 delete mode 100644 src/site/resources/js/bootstrap.js
 delete mode 100644 src/site/resources/js/bootstrap.min.js
 delete mode 100644 src/site/resources/js/jquery.js
 delete mode 100644 src/site/resources/js/jquery.min.js
 delete mode 100644 src/site/resources/js/prettify.js
 delete mode 100644 src/site/resources/js/prettify.min.js
 delete mode 100644 src/site/resources/js/site.js
 delete mode 100644 src/site/resources/pdf-config.xml
 delete mode 100644 src/site/site.vm
 delete mode 100644 src/site/site.xml
 delete mode 100644 src/site/xdoc/articles.xml
 delete mode 100644 src/site/xdoc/build.xml.vm
 delete mode 100644 src/site/xdoc/changelog.xml
 delete mode 100644 src/site/xdoc/faq.xml
 delete mode 100644 src/site/xdoc/guidelines.xml
 delete mode 100644 src/site/xdoc/index.xml
 delete mode 100644 src/site/xdoc/javadoc.xml
 delete mode 100644 src/site/xdoc/javastyle.xml
 delete mode 100644 src/site/xdoc/manual/api.xml
 delete mode 100644 src/site/xdoc/manual/appenders.xml
 delete mode 100644 src/site/xdoc/manual/architecture.xml
 delete mode 100644 src/site/xdoc/manual/async.xml
 delete mode 100644 src/site/xdoc/manual/configuration.xml.vm
 delete mode 100644 src/site/xdoc/manual/customconfig.xml
 delete mode 100644 src/site/xdoc/manual/customloglevels.xml.vm
 delete mode 100644 src/site/xdoc/manual/eventlogging.xml
 delete mode 100644 src/site/xdoc/manual/extending.xml
 delete mode 100644 src/site/xdoc/manual/filters.xml
 delete mode 100644 src/site/xdoc/manual/flowtracing.xml
 delete mode 100644 src/site/xdoc/manual/index.xml
 delete mode 100644 src/site/xdoc/manual/jmx.xml.vm
 delete mode 100644 src/site/xdoc/manual/layouts.xml.vm
 delete mode 100644 src/site/xdoc/manual/logsep.xml
 delete mode 100644 src/site/xdoc/manual/lookups.xml
 delete mode 100644 src/site/xdoc/manual/markers.xml
 delete mode 100644 src/site/xdoc/manual/messages.xml
 delete mode 100644 src/site/xdoc/manual/migration.xml
 delete mode 100644 src/site/xdoc/manual/plugins.xml
 delete mode 100644 src/site/xdoc/manual/thread-context.xml
 delete mode 100644 src/site/xdoc/manual/webapp.xml
 delete mode 100644 src/site/xdoc/maven-artifacts.xml.vm
 delete mode 100644 src/site/xdoc/performance.xml
 delete mode 100644 src/site/xdoc/runtime-dependencies.xml

-- 
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