[apache-log4j2] branch master updated (e335a8f -> e8930be)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Oct 21 16:35:05 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 e335a8f Transition to the Servlet API 3.1
new 4a8522c Removed the IDE settings from the upstream tarball
adds 3c1cf1c New upstream version 2.7
new eb0e5c3 Merge tag 'upstream/2.7'
new 80a815d Refreshed the patches
new 19d62b1 Ignore the new log4j-api-scala modules
new 8f07393 New dependencies on libconversant-disruptor-java, libjcommander-java and libjctools-java
new 3a6c337 Ignore the new test dependency
new 2bd61b2 Switch to debhelper level 10
new e8930be Upload to unstable
The 8 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:
.gitignore | 14 +-
README.md | 8 +
RELEASE-NOTES.txt | 154 +-
debian/changelog | 10 +-
debian/compat | 2 +-
debian/control | 5 +-
debian/copyright | 1 +
debian/liblog4j2-java.poms | 2 +
debian/maven.ignoreRules | 1 +
debian/maven.rules | 1 +
debian/patches/01-disable-kafka-appender.patch | 2 +-
debian/rules | 3 +-
log4j-1.2-api/.gitignore | 5 -
log4j-1.2-api/pom.xml | 9 +-
.../src/main/java/org/apache/log4j/Layout.java | 4 +-
.../apache/log4j/config/InputStreamWrapper.java | 92 +
.../log4j/config/Log4j1ConfigurationConverter.java | 211 +
.../log4j/config/Log4j1ConfigurationFactory.java | 278 +-
.../log4j/config/Log4j1ConfigurationParser.java | 446 ++
.../org/apache/log4j/layout/Log4j1XmlLayout.java | 162 +
.../log4j/pattern/Log4j1MdcPatternConverter.java | 88 +
.../log4j/pattern/Log4j1NdcPatternConverter.java | 47 +-
.../apache/log4j/BasicConfigurationFactory.java | 13 +-
.../test/java/org/apache/log4j/CategoryTest.java | 3 +-
.../AbstractLog4j1ConfigurationConverterTest.java | 69 +
.../Log4j1ConfigurationConverterHadoopTest.java | 34 +-
.../Log4j1ConfigurationConverterSparkTest.java | 34 +-
.../config/Log4j1ConfigurationFactoryTest.java | 237 +-
.../apache/log4j/layout/Log4j1XmlLayoutTest.java | 84 +
.../pattern/Log4j1MdcPatternConverterTest.java | 79 +
.../pattern/Log4j1NdcPatternConverterTest.java | 74 +
.../src/main/resources/log4j.properties | 19 +
.../hadoop-common/src/main/conf/log4j.properties | 323 ++
.../src/test/resources/log4j.properties | 18 +
.../hadoop-kms/src/test/resources/log4j.properties | 31 +
.../src/main/resources/log4j.properties | 31 +
.../hadoop-nfs/src/test/resources/log4j.properties | 18 +
.../src/test/resources/log4j.properties | 49 +
.../bkjournal/src/test/resources/log4j.properties | 55 +
.../src/test/resources/log4j.properties | 49 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../hadoop-aws/src/test/resources/log4j.properties | 23 +
.../src/test/resources/log4j.properties | 25 +
.../src/test/resources/log4j.properties | 42 +
.../src/main/sample-conf/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 37 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 63 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../src/test/resources/log4j.properties | 19 +
.../log4j-DailyRollingFileAppender.properties | 26 +
.../config-1.2/log4j-NullAppender.properties | 9 +
...log4j-RollingFileAppender-with-props.properties | 27 +
.../log4j-RollingFileAppender.properties | 22 +
.../log4j-console-EnhancedPatternLayout.properties | 3 +-
.../config-1.2/log4j-console-HtmlLayout.properties | 3 +-
.../log4j-console-PatternLayout.properties | 1 -
.../log4j-console-SimpleLayout.properties | 1 -
.../config-1.2/log4j-console-TTCCLayout.properties | 3 +-
.../config-1.2/log4j-console-XmlLayout.properties | 5 +-
...operties => log4j-file-SimpleLayout.properties} | 9 +-
.../log4j-system-properties-1.properties | 14 +
.../log4j-system-properties-2.properties | 15 +
.../resources/config-1.2/spark/R/log4j.properties | 28 +
.../src/test/resources/log4j.properties | 27 +
.../src/test/resources/log4j.properties | 24 +
.../spark/core/src/test/resources/log4j.properties | 36 +
.../flume-sink/src/test/resources/log4j.properties | 28 +
.../flume/src/test/resources/log4j.properties | 28 +
.../src/test/resources/log4j.properties | 27 +
.../kafka-0-10/src/test/resources/log4j.properties | 28 +
.../kafka-0-8/src/test/resources/log4j.properties | 28 +
.../src/main/resources/log4j.properties | 37 +
.../src/test/resources/log4j.properties | 27 +
.../graphx/src/test/resources/log4j.properties | 27 +
.../launcher/src/test/resources/log4j.properties | 33 +
.../mllib/src/test/resources/log4j.properties | 28 +
.../spark/repl/src/test/resources/log4j.properties | 27 +
.../catalyst/src/test/resources/log4j.properties | 27 +
.../sql/core/src/test/resources/log4j.properties | 57 +
.../sql/hive/src/test/resources/log4j.properties | 61 +
.../streaming/src/test/resources/log4j.properties | 28 +
.../spark/yarn/src/test/resources/log4j.properties | 31 +
{log4j-jcl => log4j-api-scala_2.10}/pom.xml | 142 +-
.../org/apache/logging/log4j/scala/Logger.scala | 592 ++
.../apache/logging/log4j/scala/LoggerMacro.scala | 425 ++
.../org/apache/logging/log4j/scala/Logging.scala | 19 +-
.../apache/logging/log4j/scala/LoggerTest.scala | 550 ++
{log4j-jcl => log4j-api-scala_2.11}/pom.xml | 142 +-
.../org/apache/logging/log4j/scala/Logger.scala | 592 ++
.../apache/logging/log4j/scala/LoggerMacro.scala | 425 ++
.../org/apache/logging/log4j/scala/Logging.scala | 19 +-
.../apache/logging/log4j/scala/LoggerTest.scala | 550 ++
log4j-api/.gitignore | 5 -
log4j-api/pom.xml | 2 +-
.../logging/log4j/CloseableThreadContext.java | 2 +-
.../main/java/org/apache/logging/log4j/Logger.java | 20 +
.../org/apache/logging/log4j/MarkerManager.java | 4 +-
.../org/apache/logging/log4j/ThreadContext.java | 123 +-
.../logging/log4j/message/LocalizedMessage.java | 2 +-
.../logging/log4j/message/ObjectMessage.java | 35 +-
.../logging/log4j/message/ParameterFormatter.java | 5 +-
.../log4j/message/ParameterizedMessage.java | 13 +-
.../log4j/message/ReusableMessageFactory.java | 15 +-
.../log4j/message/ReusableObjectMessage.java | 10 +
.../message/ReusableParameterizedMessage.java | 15 +-
.../logging/log4j/simple/SimpleLoggerContext.java | 10 +-
.../log4j/simple/SimpleLoggerContextFactory.java | 1 +
.../apache/logging/log4j/spi/AbstractLogger.java | 78 +-
.../{ThreadContextStack.java => CopyOnWrite.java} | 8 +-
.../CopyOnWriteSortedArrayThreadContextMap.java | 224 +
.../logging/log4j/spi/DefaultThreadContextMap.java | 64 +-
.../GarbageFreeSortedArrayThreadContextMap.java | 225 +
.../log4j/spi/MutableThreadContextStack.java | 10 +-
.../logging/log4j/spi/NoOpThreadContextMap.java | 44 +-
.../org/apache/logging/log4j/spi/Provider.java | 2 +-
.../apache/logging/log4j/spi/ThreadContextMap.java | 63 +-
.../logging/log4j/spi/ThreadContextMap2.java | 51 +
.../logging/log4j/spi/ThreadContextMapFactory.java | 91 +
.../logging/log4j/spi/ThreadContextStack.java | 1 +
.../org/apache/logging/log4j/util/BiConsumer.java | 28 +-
.../org/apache/logging/log4j/util/Constants.java | 1 +
.../org/apache/logging/log4j/util/LoaderUtil.java | 47 +-
.../logging/log4j/util/ReadOnlyStringMap.java | 106 +
.../logging/log4j/util/SortedArrayStringMap.java | 528 ++
.../apache/logging/log4j/util/StringBuilders.java | 38 +-
.../org/apache/logging/log4j/util/StringMap.java | 98 +
.../org/apache/logging/log4j/util/Strings.java | 70 +
.../org/apache/logging/log4j/util/TriConsumer.java | 30 +-
.../java/org/apache/logging/log4j/util/Unbox.java | 1 +
.../logging/log4j/CloseableThreadContextTest.java | 11 +-
.../java/org/apache/logging/log4j/LoggerTest.java | 2 +-
.../apache/logging/log4j/ThreadContextHolder.java | 79 +
.../apache/logging/log4j/ThreadContextTest.java | 20 +
.../org/apache/logging/log4j/TraceLoggingTest.java | 17 +-
.../apache/logging/log4j/junit/BundleTestInfo.java | 137 +-
.../org/apache/logging/log4j/junit/OsgiRule.java | 141 +-
.../logging/log4j/junit/ThreadContextMapRule.java | 30 +-
.../logging/log4j/junit/ThreadContextRule.java | 78 +
.../log4j/junit/ThreadContextStackRule.java | 30 +-
.../log4j/message/ParameterizedMessageTest.java | 24 +
.../log4j/message/ReusableMessageFactoryTest.java | 130 +
.../log4j/spi/DefaultThreadContextMapTest.java | 26 +-
.../log4j/util/SortedArrayStringMapTest.java | 1029 ++++
.../log4j/util/{UnboxTest.java => Unbox1Test.java} | 7 +-
...urableTest.java => Unbox2ConfigurableTest.java} | 28 +-
log4j-bom/.gitignore | 3 -
log4j-bom/pom.xml | 16 +-
log4j-core/.gitignore | 5 -
log4j-core/pom.xml | 45 +-
.../apache/logging/log4j/ThreadContextAccess.java | 59 +
.../logging/log4j/core/AbstractLifeCycle.java | 25 +-
.../logging/log4j/core/AbstractLogEvent.java | 6 +
.../logging/log4j/core/ContextDataInjector.java | 108 +
.../org/apache/logging/log4j/core/LifeCycle.java | 11 +-
.../org/apache/logging/log4j/core/LifeCycle2.java} | 28 +-
.../org/apache/logging/log4j/core/LogEvent.java | 25 +
.../apache/logging/log4j/core/LoggerContext.java | 130 +-
.../log4j/core/appender/AbstractAppender.java | 57 +
.../log4j/core/appender/AbstractManager.java | 80 +-
.../appender/AbstractOutputStreamAppender.java | 62 +-
.../core/appender/AbstractWriterAppender.java | 248 +-
.../logging/log4j/core/appender/AppenderSet.java | 137 +
.../logging/log4j/core/appender/AsyncAppender.java | 169 +-
.../ConfigurationFactoryData.java} | 35 +-
.../log4j/core/appender/ConsoleAppender.java | 94 +-
.../log4j/core/appender/CountingNoOpAppender.java | 3 +-
.../log4j/core/appender/FailoverAppender.java | 2 +-
.../logging/log4j/core/appender/FileAppender.java | 279 +-
.../logging/log4j/core/appender/FileManager.java | 114 +-
.../core/appender/MemoryMappedFileAppender.java | 11 +-
.../core/appender/MemoryMappedFileManager.java | 12 +-
.../logging/log4j/core/appender/NullAppender.java} | 32 +-
.../log4j/core/appender/OutputStreamAppender.java | 3 +-
.../log4j/core/appender/OutputStreamManager.java | 644 ++-
.../core/appender/RandomAccessFileAppender.java | 25 +-
.../core/appender/RandomAccessFileManager.java | 35 +-
.../log4j/core/appender/RollingFileAppender.java | 580 +-
.../appender/RollingRandomAccessFileAppender.java | 13 +-
.../core/appender/ScriptAppenderSelector.java | 141 +
.../logging/log4j/core/appender/SmtpAppender.java | 3 +-
.../log4j/core/appender/SocketAppender.java | 240 +-
.../log4j/core/appender/SyslogAppender.java | 11 +-
.../log4j/core/appender/WriterAppender.java | 3 +-
.../logging/log4j/core/appender/WriterManager.java | 300 +-
.../core/appender/db/AbstractDatabaseAppender.java | 280 +-
.../core/appender/db/AbstractDatabaseManager.java | 457 +-
.../db/jdbc/FactoryMethodConnectionSource.java | 4 +-
.../log4j/core/appender/db/jdbc/JdbcAppender.java | 3 +-
.../core/appender/db/jdbc/JdbcDatabaseManager.java | 515 +-
.../db/jpa/AbstractLogEventWrapperEntity.java | 31 +-
.../core/appender/db/jpa/BasicLogEventEntity.java | 1 -
.../log4j/core/appender/db/jpa/JpaAppender.java | 7 +-
.../core/appender/db/jpa/JpaDatabaseManager.java | 381 +-
.../converter/ContextDataAttributeConverter.java | 46 +
.../ContextDataJsonAttributeConverter.java | 93 +
.../jpa/converter/ThrowableAttributeConverter.java | 4 +-
.../log4j/core/appender/mom/JmsAppender.java | 425 +-
.../log4j/core/appender/mom/JmsManager.java | 347 +-
.../core/appender/mom/jeromq/JeroMqAppender.java | 10 +-
.../core/appender/mom/jeromq/JeroMqManager.java | 442 +-
.../core/appender/mom/kafka/KafkaAppender.java | 233 +-
.../core/appender/mom/kafka/KafkaManager.java | 34 +-
.../core/appender/rewrite/RewriteAppender.java | 7 +-
.../rolling/AbstractTriggeringPolicy.java} | 16 +-
.../rolling/CompositeTriggeringPolicy.java | 187 +-
.../appender/rolling/CronTriggeringPolicy.java | 39 +-
.../appender/rolling/DefaultRolloverStrategy.java | 19 +-
.../log4j/core/appender/rolling/FileSize.java | 1 +
.../rolling/OnStartupTriggeringPolicy.java | 4 +-
.../core/appender/rolling/PatternProcessor.java | 2 +-
.../core/appender/rolling/RollingFileManager.java | 91 +-
.../rolling/RollingRandomAccessFileManager.java | 40 +-
.../rolling/SizeBasedTriggeringPolicy.java | 206 +-
.../rolling/TimeBasedTriggeringPolicy.java | 2 +-
.../core/appender/rolling/TriggeringPolicy.java | 10 +-
.../appender/rolling/action/FileRenameAction.java | 1 -
.../core/appender/routing/IdlePurgePolicy.java | 68 +-
.../log4j/core/appender/routing/PurgePolicy.java | 6 +-
.../log4j/core/appender/routing/Routes.java | 176 +-
.../core/appender/routing/RoutingAppender.java | 248 +-
...lPolicy.java => ArrayBlockingQueueFactory.java} | 29 +-
.../logging/log4j/core/async/AsyncLogger.java | 48 +-
.../log4j/core/async/AsyncLoggerConfig.java | 8 +-
.../core/async/AsyncLoggerConfigDisruptor.java | 24 +-
.../log4j/core/async/AsyncLoggerContext.java | 10 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 33 +-
.../log4j/core/async/BlockingQueueFactory.java} | 29 +-
.../log4j/core/async/DaemonThreadFactory.java | 53 -
.../core/async/DefaultAsyncQueueFullPolicy.java | 14 +-
.../core/async/DisruptorBlockingQueueFactory.java} | 35 +-
.../core/async/JCToolsBlockingQueueFactory.java | 198 +
...Policy.java => LinkedTransferQueueFactory.java} | 30 +-
.../log4j/core/async/RingBufferLogEvent.java | 72 +-
.../core/async/RingBufferLogEventTranslator.java | 20 +-
.../log4j/core/config/AbstractConfiguration.java | 68 +-
.../logging/log4j/core/config/AppenderControl.java | 3 +-
.../logging/log4j/core/config/AppendersPlugin.java | 4 +-
.../logging/log4j/core/config/Configuration.java | 14 +
.../log4j/core/config/ConfigurationException.java | 14 +-
.../log4j/core/config/ConfigurationFactory.java | 86 +-
.../log4j/core/config/ConfigurationScheduler.java | 46 +-
.../log4j/core/config/ConfiguratonFileWatcher.java | 30 +-
.../logging/log4j/core/config/Configurator.java | 36 +-
.../log4j/core/config/CronScheduledFuture.java | 2 +-
.../log4j/core/config/DefaultConfiguration.java | 2 +-
.../logging/log4j/core/config/LoggerConfig.java | 129 +-
.../log4j/core/config/NullConfiguration.java | 2 +-
.../apache/logging/log4j/core/config/Property.java | 16 +-
.../log4j/core/config/builder/api/Component.java | 4 +-
.../config/builder/api/ConfigurationBuilder.java | 40 +-
.../config/builder/impl/BuiltConfiguration.java | 5 +-
.../builder/impl/DefaultComponentBuilder.java | 4 +-
.../builder/impl/DefaultConfigurationBuilder.java | 184 +-
.../impl/DefaultCustomLevelComponentBuilder.java | 2 +-
.../config/composite/CompositeConfiguration.java | 4 +-
.../config/composite/DefaultMergeStrategy.java | 7 +-
.../log4j/core/config/json/JsonConfiguration.java | 16 +-
.../core/config/json/JsonConfigurationFactory.java | 5 +-
.../core/config/plugins/PluginBuilderFactory.java | 1 +
.../core/config/plugins/PluginConfiguration.java | 1 +
.../log4j/core/config/plugins/PluginFactory.java | 2 +-
.../log4j/core/config/plugins/PluginNode.java | 1 +
.../config/plugins/convert/TypeConverters.java | 4 +-
.../core/config/plugins/util/PluginBuilder.java | 6 +-
.../core/config/plugins/util/PluginRegistry.java | 1 -
.../core/config/plugins/util/ResolverUtil.java | 13 +-
.../plugins/visitors/PluginElementVisitor.java | 3 +
.../plugins/visitors/PluginValueVisitor.java | 18 +-
.../config/properties/PropertiesConfiguration.java | 8 +-
.../properties/PropertiesConfigurationBuilder.java | 22 +-
.../properties/PropertiesConfigurationFactory.java | 13 +-
.../log4j/core/config/xml/XmlConfiguration.java | 47 +-
.../core/config/xml/XmlConfigurationFactory.java | 6 +-
.../log4j/core/config/yaml/YamlConfiguration.java | 7 +-
.../core/config/yaml/YamlConfigurationFactory.java | 5 +-
.../logging/log4j/core/filter/AbstractFilter.java | 20 +-
.../log4j/core/filter/AbstractFilterable.java | 55 +-
.../logging/log4j/core/filter/CompositeFilter.java | 13 +-
.../log4j/core/filter/DynamicThresholdFilter.java | 107 +-
.../log4j/core/filter/LevelRangeFilter.java | 17 +-
.../logging/log4j/core/filter/MapFilter.java | 17 +-
.../log4j/core/filter/ThreadContextMapFilter.java | 25 +-
.../log4j/core/impl/ContextDataFactory.java | 95 +
.../core/impl/ContextDataInjectorFactory.java | 92 +
.../log4j/core/impl/DefaultLogEventFactory.java | 7 +-
.../logging/log4j/core/impl/ExtendedClassInfo.java | 23 +-
.../log4j/core/impl/ExtendedStackTraceElement.java | 46 +-
.../log4j/core/impl/JdkMapAdapterStringMap.java | 201 +
.../log4j/core/impl/Log4jContextFactory.java | 6 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 120 +-
.../logging/log4j/core/impl/MutableLogEvent.java | 35 +-
.../log4j/core/impl/ReusableLogEventFactory.java | 28 +-
.../log4j/core/impl/ThreadContextDataInjector.java | 202 +
.../log4j/core/impl/ThrowableFormatOptions.java | 126 +-
.../logging/log4j/core/impl/ThrowableProxy.java | 407 +-
.../ContextDataAsEntryListDeserializer.java | 57 +
.../jackson/ContextDataAsEntryListSerializer.java | 58 +
.../core/jackson/ContextDataDeserializer.java | 65 +
.../log4j/core/jackson/ContextDataSerializer.java | 64 +
.../logging/log4j/core/jackson/Initializers.java | 12 +-
.../log4j/core/jackson/Log4jJsonModule.java | 9 +-
.../log4j/core/jackson/Log4jJsonObjectMapper.java | 6 +-
.../logging/log4j/core/jackson/Log4jXmlModule.java | 6 +-
.../log4j/core/jackson/Log4jXmlObjectMapper.java | 9 +-
.../log4j/core/jackson/Log4jYamlModule.java | 9 +-
.../log4j/core/jackson/Log4jYamlObjectMapper.java | 6 +-
.../log4j/core/jackson/LogEventJsonMixIn.java | 16 +-
...ixIn.java => LogEventWithContextListMixIn.java} | 18 +-
.../ThrowableProxyWithoutStacktraceMixIn.java | 77 +
.../logging/log4j/core/jmx/LoggerContextAdmin.java | 4 +-
.../org/apache/logging/log4j/core/jmx/Server.java | 31 +-
.../log4j/core/layout/AbstractCsvLayout.java | 10 +-
.../log4j/core/layout/AbstractStringLayout.java | 57 +-
.../logging/log4j/core/layout/GelfLayout.java | 22 +-
.../logging/log4j/core/layout/HtmlLayout.java | 96 +-
.../logging/log4j/core/layout/JacksonFactory.java | 22 +-
.../logging/log4j/core/layout/JsonLayout.java | 14 +-
.../log4j/core/layout/MarkerPatternSelector.java | 3 +-
.../logging/log4j/core/layout/PatternLayout.java | 18 +-
.../log4j/core/layout/ScriptPatternSelector.java | 1 +
.../logging/log4j/core/layout/XmlLayout.java | 15 +-
.../logging/log4j/core/layout/YamlLayout.java | 13 +-
.../log4j/core/lookup/ContextMapLookup.java | 17 +-
.../logging/log4j/core/lookup/Interpolator.java | 61 +-
.../logging/log4j/core/lookup/JndiLookup.java | 2 +-
.../logging/log4j/core/lookup/StrSubstitutor.java | 19 +
.../log4j/core/net/AbstractSocketManager.java | 6 +-
.../log4j/core/net/DatagramSocketManager.java | 21 +-
.../apache/logging/log4j/core/net/JndiManager.java | 287 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 6 +-
.../apache/logging/log4j/core/net/SmtpManager.java | 4 +-
.../logging/log4j/core/net/SslSocketManager.java | 31 +-
.../logging/log4j/core/net/TcpSocketManager.java | 104 +-
.../core/net/server/AbstractSocketServer.java | 88 +-
.../logging/log4j/core/net/server/JmsServer.java | 286 +-
.../net/server/JsonInputStreamLogEventBridge.java | 2 +-
.../log4j/core/net/server/TcpSocketServer.java | 184 +-
.../log4j/core/net/server/UdpSocketServer.java | 83 +-
.../net/ssl/AbstractKeyStoreConfiguration.java | 38 +
.../log4j/core/net/ssl/KeyStoreConfiguration.java | 36 +-
.../log4j/core/net/ssl/SslConfiguration.java | 77 +-
.../log4j/core/net/ssl/StoreConfiguration.java | 3 +
.../core/net/ssl/TrustStoreConfiguration.java | 33 +-
.../log4j/core/pattern/DatePatternConverter.java | 2 +-
.../pattern/ExtendedThrowablePatternConverter.java | 9 +-
.../log4j/core/pattern/HighlightConverter.java | 38 +-
.../log4j/core/pattern/HtmlTextRenderer.java} | 19 +-
.../log4j/core/pattern/JAnsiTextRenderer.java | 332 ++
.../pattern/LineSeparatorPatternConverter.java | 4 +-
.../log4j/core/pattern/MdcPatternConverter.java | 112 +-
.../core/pattern/MessagePatternConverter.java | 83 +-
.../log4j/core/pattern/NameAbbreviator.java | 2 +
.../log4j/core/pattern/PlainTextRenderer.java} | 21 +-
.../pattern/RootThrowablePatternConverter.java | 8 +-
.../pattern/SequenceNumberPatternConverter.java | 1 -
.../logging/log4j/core/pattern/StyleConverter.java | 24 +-
.../TextRenderer.java} | 35 +-
.../core/pattern/ThrowablePatternConverter.java | 5 +-
.../logging/log4j/core/script/AbstractScript.java | 5 +
.../apache/logging/log4j/core/script/Script.java | 8 +-
.../logging/log4j/core/script/ScriptFile.java | 3 -
.../logging/log4j/core/script/ScriptManager.java | 59 +-
.../logging/log4j/core/script/ScriptRef.java | 5 +-
.../log4j/core/selector/BasicContextSelector.java | 131 +-
.../log4j/core/selector/CoreContextSelectors.java} | 54 +-
.../log4j/core/selector/JndiContextSelector.java | 2 +-
.../apache/logging/log4j/core/tools/Generate.java | 5 +-
.../apache/logging/log4j/core/util/ArrayUtils.java | 124 +
.../org/apache/logging/log4j/core/util/Assert.java | 38 -
...Watcher.java => BasicCommandLineArguments.java} | 32 +-
.../logging/log4j/core/util/CachedClock.java | 2 +-
.../org/apache/logging/log4j/core/util/Closer.java | 4 +-
.../logging/log4j/core/util/CoarseCachedClock.java | 2 +-
.../apache/logging/log4j/core/util/Constants.java | 17 -
.../core/util/DefaultShutdownCallbackRegistry.java | 14 +-
.../logging/log4j/core/util/ExecutorServices.java | 81 +
.../logging/log4j/core/util/FileWatcher.java | 2 +-
...{FileWatcher.java => InetAddressConverter.java} | 22 +-
.../apache/logging/log4j/core/util/JndiCloser.java | 118 +-
.../org/apache/logging/log4j/core/util/Loader.java | 29 +-
.../logging/log4j/core/util/Log4jThread.java | 138 +-
.../log4j/core/util/Log4jThreadFactory.java | 93 +
.../logging/log4j/core/util/NullOutputStream.java | 20 +-
.../logging/log4j/core/util/OptionConverter.java | 3 +-
.../logging/log4j/core/util/ReflectionUtil.java | 2 +-
.../apache/logging/log4j/core/util/TypeUtil.java | 21 +
.../logging/log4j/core/util/WatchManager.java | 14 +-
.../log4j/core/util/datetime/FastDateParser.java | 54 +-
.../log4j/core/util/datetime/FixedDateFormat.java | 77 +-
.../log4j/core/util/datetime/FormatCache.java | 2 +-
log4j-core/src/main/resources/Log4j-config.xsd | 2 +-
.../logging/log4j/FilterPerformanceComparison.java | 124 +-
.../log4j/FormatterLoggerManualExample.java | 7 +-
.../org/apache/logging/log4j/LogRolloverTest.java | 18 +-
.../apache/logging/log4j/MarkerMixInXmlTest.java | 2 +-
.../logging/log4j/ThreadContextTestAccess.java | 20 +-
.../log4j/core/BasicConfigurationFactory.java | 6 +-
.../apache/logging/log4j/core/DeadlockTest.java | 2 +-
.../log4j/core/GcFreeAsynchronousLoggingTest.java | 2 +
.../logging/log4j/core/GcFreeLoggingTestUtil.java | 29 +-
.../log4j/core/GcFreeMixedSyncAyncLoggingTest.java | 1 +
.../log4j/core/GcFreeSynchronousLoggingTest.java | 1 +
.../apache/logging/log4j/core/HostNameTest.java | 4 +-
.../logging/log4j/core/LoggerUpdateTest.java | 2 +-
.../logging/log4j/core/PatternSelectorTest.java | 16 +-
.../logging/log4j/core/StrictXmlConfigTest.java | 1 -
.../appender/AsyncAppenderQueueFullPolicyTest.java | 9 +-
.../log4j/core/appender/AsyncAppenderTest.java | 46 +-
.../appender/ConsoleAppenderAnsiMessagesMain.java | 110 +-
.../ConsoleAppenderAnsiStyleJira180Main.java | 119 +-
.../ConsoleAppenderAnsiStyleJira272Main.java | 121 +-
.../ConsoleAppenderAnsiStyleJira319Main.java | 123 +-
.../ConsoleAppenderAnsiStyleLayoutMain.java | 149 +-
.../ConsoleAppenderAnsiStyleNameLayoutMain.java | 11 +-
.../core/appender/ConsoleAppenderBuilderTest.java | 21 +-
.../ConsoleAppenderDefaultSuppressedThrowable.java | 131 +-
.../ConsoleAppenderHighlightLayoutDefaultMain.java | 11 +-
.../ConsoleAppenderHighlightLayoutLogbackMain.java | 11 +-
.../ConsoleAppenderHighlightLayoutMain.java | 11 +-
.../appender/ConsoleAppenderJAnsiMessageMain.java | 22 +-
...ava => ConsoleAppenderJAnsiXExceptionMain.java} | 23 +-
.../ConsoleAppenderNoAnsiStyleLayoutMain.java | 145 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 12 +-
.../CsvJsonParameterLayoutFileAppenderTest.java | 117 +
.../core/appender/FileAppenderBuilderTest.java | 21 +-
.../log4j/core/appender/FileAppenderTest.java | 315 +-
.../log4j/core/appender/HangingAppender.java | 15 +-
.../log4j/core/appender/InMemoryAppenderTest.java | 4 +-
.../logging/log4j/core/appender/Jira739Test.java | 103 +-
.../appender/JsonCompleteFileAppenderTest.java | 37 +-
.../core/appender/MemoryMappedFileManagerTest.java | 25 +-
.../core/appender/OutputStreamAppenderTest.java | 213 +-
.../log4j/core/appender/ProgressConsoleTest.java | 7 +-
.../appender/RandomAccessFileAppenderTests.java | 2 +-
.../core/appender/RandomAccessFileManagerTest.java | 26 +-
.../core/appender/ScriptAppenderSelectorTest.java | 100 +
.../appender/SocketAppenderBufferSizeTest.java | 77 +
.../SocketAppenderBuilderTest.java} | 23 +-
.../log4j/core/appender/SocketAppenderTest.java | 252 +-
.../core/appender/SyslogAppenderTestBase.java | 2 +-
.../core/appender/XmlCompleteFileAppenderTest.java | 66 +-
.../appender/db/AbstractDatabaseAppenderTest.java | 18 +-
.../appender/db/AbstractDatabaseManagerTest.java | 20 +-
.../appender/db/jdbc/AbstractJdbcAppenderTest.java | 14 +-
.../appender/db/jpa/AbstractJpaAppenderTest.java | 14 +-
.../core/appender/db/jpa/JpaH2AppenderTest.java | 28 +-
.../appender/db/jpa/JpaHyperSqlAppenderTest.java | 28 +-
.../log4j/core/appender/db/jpa/TestBaseEntity.java | 7 +
.../ContextDataAttributeConverterTest.java | 70 +
... => ContextDataJsonAttributeConverterTest.java} | 42 +-
.../ContextStackJsonAttributeConverterTest.java | 19 +-
.../log4j/core/appender/mom/JmsAppenderIT.java | 2 +-
.../appender/mom/jeromq/JeroMqAppenderTest.java | 263 +-
.../log4j/core/appender/rolling/FileSizeTest.java | 4 +-
.../rolling/OnStartupTriggeringPolicyTest.java | 43 +-
.../RandomRollingAppenderOnStartupTest.java | 2 +-
.../rolling/RollingAppenderCronOnceADayTest.java | 125 +
.../appender/rolling/RollingAppenderCronTest.java | 13 +-
.../RollingAppenderCustomDeleteActionTest.java | 2 +-
...RollingAppenderDeleteAccumulatedCount1Test.java | 2 +-
...RollingAppenderDeleteAccumulatedCount2Test.java | 2 +-
.../RollingAppenderDeleteAccumulatedSizeTest.java | 2 +-
.../rolling/RollingAppenderDeleteMaxDepthTest.java | 2 +-
.../rolling/RollingAppenderDeleteNestedTest.java | 2 +-
.../RollingAppenderDeleteScriptFri13thTest.java | 2 +-
.../rolling/RollingAppenderDeleteScriptTest.java | 2 +-
.../RollingAppenderNoUnconditionalDeleteTest.java | 2 +-
.../rolling/RollingAppenderOnStartupTest.java | 2 +-
.../appender/rolling/RollingAppenderSizeTest.java | 54 +-
.../rolling/RollingAppenderTimeAndSizeTest.java | 4 +-
.../appender/rolling/RollingAppenderTimeTest.java | 2 +-
.../rolling/RollingAppenderUncompressedTest.java | 2 +-
.../rolling/RollingFileAppenderAccessTest.java | 56 +-
...st.java => RollingFileAppenderBuilderTest.java} | 20 +-
...est.java => RollingFileAppenderLayoutTest.java} | 27 +-
...ingRandomAccessFileManagerHeaderFooterTest.java | 3 +-
.../RollingRandomAccessFileManagerTest.java | 30 +-
.../routing/DefaultRouteScriptAppenderTest.java | 152 +
.../appender/routing/JsonRoutingAppender2Test.java | 2 +-
.../appender/routing/JsonRoutingAppenderTest.java | 2 +-
.../routing/PropertiesRoutingAppenderTest.java | 4 +-
.../appender/routing/RoutesScriptAppenderTest.java | 159 +
.../core/appender/routing/RoutingAppenderTest.java | 4 +-
.../routing/RoutingAppenderWithPurgingTest.java | 24 +-
.../routing/RoutingDefaultAppenderTest.java | 22 +-
.../async/AbstractAsyncThreadContextTestBase.java | 188 +
.../AsyncLoggerClassLoadDeadlock.java} | 29 +-
.../AsyncLoggerClassLoadDeadlockTest.java} | 32 +-
.../log4j/core/async/AsyncLoggerConfigTest.java | 8 +-
...cLoggerConfigThreadContextCopyOnWriteTest.java} | 25 +-
...AsyncLoggerConfigThreadContextDefaultTest.java} | 25 +-
...cLoggerConfigThreadContextGarbageFreeTest.java} | 25 +-
.../AsyncLoggerThreadContextCopyOnWriteTest.java | 40 +
.../async/AsyncLoggerThreadContextDefaultTest.java | 40 +
.../AsyncLoggerThreadContextGarbageFreeTest.java | 40 +
.../async/DefaultAsyncQueueFullPolicyTest.java | 6 +-
.../async/DiscardingAsyncQueueFullPolicyTest.java | 8 +-
.../log4j/core/async/RingBufferLogEventTest.java | 41 +-
.../core/async/perftest/AbstractRunQueue.java | 91 +
.../core/async/perftest/ResponseTimeTest.java | 1 +
.../perftest/RunConversant.java} | 14 +-
.../perftest/RunJCTools.java} | 13 +-
.../core/config/CompositeConfigurationTest.java | 56 +-
.../log4j/core/config/ConfigurationTest.java | 8 +-
.../log4j/core/config/ConfiguratorTest.java | 5 +-
.../log4j/core/config/CustomConfigurationTest.java | 16 +-
.../log4j/core/config/LoggerConfigTest.java | 102 +
.../log4j/core/config/MissingRootLoggerTest.java | 2 +-
.../logging/log4j/core/config/PropertyTest.java | 85 +
.../log4j/core/config/TestConfigurator.java | 24 +-
.../log4j/core/config/TestConfiguratorError.java | 13 +-
.../logging/log4j/core/config/XIncludeTest.java | 2 +-
.../config/builder/ConfigurationAssemblerTest.java | 36 +-
.../config/builder/ConfigurationBuilderTest.java | 96 +
.../config/builder/CustomConfigurationFactory.java | 18 +-
.../plugins/util/PluginManagerPackagesTest.java | 12 +-
.../util/ResolverUtilCustomProtocolTest.java | 210 +
.../core/config/plugins/util/ResolverUtilTest.java | 132 +-
.../AbstractPluginWithGenericBuilder.java | 59 +
...a => PluginWithGenericSubclassFoo1Builder.java} | 69 +-
.../plugins/validation/ValidatingPlugin.java | 2 +-
...ava => ValidatingPluginWithGenericBuilder.java} | 29 +-
....java => ValidatingPluginWithTypedBuilder.java} | 22 +-
.../validators/RequiredValidatorTest.java | 1 +
...=> ValidatingPluginWithGenericBuilderTest.java} | 19 +-
...gPluginWithGenericSubclassFoo1BuilderTest.java} | 25 +-
...a => ValidatingPluginWithTypedBuilderTest.java} | 36 +-
.../log4j/core/config/xml/XmlLoggerPropsTest.java | 8 +-
.../log4j/core/filter/AbstractFilterTest.java | 88 +
.../logging/log4j/core/filter/BurstFilterTest.java | 283 +-
.../core/filter/DynamicThresholdFilterTest.java | 47 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 9 +
...taFactoryPropertySetMissingConstructorTest.java | 41 +
.../impl/ContextDataFactoryPropertySetTest.java | 49 +
.../log4j/core/impl/ContextDataFactoryTest.java | 47 +
.../log4j/core/impl/FactoryTestStringMap.java | 104 +
.../FactoryTestStringMapWithoutIntConstructor.java | 100 +
.../core/impl/JdkMapAdapterStringMapTest.java | 883 +++
.../logging/log4j/core/impl/Log4jLogEventTest.java | 78 +-
.../log4j/core/impl/MutableLogEventTest.java | 31 +-
.../core/impl/NestedLoggingFromToStringTest.java | 132 +
.../core/impl/ReusableLogEventFactoryTest.java | 28 +
.../core/impl/ThrowableFormatOptionsTest.java | 211 +-
.../log4j/core/impl/ThrowableProxyTest.java | 56 +
.../log4j/core/jackson/LevelMixInJsonTest.java | 2 +-
.../core/jackson/StackTraceElementMixInTest.java | 2 +-
.../log4j/core/layout/CsvLogEventLayoutTest.java | 8 +-
.../log4j/core/layout/CsvParameterLayoutTest.java | 73 +-
.../logging/log4j/core/layout/GelfLayoutTest.java | 12 +-
.../logging/log4j/core/layout/HtmlLayoutTest.java | 7 +-
.../logging/log4j/core/layout/JsonLayoutTest.java | 64 +-
.../Log4j2_1482_CoreTest.java} | 19 +-
.../log4j/core/layout/Log4j2_1482_Test.java | 89 +
.../log4j/core/layout/LogEventFixtures.java | 10 +-
.../PatternLayoutLookupDateTest.java} | 25 +-
.../PatternLayoutNoLookupDateTest.java} | 25 +-
.../log4j/core/layout/PatternLayoutTest.java | 23 +-
.../log4j/core/layout/Rfc5424LayoutTest.java | 23 +-
.../log4j/core/layout/SerializedLayoutTest.java | 7 +-
.../log4j/core/layout/SyslogLayoutTest.java | 9 +-
.../logging/log4j/core/layout/XmlLayoutTest.java | 66 +-
.../logging/log4j/core/layout/YamlLayoutTest.java | 55 +-
.../core/lookup/MainInputArgumentsLookupTest.java | 11 +-
.../core/lookup/MainInputArgumentsMapLookup.java | 2 +-
.../core/lookup/ResourceBundleLookupTest.java | 4 +-
.../log4j/core/net/SocketReconnectTest.java | 12 +-
.../log4j/core/net/mock/MockUdpSyslogServer.java | 6 +-
.../core/net/server/AbstractSocketServerTest.java | 20 +-
.../core/net/server/SslXmlSocketServerTest.java | 23 +-
.../core/net/ssl/KeyStoreConfigurationTest.java | 2 +-
.../core/net/ssl/TrustStoreConfigurationTest.java | 2 +-
.../osgi/equinox/EquinoxLoadCoreBundleTest.java | 6 +-
.../core/osgi/felix/FelixLoadCoreBundleTest.java | 4 +
.../core/pattern/DatePatternConverterTest.java | 22 +
.../log4j/core/pattern/HighlightConverterTest.java | 78 +
.../core/pattern/MdcPatternConverterTest.java | 29 +-
...terTest.java => MessageJansiConverterTest.java} | 17 +-
.../core/pattern/MessagePatternConverterTest.java | 17 +-
...erTest.java => MessageStyledConverterTest.java} | 17 +-
...erterTest.java => NdcPatternConverterTest.java} | 61 +-
.../log4j/core/pattern/NoConsoleNoAnsiTest.java | 4 +-
.../log4j/core/pattern/PatternParserTest.java | 12 +-
.../pattern/RegexReplacementConverterTest.java | 4 +-
.../log4j/core/pattern/RegexReplacementTest.java | 23 +-
.../log4j/core/pattern/StyleConverterTest.java | 4 +-
.../apache/logging/log4j/core/util/Profiler.java | 5 +-
.../core/util/ShutdownCallbackRegistryTest.java | 2 +-
.../core/util/datetime/FixedDateFormatTest.java | 35 +-
.../log4j/junit/AbstractExternalFileCleaner.java | 232 +-
.../org/apache/logging/log4j/junit/CleanFiles.java | 38 +-
.../apache/logging/log4j/junit/CleanFolders.java | 59 +-
.../logging/log4j/junit/LoggerContextRule.java | 75 +-
.../log4j/junit/URLStreamHandlerFactoryRule.java | 97 +
.../apache/logging/log4j/test/ExtendedLevels.java | 2 +-
.../log4j/test/appender/AlwaysFailAppender.java | 3 +-
.../log4j/test/appender/BlockingAppender.java | 12 +-
.../log4j/test/appender/DeadlockAppender.java | 12 +-
.../log4j/test/appender/FailOnceAppender.java | 3 +-
.../log4j/test/appender/InMemoryAppender.java | 7 +-
.../logging/log4j/test/appender/ListAppender.java | 25 +-
.../log4j/test/appender/UsesLoggingAppender.java | 3 +-
.../logging/log4j/test/layout/BasicLayout.java | 6 +-
.../AsyncLoggerConfigThreadContextTest.xml | 50 +
.../src/test/resources/AsyncLoggerConsoleTest.xml | 16 +
.../resources/AsyncLoggerThreadContextTest.xml | 8 +-
...=> BlockingQueueFactory-ArrayBlockingQueue.xml} | 12 +-
...lockingQueueFactory-DisruptorBlockingQueue.xml} | 12 +-
... BlockingQueueFactory-JCToolsBlockingQueue.xml} | 14 +-
...> BlockingQueueFactory-LinkedTransferQueue.xml} | 12 +-
.../src/test/resources/JeroMqAppenderTest.xml | 62 +-
...og4j-loggerprops.xml => configPropertyTest.xml} | 24 +-
log4j-core/src/test/resources/gcFreeLogging.xml | 17 +-
.../test/resources/gcFreeMixedSyncAsyncLogging.xml | 20 +-
log4j-core/src/test/resources/log4j-advertiser.xml | 4 +-
...tyle.xml => log4j-appender-selector-groovy.xml} | 23 +-
....xml => log4j-appender-selector-javascript.xml} | 23 +-
.../src/test/resources/log4j-asynch-queue-full.xml | 4 +-
.../resources/log4j-comp-logger-attr-override.json | 38 +
.../src/test/resources/log4j-comp-logger-root.xml | 77 +-
.../src/test/resources/log4j-comp-root-loggers.xml | 77 +-
...g4j-asynch-queue-full.xml => log4j-console.xml} | 15 +-
.../src/test/resources/log4j-customLevel.xml | 7 +-
...og4j-style.xml => log4j-cvs-json-parameter.xml} | 16 +-
.../src/test/resources/log4j-empty.xml | 53 +-
...MqAppenderTest.xml => log4j-list-nolookups.xml} | 60 +-
.../src/test/resources/log4j-loggerprops.xml | 4 +-
.../{log4j-style.xml => log4j-message-ansi.xml} | 2 +-
.../{log4j-style.xml => log4j-message-styled.xml} | 4 +-
...rolling-cron2.xml => log4j-rolling-7z-lazy.xml} | 25 +-
...ling-cron2.xml => log4j-rolling-bzip2-lazy.xml} | 26 +-
...cron2.xml => log4j-rolling-cron-once-a-day.xml} | 33 +-
.../src/test/resources/log4j-rolling-cron.xml | 2 +-
.../src/test/resources/log4j-rolling-cron2.xml | 2 +-
...ng-cron2.xml => log4j-rolling-deflate-lazy.xml} | 26 +-
...rolling-cron2.xml => log4j-rolling-gz-lazy.xml} | 25 +-
...ng-cron2.xml => log4j-rolling-pack200-lazy.xml} | 26 +-
...rolling-cron2.xml => log4j-rolling-xz-lazy.xml} | 26 +-
...olling-cron2.xml => log4j-rolling-zip-lazy.xml} | 26 +-
... log4j-routing-default-route-script-groovy.xml} | 26 +-
...4j-routing-default-route-script-javascript.xml} | 30 +-
....xml => log4j-routing-routes-script-groovy.xml} | 26 +-
... => log4j-routing-routes-script-javascript.xml} | 26 +-
.../log4j-routing-script-staticvars-groovy.xml | 50 +
.../log4j-routing-script-staticvars-javascript.xml | 50 +
log4j-core/src/test/resources/log4j-style.xml | 4 +-
.../{log4j-style.xml => log4j-sync-to-list.xml} | 11 +-
log4j-core/src/test/resources/log4j2-1482.xml | 27 +
log4j-core/src/test/resources/log4j2-1573.xml | 12 +
.../src/test/resources/log4j2-console-msg-ansi.xml | 24 +-
.../resources/log4j2-console-xex-ansi-custom.xml | 62 +-
.../resources/log4j2-console-xex-ansi-kirk.xml | 24 +-
.../src/test/resources/log4j2-console-xex-ansi.xml | 62 +-
.../test/resources/log4j2-properties.properties | 1 +
log4j-distribution/.gitignore | 2 -
log4j-distribution/pom.xml | 24 +-
log4j-flume-ng/.gitignore | 4 -
log4j-flume-ng/pom.xml | 3 +-
.../log4j/flume/appender/AbstractFlumeManager.java | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 56 +-
.../log4j/flume/appender/FlumeAvroManager.java | 6 +-
.../log4j/flume/appender/FlumeEmbeddedManager.java | 554 +-
.../logging/log4j/flume/appender/FlumeEvent.java | 10 +
.../log4j/flume/appender/FlumeEventFactory.java | 3 +-
.../flume/appender/FlumePersistentManager.java | 90 +-
.../log4j/flume/appender/FlumeAppenderTest.java | 48 +-
.../flume/appender/FlumeEmbeddedAgentTest.java | 4 +-
.../flume/appender/FlumeEmbeddedAppenderTest.java | 4 +-
.../appender/FlumePersistentAppenderTest.java | 4 +-
.../log4j/flume/appender/FlumePersistentPerf.java | 4 +-
log4j-iostreams/.gitignore | Bin 69 -> 0 bytes
log4j-iostreams/pom.xml | 2 +-
log4j-jcl/.gitignore | 4 -
log4j-jcl/pom.xml | 2 +-
.../org/apache/logging/log4j/jcl/LoggerTest.java | 130 +-
log4j-jmx-gui/.gitignore | 4 -
log4j-jmx-gui/pom.xml | 3 +-
log4j-jul/pom.xml | 3 +-
.../org/apache/logging/log4j/jul/Constants.java | 1 +
.../logging/log4j/jul/CoreLoggerAdapter.java | 7 +-
log4j-liquibase/.gitignore | 3 -
log4j-liquibase/pom.xml | 2 +-
.../liquibase/ext/logging/log4j2/LoggingTest.java | 12 +-
log4j-nosql/.gitignore | 4 -
log4j-nosql/pom.xml | 8 +-
.../log4j/nosql/appender/NoSqlAppender.java | 3 +-
.../log4j/nosql/appender/NoSqlDatabaseManager.java | 7 +-
.../nosql/appender/couchdb/CouchDbProvider.java | 4 +-
.../nosql/appender/mongodb/MongoDbProvider.java | 6 +-
.../nosql/appender/NoSqlDatabaseManagerTest.java | 86 +-
log4j-perf/.gitignore | 4 -
log4j-perf/pom.xml | 10 +-
.../log4j/ThreadContextBenchmarkAccess.java | 20 +-
.../perf/jmh/AsyncAppenderLog4j2Benchmark.java | 37 +-
.../jmh/AsyncAppenderLog4j2LocationBenchmark.java | 23 +-
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 4 +-
.../log4j/perf/jmh/JpaAppenderBenchmark.java | 4 +-
.../logging/log4j/perf/jmh/MDCFilterBenchmark.java | 14 +-
.../perf/jmh/SortedArrayVsHashMapBenchmark.java | 239 +
.../log4j/perf/jmh/ThreadContextBenchmark.java | 201 +
.../log4j/perf/jmh/ThreadLocalVsPoolBenchmark.java | 2 +-
.../logging/log4j/perf/nogc/OpenHashStringMap.java | 938 ++++
.../CopyOnWriteOpenHashMapThreadContextMap.java | 46 +
.../GarbageFreeOpenHashMapThreadContextMap.java | 49 +
... => perf5AsyncApndDsrptrNoLoc-noOpAppender.xml} | 1 +
...> perf5AsyncApndDsrptrWithLoc-noOpAppender.xml} | 5 +-
...l => perf5AsyncApndMpscQNoLoc-noOpAppender.xml} | 3 +-
...=> perf5AsyncApndMpscQWithLoc-noOpAppender.xml} | 5 +-
.../resources/perf5AsyncApndNoLoc-noOpAppender.xml | 1 +
...l => perf5AsyncApndXferQNoLoc-noOpAppender.xml} | 1 +
...=> perf5AsyncApndXferQWithLoc-noOpAppender.xml} | 5 +-
log4j-samples/.gitignore | 5 -
log4j-samples/configuration/pom.xml | 2 +-
.../log4j/configuration/CustomConfiguration.java | 13 +-
.../configuration/CustomConfigurationFactory.java | 12 +-
log4j-samples/flume-common/pom.xml | 2 +-
log4j-samples/flume-embedded/pom.xml | 2 +-
log4j-samples/flume-remote/pom.xml | 2 +-
log4j-samples/loggerProperties/pom.xml | 2 +-
log4j-samples/pom.xml | 3 +-
{log4j-jul => log4j-samples/scala-api}/.gitignore | 0
log4j-samples/{configuration => scala-api}/pom.xml | 32 +-
.../scala-api/src/main/resources/log4j2.xml | 63 +-
.../logging/log4j/scalasample/LoggingApp.scala | 47 +
log4j-slf4j-impl/.gitignore | 4 -
log4j-slf4j-impl/pom.xml | 7 +-
.../org/apache/logging/slf4j/Log4j1222Test.java | 1 -
...g4j1222Test.java => Log4j2_1482_Slf4jTest.java} | 47 +-
.../java/org/apache/logging/slf4j/LoggerTest.java | 364 +-
.../org/apache/logging/slf4j/OptionalTest.java | 138 +-
.../src/test/resources/log4j2-1482.xml | 27 +
log4j-taglib/.gitignore | 4 -
log4j-taglib/pom.xml | 2 +-
log4j-to-slf4j/.gitignore | 4 -
log4j-to-slf4j/pom.xml | 2 +-
.../org/apache/logging/slf4j/MDCContextMap.java | 33 +-
log4j-web/.gitignore | 4 -
log4j-web/pom.xml | 3 +-
.../log4j/web/Log4jServletContextListener.java | 42 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 550 +-
.../org/apache/logging/log4j/web/WebLookup.java | 8 -
.../log4j/web/appender/ServletAppender.java | 104 +-
.../logging/log4j/web/ServletAppenderTest.java | 1 +
.../resources/WEB-INF/classes/log4j-servlet.xml | 64 +-
pom.xml | 68 +-
src/changes/announcement.vm | 24 +-
src/changes/changes.xml | 5867 ++++++++++----------
src/ide/Intellij/13/IntellijSettings.jar | Bin 16778 -> 0 bytes
src/ide/eclipse/4.3.2/organize-imports.importorder | 9 -
760 files changed, 34575 insertions(+), 13132 deletions(-)
delete mode 100644 log4j-1.2-api/.gitignore
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/config/InputStreamWrapper.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationConverter.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/config/Log4j1ConfigurationParser.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java
create mode 100644 log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1MdcPatternConverter.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/LineSeparatorPatternConverter.java => log4j-1.2-api/src/main/java/org/apache/log4j/pattern/Log4j1NdcPatternConverter.java (52%)
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/config/AbstractLog4j1ConfigurationConverterTest.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java => log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterHadoopTest.java (58%)
copy log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java => log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationConverterSparkTest.java (58%)
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/layout/Log4j1XmlLayoutTest.java
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1MdcPatternConverterTest.java
create mode 100644 log4j-1.2-api/src/test/java/org/apache/log4j/pattern/Log4j1NdcPatternConverterTest.java
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-auth-examples/src/main/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/main/conf/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-common/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-kms/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-minikdc/src/main/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-common-project/hadoop-nfs/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-hdfs-project/hadoop-hdfs-client/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-aws/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-azure/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-openstack/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-tools/hadoop-sls/src/main/sample-conf/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-unmanaged-am-launcher/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/hadoop/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-DailyRollingFileAppender.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-NullAppender.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender-with-props.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-RollingFileAppender.properties
copy log4j-1.2-api/src/test/resources/config-1.2/{log4j-console-XmlLayout.properties => log4j-file-SimpleLayout.properties} (52%)
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-system-properties-1.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/log4j-system-properties-2.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/R/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/common/network-common/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/common/network-shuffle/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/core/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/flume-sink/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/flume/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/java8-tests/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/kafka-0-10/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/kafka-0-8/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/kinesis-asl/src/main/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/external/kinesis-asl/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/graphx/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/launcher/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/mllib/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/repl/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/sql/catalyst/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/sql/core/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/sql/hive/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/streaming/src/test/resources/log4j.properties
create mode 100644 log4j-1.2-api/src/test/resources/config-1.2/spark/yarn/src/test/resources/log4j.properties
copy {log4j-jcl => log4j-api-scala_2.10}/pom.xml (50%)
create mode 100644 log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logger.scala
create mode 100644 log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
copy log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java => log4j-api-scala_2.10/src/main/scala/org/apache/logging/log4j/scala/Logging.scala (72%)
create mode 100644 log4j-api-scala_2.10/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
copy {log4j-jcl => log4j-api-scala_2.11}/pom.xml (50%)
create mode 100644 log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logger.scala
create mode 100644 log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/LoggerMacro.scala
copy log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileWatcher.java => log4j-api-scala_2.11/src/main/scala/org/apache/logging/log4j/scala/Logging.scala (72%)
create mode 100644 log4j-api-scala_2.11/src/test/scala/org/apache/logging/log4j/scala/LoggerTest.scala
delete mode 100644 log4j-api/.gitignore
copy log4j-api/src/main/java/org/apache/logging/log4j/spi/{ThreadContextStack.java => CopyOnWrite.java} (80%)
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
copy log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/MDCContextMap.java => log4j-api/src/main/java/org/apache/logging/log4j/spi/NoOpThreadContextMap.java (66%)
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMap2.java
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/spi/ThreadContextMapFactory.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java => log4j-api/src/main/java/org/apache/logging/log4j/util/BiConsumer.java (64%)
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/ReadOnlyStringMap.java
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/SortedArrayStringMap.java
create mode 100644 log4j-api/src/main/java/org/apache/logging/log4j/util/StringMap.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/config/NullConfiguration.java => log4j-api/src/main/java/org/apache/logging/log4j/util/TriConsumer.java (60%)
create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextHolder.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java => log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextMapRule.java (65%)
create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextRule.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/DeadlockTest.java => log4j-api/src/test/java/org/apache/logging/log4j/junit/ThreadContextStackRule.java (64%)
create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/message/ReusableMessageFactoryTest.java
create mode 100644 log4j-api/src/test/java/org/apache/logging/log4j/util/SortedArrayStringMapTest.java
rename log4j-api/src/test/java/org/apache/logging/log4j/util/{UnboxTest.java => Unbox1Test.java} (97%)
rename log4j-api/src/test/java/org/apache/logging/log4j/util/{UnboxConfigurableTest.java => Unbox2ConfigurableTest.java} (71%)
delete mode 100644 log4j-bom/.gitignore
delete mode 100644 log4j-core/.gitignore
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/ThreadContextAccess.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/ContextDataInjector.java
copy log4j-core/src/{test/java/org/apache/logging/log4j/core/DeadlockTest.java => main/java/org/apache/logging/log4j/core/LifeCycle2.java} (58%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/{config/builder/impl/DefaultCustomLevelComponentBuilder.java => appender/ConfigurationFactoryData.java} (51%)
copy log4j-core/src/{test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java => main/java/org/apache/logging/log4j/core/appender/NullAppender.java} (58%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataAttributeConverter.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataJsonAttributeConverter.java
copy log4j-core/src/{test/java/org/apache/logging/log4j/test/ExtendedLevels.java => main/java/org/apache/logging/log4j/core/appender/rolling/AbstractTriggeringPolicy.java} (68%)
copy log4j-core/src/main/java/org/apache/logging/log4j/core/async/{DefaultAsyncQueueFullPolicy.java => ArrayBlockingQueueFactory.java} (52%)
copy log4j-core/src/{test/java/org/apache/logging/log4j/core/GcFreeSynchronousLoggingTest.java => main/java/org/apache/logging/log4j/core/async/BlockingQueueFactory.java} (52%)
delete mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/DaemonThreadFactory.java
copy log4j-core/src/{test/java/org/apache/logging/log4j/test/appender/AlwaysFailAppender.java => main/java/org/apache/logging/log4j/core/async/DisruptorBlockingQueueFactory.java} (50%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/async/JCToolsBlockingQueueFactory.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/async/{DefaultAsyncQueueFullPolicy.java => LinkedTransferQueueFactory.java} (52%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataFactory.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ContextDataInjectorFactory.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMap.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThreadContextDataInjector.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListDeserializer.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataAsEntryListSerializer.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataDeserializer.java
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ContextDataSerializer.java
rename log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/{LogEventMixIn.java => LogEventWithContextListMixIn.java} (88%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/ThrowableProxyWithoutStacktraceMixIn.java
copy log4j-core/src/{test/java/org/apache/logging/log4j/core/jackson/LevelMixInJsonTest.java => main/java/org/apache/logging/log4j/core/pattern/HtmlTextRenderer.java} (60%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/JAnsiTextRenderer.java
copy log4j-core/src/{test/java/org/apache/logging/log4j/core/jackson/LevelMixInJsonTest.java => main/java/org/apache/logging/log4j/core/pattern/PlainTextRenderer.java} (59%)
copy log4j-core/src/main/java/org/apache/logging/log4j/core/{config/NullConfiguration.java => pattern/TextRenderer.java} (56%)
copy log4j-core/src/{test/java/org/apache/logging/log4j/core/jackson/LevelMixInJsonTest.java => main/java/org/apache/logging/log4j/core/selector/CoreContextSelectors.java} (70%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/ArrayUtils.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/util/{FileWatcher.java => BasicCommandLineArguments.java} (50%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/ExecutorServices.java
copy log4j-core/src/main/java/org/apache/logging/log4j/core/util/{FileWatcher.java => InetAddressConverter.java} (66%)
create mode 100644 log4j-core/src/main/java/org/apache/logging/log4j/core/util/Log4jThreadFactory.java
copy log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java => log4j-core/src/test/java/org/apache/logging/log4j/ThreadContextTestAccess.java (70%)
copy log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java => log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderBuilderTest.java (69%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/{ConsoleAppenderJAnsiMessageMain.java => ConsoleAppenderJAnsiXExceptionMain.java} (75%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/CsvJsonParameterLayoutFileAppenderTest.java
copy log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java => log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderBuilderTest.java (70%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderBufferSizeTest.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => appender/SocketAppenderBuilderTest.java} (67%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/ContextDataAttributeConverterTest.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/converter/{ContextStackJsonAttributeConverterTest.java => ContextDataJsonAttributeConverterTest.java} (64%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderCronOnceADayTest.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/{FileSizeTest.java => RollingFileAppenderBuilderTest.java} (69%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/{FileSizeTest.java => RollingFileAppenderLayoutTest.java} (52%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/DefaultRouteScriptAppenderTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutesScriptAppenderTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AbstractAsyncThreadContextTestBase.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => async/AsyncLoggerClassLoadDeadlock.java} (58%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{config/TestConfiguratorError.java => async/AsyncLoggerClassLoadDeadlockTest.java} (50%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => async/AsyncLoggerConfigThreadContextCopyOnWriteTest.java} (60%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => async/AsyncLoggerConfigThreadContextDefaultTest.java} (61%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => async/AsyncLoggerConfigThreadContextGarbageFreeTest.java} (60%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextCopyOnWriteTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextDefaultTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/AsyncLoggerThreadContextGarbageFreeTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/async/perftest/AbstractRunQueue.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{jackson/LevelMixInJsonTest.java => async/perftest/RunConversant.java} (64%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{jackson/LevelMixInJsonTest.java => async/perftest/RunJCTools.java} (63%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/LoggerConfigTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/PropertyTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/builder/ConfigurationBuilderTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilCustomProtocolTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/AbstractPluginWithGenericBuilder.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/{ValidatingPlugin.java => PluginWithGenericSubclassFoo1Builder.java} (50%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/{ValidatingPlugin.java => ValidatingPluginWithGenericBuilder.java} (66%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/{ValidatingPlugin.java => ValidatingPluginWithTypedBuilder.java} (72%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/{RequiredValidatorTest.java => ValidatingPluginWithGenericBuilderTest.java} (73%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/{RequiredValidatorTest.java => ValidatingPluginWithGenericSubclassFoo1BuilderTest.java} (64%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/validation/validators/{RequiredValidatorTest.java => ValidatingPluginWithTypedBuilderTest.java} (62%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/filter/AbstractFilterTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetMissingConstructorTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryPropertySetTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/ContextDataFactoryTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMap.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/FactoryTestStringMapWithoutIntConstructor.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/JdkMapAdapterStringMapTest.java
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/impl/NestedLoggingFromToStringTest.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{jackson/LevelMixInJsonTest.java => layout/Log4j2_1482_CoreTest.java} (56%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/layout/Log4j2_1482_Test.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => layout/PatternLayoutLookupDateTest.java} (51%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/{DeadlockTest.java => layout/PatternLayoutNoLookupDateTest.java} (52%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/HighlightConverterTest.java
copy log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/{StyleConverterTest.java => MessageJansiConverterTest.java} (79%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/{StyleConverterTest.java => MessageStyledConverterTest.java} (78%)
copy log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/{RegexReplacementConverterTest.java => NdcPatternConverterTest.java} (53%)
create mode 100644 log4j-core/src/test/java/org/apache/logging/log4j/junit/URLStreamHandlerFactoryRule.java
create mode 100644 log4j-core/src/test/resources/AsyncLoggerConfigThreadContextTest.xml
create mode 100644 log4j-core/src/test/resources/AsyncLoggerConsoleTest.xml
copy log4j-core/src/test/resources/{log4j-asynch-queue-full.xml => BlockingQueueFactory-ArrayBlockingQueue.xml} (78%)
copy log4j-core/src/test/resources/{log4j-asynch-queue-full.xml => BlockingQueueFactory-DisruptorBlockingQueue.xml} (78%)
copy log4j-core/src/test/resources/{log4j-asynch-queue-full.xml => BlockingQueueFactory-JCToolsBlockingQueue.xml} (78%)
copy log4j-core/src/test/resources/{log4j-asynch-queue-full.xml => BlockingQueueFactory-LinkedTransferQueue.xml} (78%)
copy log4j-core/src/test/resources/{log4j-loggerprops.xml => configPropertyTest.xml} (56%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-appender-selector-groovy.xml} (67%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-appender-selector-javascript.xml} (67%)
create mode 100644 log4j-core/src/test/resources/log4j-comp-logger-attr-override.json
copy log4j-web/src/test/resources/WEB-INF/classes/log4j-servlet.xml => log4j-core/src/test/resources/log4j-comp-logger-root.xml (60%)
copy log4j-web/src/test/resources/WEB-INF/classes/log4j-servlet.xml => log4j-core/src/test/resources/log4j-comp-root-loggers.xml (57%)
copy log4j-core/src/test/resources/{log4j-asynch-queue-full.xml => log4j-console.xml} (75%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-cvs-json-parameter.xml} (72%)
copy log4j-web/src/test/resources/WEB-INF/classes/log4j-servlet.xml => log4j-core/src/test/resources/log4j-empty.xml (70%)
copy log4j-core/src/test/resources/{JeroMqAppenderTest.xml => log4j-list-nolookups.xml} (58%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-message-ansi.xml} (91%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-message-styled.xml} (86%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-7z-lazy.xml} (66%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-bzip2-lazy.xml} (64%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-cron-once-a-day.xml} (58%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-deflate-lazy.xml} (64%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-gz-lazy.xml} (66%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-pack200-lazy.xml} (64%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-xz-lazy.xml} (64%)
copy log4j-core/src/test/resources/{log4j-rolling-cron2.xml => log4j-rolling-zip-lazy.xml} (64%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-routing-default-route-script-groovy.xml} (63%)
copy log4j-core/src/test/resources/{log4j-asynch-queue-full.xml => log4j-routing-default-route-script-javascript.xml} (63%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-routing-routes-script-groovy.xml} (63%)
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-routing-routes-script-javascript.xml} (63%)
create mode 100644 log4j-core/src/test/resources/log4j-routing-script-staticvars-groovy.xml
create mode 100644 log4j-core/src/test/resources/log4j-routing-script-staticvars-javascript.xml
copy log4j-core/src/test/resources/{log4j-style.xml => log4j-sync-to-list.xml} (82%)
create mode 100644 log4j-core/src/test/resources/log4j2-1482.xml
create mode 100644 log4j-core/src/test/resources/log4j2-1573.xml
copy log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml => log4j-core/src/test/resources/log4j2-console-msg-ansi.xml (56%)
copy log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml => log4j-core/src/test/resources/log4j2-console-xex-ansi-custom.xml (57%)
copy log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml => log4j-core/src/test/resources/log4j2-console-xex-ansi-kirk.xml (60%)
copy log4j-perf/src/main/resources/perf5AsyncApndNoLoc-noOpAppender.xml => log4j-core/src/test/resources/log4j2-console-xex-ansi.xml (58%)
delete mode 100644 log4j-distribution/.gitignore
delete mode 100644 log4j-flume-ng/.gitignore
delete mode 100644 log4j-iostreams/.gitignore
delete mode 100644 log4j-jcl/.gitignore
delete mode 100644 log4j-jmx-gui/.gitignore
delete mode 100644 log4j-liquibase/.gitignore
delete mode 100644 log4j-nosql/.gitignore
delete mode 100644 log4j-perf/.gitignore
copy log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/AbstractFlumeManager.java => log4j-perf/src/main/java/org/apache/logging/log4j/ThreadContextBenchmarkAccess.java (70%)
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SortedArrayVsHashMapBenchmark.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/ThreadContextBenchmark.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteOpenHashMapThreadContextMap.java
create mode 100644 log4j-perf/src/main/java/org/apache/logging/log4j/spi/GarbageFreeOpenHashMapThreadContextMap.java
copy log4j-perf/src/main/resources/{perf5AsyncApndNoLoc-noOpAppender.xml => perf5AsyncApndDsrptrNoLoc-noOpAppender.xml} (95%)
copy log4j-perf/src/main/resources/{perf5AsyncApndNoLoc-noOpAppender.xml => perf5AsyncApndDsrptrWithLoc-noOpAppender.xml} (86%)
copy log4j-perf/src/main/resources/{perf5AsyncApndNoLoc-noOpAppender.xml => perf5AsyncApndMpscQNoLoc-noOpAppender.xml} (90%)
copy log4j-perf/src/main/resources/{perf5AsyncApndNoLoc-noOpAppender.xml => perf5AsyncApndMpscQWithLoc-noOpAppender.xml} (87%)
copy log4j-perf/src/main/resources/{perf5AsyncApndNoLoc-noOpAppender.xml => perf5AsyncApndXferQNoLoc-noOpAppender.xml} (97%)
copy log4j-perf/src/main/resources/{perf5AsyncApndNoLoc-noOpAppender.xml => perf5AsyncApndXferQWithLoc-noOpAppender.xml} (88%)
delete mode 100644 log4j-samples/.gitignore
rename {log4j-jul => log4j-samples/scala-api}/.gitignore (100%)
copy log4j-samples/{configuration => scala-api}/pom.xml (68%)
copy log4j-web/src/test/resources/WEB-INF/classes/log4j-servlet.xml => log4j-samples/scala-api/src/main/resources/log4j2.xml (74%)
create mode 100644 log4j-samples/scala-api/src/main/scala/org/apache/logging/log4j/scalasample/LoggingApp.scala
delete mode 100644 log4j-slf4j-impl/.gitignore
copy log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/{Log4j1222Test.java => Log4j2_1482_Slf4jTest.java} (55%)
create mode 100644 log4j-slf4j-impl/src/test/resources/log4j2-1482.xml
delete mode 100644 log4j-taglib/.gitignore
delete mode 100644 log4j-to-slf4j/.gitignore
delete mode 100644 log4j-web/.gitignore
delete mode 100644 src/ide/Intellij/13/IntellijSettings.jar
delete mode 100644 src/ide/eclipse/4.3.2/organize-imports.importorder
--
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