[apache-log4j2] 04/15: Merge tag 'upstream/2.5'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Fri Jul 8 14:22:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository apache-log4j2.
commit 79083e4814418dea23ec8f615a0fda5fc06dcbb2
Merge: ae40b1f 0b0c34a
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Fri Jul 8 15:05:24 2016 +0200
Merge tag 'upstream/2.5'
Upstream version 2.5
BUILDING.txt | 89 +-
RELEASE-NOTES.txt | 90 +-
log4j-1.2-api/pom.xml | 2 +-
.../src/main/java/org/apache/log4j/LogManager.java | 444 +-
.../test/java/org/apache/log4j/LogWithMDCTest.java | 39 +-
.../java/org/apache/log4j/LogWithRouteTest.java | 53 +
.../src/test/resources/log-RouteWithMDC.xml | 35 +-
.../src/test/resources/logWithMDC.xml | 25 +-
log4j-api/pom.xml | 2 +-
.../main/java/org/apache/logging/log4j/Level.java | 5 +-
.../java/org/apache/logging/log4j/LogManager.java | 5 +-
.../log4j/message/LocalizedMessageFactory.java | 5 +-
.../apache/logging/log4j/message/MapMessage.java | 11 +
.../ParameterizedNoReferenceMessageFactory.java | 58 +
.../log4j/message/SimpleMessageFactory.java | 54 +
.../log4j/message/StructuredDataMessage.java | 12 +
.../logging/log4j/simple/SimpleLoggerContext.java | 29 +-
.../apache/logging/log4j/spi/LoggerContext.java | 16 +
.../apache/logging/log4j/spi/LoggerContextKey.java | 45 +
.../org/apache/logging/log4j/spi/Provider.java | 40 +-
.../apache/logging/log4j/status/StatusLogger.java | 16 +-
.../org/apache/logging/log4j/util/LoaderUtil.java | 27 +-
.../apache/logging/log4j/util/PropertiesUtil.java | 8 +
.../apache/logging/log4j/util/ProviderUtil.java | 4 +-
.../apache/logging/log4j/util/StringBuilders.java | 2 +-
.../java/org/apache/logging/log4j/LoggerTest.java | 15 +-
.../apache/logging/log4j/TestLoggerContext.java | 14 +-
.../logging/log4j/message/MapMessageTest.java | 11 +
.../log4j/message/StructuredDataMessageTest.java | 14 +-
.../apache/logging/log4j/util/LambdaUtilTest.java | 2 +-
log4j-bom/pom.xml | 4 +-
log4j-core/pom.xml | 14 +-
.../logging/log4j/core/LogEventListener.java | 3 +
.../java/org/apache/logging/log4j/core/Logger.java | 88 +-
.../apache/logging/log4j/core/LoggerContext.java | 76 +-
.../core/{net/Protocol.java => StringLayout.java} | 71 +-
.../log4j/core/appender/AbstractManager.java | 26 +
.../appender/AbstractOutputStreamAppender.java | 14 +-
...amAppender.java => AbstractWriterAppender.java} | 105 +-
.../logging/log4j/core/appender/AsyncAppender.java | 5 +-
.../log4j/core/appender/ConsoleAppender.java | 117 +-
.../logging/log4j/core/appender/FileManager.java | 2 +-
.../core/appender/MemoryMappedFileAppender.java | 3 +-
.../core/appender/MemoryMappedFileManager.java | 19 +-
.../log4j/core/appender/OutputStreamAppender.java | 191 +
.../log4j/core/appender/OutputStreamManager.java | 8 +-
.../core/appender/RandomAccessFileManager.java | 5 +-
.../log4j/core/appender/RollingFileAppender.java | 2 +-
.../appender/RollingRandomAccessFileAppender.java | 4 +-
.../log4j/core/appender/SocketAppender.java | 146 +-
.../log4j/core/appender/TlsSyslogFrame.java | 30 +-
.../log4j/core/appender/WriterAppender.java | 183 +
...OutputStreamManager.java => WriterManager.java} | 139 +-
.../core/appender/db/AbstractDatabaseManager.java | 6 +-
.../core/appender/db/jdbc/JdbcDatabaseManager.java | 4 +-
.../core/appender/db/jpa/JpaDatabaseManager.java | 2 +-
.../converter/ContextStackAttributeConverter.java | 2 +-
.../ContextStackJsonAttributeConverter.java | 2 +-
.../appender/db/jpa/converter/package-info.java | 11 +-
.../core/appender/mom/jeromq/JeroMqAppender.java | 3 +-
.../core/appender/mom/kafka/KafkaAppender.java | 25 +-
.../core/appender/mom/kafka/KafkaManager.java | 3 +-
.../rolling/CompositeTriggeringPolicy.java | 12 +-
.../appender/rolling/CronTriggeringPolicy.java | 131 +
.../appender/rolling/DefaultRolloverStrategy.java | 233 +-
.../log4j/core/appender/rolling/FileSize.java | 90 +
.../core/appender/rolling/RollingFileManager.java | 71 +-
.../rolling/RollingRandomAccessFileManager.java | 25 +-
.../rolling/SizeBasedTriggeringPolicy.java | 61 +-
.../rolling/TimeBasedTriggeringPolicy.java | 2 +-
.../appender/rolling/action/AbstractAction.java | 5 +
.../rolling/action/AbstractPathAction.java | 163 +
.../rolling/action/CommonsCompressAction.java | 16 +
.../appender/rolling/action/CompositeAction.java | 9 +
.../core/appender/rolling/action/DeleteAction.java | 218 +
.../appender/rolling/action/DeletingVisitor.java | 97 +
.../core/appender/rolling/action/Duration.java | 257 +
.../appender/rolling/action/FileRenameAction.java | 56 +-
.../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 | 85 +
.../rolling/action/PathSorter.java} | 65 +-
.../rolling/action/PathWithAttributes.java | 59 +
.../appender/rolling/action/ScriptCondition.java | 118 +
.../appender/rolling/action/SortingVisitor.java | 58 +
.../appender/rolling/action/ZipCompressAction.java | 16 +
.../core/appender/routing/IdlePurgePolicy.java | 158 +
.../routing/PurgePolicy.java} | 43 +-
.../core/appender/routing/RoutingAppender.java | 34 +-
.../logging/log4j/core/async/AsyncLogger.java | 481 +-
.../log4j/core/async/AsyncLoggerConfig.java | 34 +-
.../core/async/AsyncLoggerConfigDelegate.java | 52 +
...Helper.java => AsyncLoggerConfigDisruptor.java} | 264 +-
.../log4j/core/async/AsyncLoggerContext.java | 80 +-
.../core/async/AsyncLoggerContextSelector.java | 47 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 216 +
.../log4j/core/async/DaemonThreadFactory.java | 8 +-
.../logging/log4j/core/async/DisruptorUtil.java | 118 +
.../log4j/core/async/RingBufferLogEvent.java | 38 +-
.../core/async/RingBufferLogEventTranslator.java | 56 +-
.../core/async/ThreadNameCachingStrategy.java | 63 +
.../log4j/core/config/AbstractConfiguration.java | 331 +-
.../logging/log4j/core/config/AppenderControl.java | 6 +
.../logging/log4j/core/config/AppendersPlugin.java | 5 +-
.../config/AwaitCompletionReliabilityStrategy.java | 1 +
.../logging/log4j/core/config/Configuration.java | 42 +-
.../log4j/core/config/ConfigurationFactory.java | 3 +-
.../log4j/core/config/ConfigurationMonitor.java | 37 -
.../log4j/core/config/ConfigurationScheduler.java | 189 +
.../log4j/core/config/ConfigurationSource.java | 81 +-
.../log4j/core/config/ConfiguratonFileWatcher.java | 66 +
.../log4j/core/config/CronScheduledFuture.java | 76 +
.../log4j/core/config/DefaultConfiguration.java | 32 +-
.../core/config/FileConfigurationMonitor.java | 118 -
.../core/config/LockingReliabilityStrategy.java | 1 +
.../logging/log4j/core/config/LoggerConfig.java | 13 +-
.../log4j/core/config/PropertiesPlugin.java | 2 +-
.../core/config/ReliabilityStrategyFactory.java | 2 +-
.../{plugins/PluginFactory.java => Scheduled.java} | 10 +-
...onfigurationMonitor.java => ScriptsPlugin.java} | 34 +-
.../log4j/core/config/builder/api/Component.java | 4 +-
.../config/builder/api/ConfigurationBuilder.java | 50 +
.../builder/api/ConfigurationBuilderFactory.java | 2 +-
.../api/ScriptComponentBuilder.java} | 14 +-
.../builder/api/ScriptFileComponentBuilder.java} | 28 +-
.../util => builder/api}/package-info.java | 11 +-
.../config/builder/impl/BuiltConfiguration.java | 19 +-
.../builder/impl/DefaultComponentBuilder.java | 1 +
.../builder/impl/DefaultConfigurationBuilder.java | 38 +
.../impl/DefaultScriptComponentBuilder.java} | 30 +-
.../impl/DefaultScriptFileComponentBuilder.java | 57 +
.../{plugins => builder/impl}/package-info.java | 11 +-
.../log4j/core/config/json/JsonConfiguration.java | 11 +-
.../logging/log4j/core/config/plugins/Plugin.java | 6 +-
.../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 | 6 +-
.../core/config/plugins/processor/PluginEntry.java | 6 +-
.../config/plugins/processor/PluginProcessor.java | 16 +-
.../config/plugins/processor/package-info.java | 6 +-
.../core/config/plugins/util/PluginBuilder.java | 51 +-
.../core/config/plugins/util/PluginRegistry.java | 6 +-
.../core/config/plugins/util/ResolverUtil.java | 4 +-
.../core/config/plugins/util/package-info.java | 6 +-
.../plugins/validation/ConstraintValidator.java | 5 +-
.../validation/validators/RequiredValidator.java | 18 +-
.../plugins/visitors/AbstractPluginVisitor.java | 6 +-
.../plugins/visitors/PluginAttributeVisitor.java | 6 +-
.../visitors/PluginBuilderAttributeVisitor.java | 6 +-
.../visitors/PluginConfigurationVisitor.java | 6 +-
.../plugins/visitors/PluginElementVisitor.java | 8 +-
.../config/plugins/visitors/PluginNodeVisitor.java | 6 +-
.../plugins/visitors/PluginValueVisitor.java | 6 +-
.../config/plugins/visitors/PluginVisitor.java | 6 +-
.../config/plugins/visitors/PluginVisitors.java | 7 +-
.../core/config/plugins/visitors/package-info.java | 6 +-
.../properties/PropertiesConfigurationFactory.java | 57 +
.../{plugins => properties}/package-info.java | 11 +-
.../core/config/status/StatusConfiguration.java | 6 +-
.../log4j/core/config/xml/XmlConfiguration.java | 11 +-
.../log4j/core/filter/LevelRangeFilter.java | 4 +-
.../logging/log4j/core/filter/ScriptFilter.java | 155 +
.../log4j/core/impl/Log4jContextFactory.java | 36 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 5 +-
.../core/jackson/ListOfMapEntryDeserializer.java | 2 +-
.../core/jackson/ListOfMapEntrySerializer.java | 2 -
.../logging/log4j/core/jackson/MapEntry.java | 6 +-
.../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 | 19 +-
.../log4j/core/layout/AbstractCsvLayout.java | 3 +-
.../log4j/core/layout/AbstractStringLayout.java | 109 +-
.../logging/log4j/core/layout/PatternLayout.java | 24 +-
.../logging/log4j/core/layout/Rfc5424Layout.java | 2 +-
.../log4j/core/layout/ScriptPatternSelector.java | 144 +
.../logging/log4j/core/lookup/Log4jLookup.java | 15 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 18 +-
.../apache/logging/log4j/core/net/Priority.java | 2 +-
.../apache/logging/log4j/core/net/Protocol.java | 4 +-
.../apache/logging/log4j/core/net/SmtpManager.java | 18 +-
.../log4j/core/net/mom/jms/JmsQueueReceiver.java | 2 +-
.../log4j/core/net/mom/jms/JmsTopicReceiver.java | 2 +-
.../log4j/core/net/mom/jms/package-info.java | 2 +-
.../core/net/server/AbstractSocketServer.java | 3 +-
.../logging/log4j/core/net/server/JmsServer.java | 1 -
.../core/net/server/SecureTcpSocketServer.java | 4 +-
.../log4j/core/net/server/TcpSocketServer.java | 103 +-
.../log4j/core/net/server/UdpSocketServer.java | 41 +-
.../core/net/ssl/StoreConfigurationException.java | 30 +-
.../apache/logging/log4j/core/osgi/Activator.java | 6 +-
.../logging/log4j/core/osgi/package-info.java | 6 +-
.../pattern/ExtendedThrowablePatternConverter.java | 2 +-
.../core/pattern/NanoTimePatternConverter.java | 14 +-
.../pattern/RootThrowablePatternConverter.java | 2 +-
.../logging/log4j/core/pattern/StyleConverter.java | 52 +-
.../VariablesNotEmptyReplacementConverter.java | 26 +-
.../AbstractScript.java} | 39 +-
.../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 +
.../{config/plugins => script}/package-info.java | 11 +-
.../core/selector/ClassLoaderContextSelector.java | 46 +-
.../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 +
.../CloseShieldWriter.java} | 83 +-
.../logging/log4j/core/util/CoarseCachedClock.java | 2 +-
.../apache/logging/log4j/core/util/Constants.java | 12 +-
.../logging/log4j/core/util/CronExpression.java | 1627 +++++
.../core/util/DefaultShutdownCallbackRegistry.java | 10 +-
.../log4j/core/util/ExtensionLanguageMapping.java | 71 +
.../apache/logging/log4j/core/util/FileUtils.java | 12 +
.../package-info.java => util/FileWatcher.java} | 16 +-
.../apache/logging/log4j/core/util/IOUtils.java | 130 +
.../logging/log4j/core/util/Log4jThread.java | 69 +
.../log4j/core/util/StringBuilderWriter.java | 164 +
.../logging/log4j/core/util/StringEncoder.java | 111 +
.../logging/log4j/core/util/WatchManager.java | 110 +
.../log4j/core/util/datetime/DateParser.java | 10 +-
.../log4j/core/util/datetime/DatePrinter.java | 10 +-
.../log4j/core/util/datetime/FastDateFormat.java | 10 +-
.../log4j/core/util/datetime/FastDateParser.java | 15 +-
.../log4j/core/util/datetime/FastDatePrinter.java | 13 +-
.../log4j/core/util/datetime/FormatCache.java | 10 +-
log4j-core/src/site/xdoc/index.xml | 25 +-
.../logging/log4j/categories/PerformanceTests.java | 6 +-
.../logging/log4j/categories/package-info.java | 6 +-
.../apache/logging/log4j/core/HostNameTest.java | 2 +-
.../apache/logging/log4j/core/LogEventTest.java | 3 +
.../apache/logging/log4j/core/LoggerDateTest.java | 2 +-
.../log4j/core/LoggerSerializationTest.java | 2 -
.../org/apache/logging/log4j/core/LoggerTest.java | 30 +-
.../org/apache/logging/log4j/core/LookupTest.java | 2 +-
.../logging/log4j/core/PatternSelectorTest.java | 58 +-
.../log4j/core/appender/AsyncAppenderTest.java | 32 +-
.../core/appender/ConfigurationTestUtils.java} | 79 +-
.../log4j/core/appender/ConsoleAppenderTest.java | 14 +-
.../log4j/core/appender/HangingAppender.java | 29 +-
...AppenderTest.java => InMemoryAppenderTest.java} | 4 +-
.../appender/JsonCompleteFileAppenderTest.java | 5 +-
.../MemoryMappedFileAppenderLocationTest.java | 9 +-
.../MemoryMappedFileAppenderRemapTest.java | 9 +-
.../MemoryMappedFileAppenderSimpleTest.java | 9 +-
.../core/appender/OutputStreamAppenderTest.java | 185 +-
.../appender/RandomAccessFileAppenderTests.java | 5 +-
.../core/appender/RandomAccessFileManagerTest.java | 20 +-
.../log4j/core/appender/SocketAppenderTest.java | 36 +-
.../log4j/core/appender/WriterAppenderTest.java | 104 +
.../core/appender/XmlCompactFileAppenderTest.java | 4 +-
.../core/appender/XmlCompleteFileAppenderTest.java | 4 +-
.../log4j/core/appender/XmlFileAppenderTest.java | 4 +-
.../appender/XmlRandomAccessFileAppenderTest.java | 4 +-
.../appender/db/jdbc/AbstractJdbcAppenderTest.java | 5 +-
.../core/appender/mom/kafka/KafkaAppenderTest.java | 41 +-
.../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 | 104 +
.../appender/rolling/RollingAppenderSizeTest.java | 8 +-
.../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} | 87 +-
.../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/RoutingAppenderWithJndiTest.java | 4 +-
.../routing/RoutingAppenderWithPurgingTest.java | 113 +
.../routing/RoutingDefaultAppenderTest.java | 2 +-
...syncLoggerContextSelectorInitialStateTest.java} | 28 +-
.../core/async/AsyncLoggerContextSelectorTest.java | 14 +-
.../log4j/core/async/AsyncLoggerLocationTest.java | 6 +-
.../logging/log4j/core/async/AsyncLoggerTest.java | 20 +-
.../log4j/core/async/AsyncLoggerTestNanoTime.java | 17 +-
.../core/async/AsyncLoggerThreadContextTest.java | 2 +-
.../async/AsyncLoggerThreadNameStrategyTest.java | 24 +-
.../async/AsyncLoggerTimestampMessageTest.java | 2 +-
.../async/AsyncLoggersWithAsyncAppenderTest.java | 37 +-
.../AsyncLoggersWithAsyncLoggerConfigTest.java | 37 +-
.../log4j/core/async/perftest/IPerfTestRunner.java | 6 +-
.../{MtPerfTest.java => MultiThreadPerfTest.java} | 4 +-
.../log4j/core/async/perftest/PerfTest.java | 5 +-
.../log4j/core/async/perftest/PerfTestDriver.java | 215 +-
.../log4j/core/config/ConfigurationTest.java | 11 +-
.../log4j/core/config/MissingRootLoggerTest.java | 4 +-
.../core/config/ReconfigurationDeadlockTest.java | 2 +-
.../log4j/core/config/TestConfigurator.java | 44 +-
.../logging/log4j/core/config/XIncludeTest.java | 11 +-
.../config/builder/CustomConfigurationFactory.java | 1 +
.../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 | 14 +-
.../properties/PropertiesConfigurationTest.java | 14 +-
.../properties/RollingFilePropertiesTest.java | 15 +-
.../core/filter/AbstractScriptFilterTest.java | 74 +
.../logging/log4j/core/filter/MapFilterTest.java | 23 +-
.../filter/ScriptFileFilterPropertiesTest.java} | 31 +-
.../log4j/core/filter/ScriptFileFilterTest.java} | 31 +-
.../log4j/core/filter/ScriptFilterTest.java} | 31 +-
.../log4j/core/filter/ScriptRefFilterTest.java} | 31 +-
.../core/filter/StructuredDataFilterTest.java | 15 +-
.../log4j/core/layout/PatternLayoutTest.java | 30 +
.../log4j/core/layout/SerializableLayoutTest.java | 66 +
.../logging/log4j/core/lookup/Log4jLookupTest.java | 6 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 4 +-
.../core/net/server/AbstractSocketServerTest.java | 32 +-
.../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/ThreadNameFilter.java} | 73 +-
.../core/net/server/UdpJsonSocketServerTest.java | 3 +-
.../net/server/UdpSerializedSocketServerTest.java | 3 +-
.../core/net/server/UdpXmlSocketServerTest.java | 3 +-
.../log4j/core/net/ssl/SslConfigurationTest.java | 17 +-
.../apache/logging/log4j/core/util/Compare.java | 15 +-
.../log4j/core/util/CronExpressionTest.java | 68 +
.../logging/log4j/core/util/NetUtilsTest.java | 3 +-
.../log4j/core/util/UnexpectedFormatException.java | 6 +-
.../logging/log4j/core/util/WatchManagerTest.java | 94 +
.../core/util/datetime/FixedDateFormatTest.java | 15 +-
.../logging/log4j/junit/LoggerContextRule.java | 46 +-
.../apache/logging/log4j/junit/package-info.java | 6 +-
.../logging/log4j/test/AvailablePortFinder.java | 6 +-
.../log4j/test/layout/SerializableLayout.java | 48 +
.../src/test/resources/JeroMqAppenderTest.xml | 2 +-
.../src/test/resources/KafkaAppenderTest.xml | 5 +
.../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 +-
.../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 | 49 +-
.../{log4j-filetest.xml => log4j-rolling-cron.xml} | 24 +-
...{log4j-filetest.xml => log4j-rolling-cron2.xml} | 24 +-
...4j-rolling-with-custom-delete-accum-count1.xml} | 45 +-
...4j-rolling-with-custom-delete-accum-count2.xml} | 45 +-
...og4j-rolling-with-custom-delete-accum-size.xml} | 32 +-
... log4j-rolling-with-custom-delete-maxdepth.xml} | 31 +-
...=> log4j-rolling-with-custom-delete-nested.xml} | 47 +-
...j-rolling-with-custom-delete-script-fri13th.xml | 76 +
.../log4j-rolling-with-custom-delete-script.xml | 76 +
...-rolling-with-custom-delete-unconditional1.xml} | 30 +-
...-rolling-with-custom-delete-unconditional2.xml} | 31 +-
...-rolling-with-custom-delete-unconditional3.xml} | 31 +-
...62.xml => log4j-rolling-with-custom-delete.xml} | 31 +-
.../src/test/resources/log4j-routing-purge.xml | 81 +
.../src/test/resources/log4j-script-filters.xml | 60 +
.../resources/log4j-scriptFile-filters.properties | 63 +
...rnSelector.xml => log4j-scriptFile-filters.xml} | 22 +-
.../src/test/resources/log4j-scriptRef-filters.xml | 47 +
log4j-core/src/test/resources/log4j2-962.xml | 2 +-
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/pom.xml | 2 +-
log4j-flume-ng/pom.xml | 2 +-
.../flume/appender/FlumePersistentManager.java | 13 +-
.../src/test/resources/default_embedded.xml | 4 +-
log4j-flume-ng/src/test/resources/embedded.xml | 4 +-
log4j-iostreams/pom.xml | 2 +-
.../log4j/io/AbstractLoggerOutputStreamTest.java | 15 +-
log4j-jcl/pom.xml | 2 +-
log4j-jmx-gui/pom.xml | 2 +-
log4j-jul/pom.xml | 2 +-
.../apache/logging/log4j/jul/ApiLoggerAdapter.java | 80 +-
.../logging/log4j/jul/CoreLoggerAdapter.java | 80 +-
.../logging/log4j/jul/AbstractLoggerTest.java | 135 +-
.../apache/logging/log4j/jul/ApiLoggerTest.java | 16 +-
.../apache/logging/log4j/jul/CoreLoggerTest.java | 8 +
log4j-jul/src/test/resources/log4j2-test.xml | 4 +
log4j-liquibase/pom.xml | 2 +-
log4j-nosql/pom.xml | 2 +-
.../nosql/appender/mongodb/MongoDbConnection.java | 5 +-
log4j-perf/pom.xml | 2 +-
.../perf/jmh/AsyncAppenderLogbackBenchmark.java | 2 +-
.../log4j/perf/jmh/JdbcAppenderBenchmark.java | 5 +-
.../ThreadLocalVsConcurrentHashMapBenchmark.java | 94 +
log4j-samples/configuration/pom.xml | 2 +-
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 | 2 +-
log4j-slf4j-impl/pom.xml | 2 +-
log4j-taglib/pom.xml | 2 +-
.../log4j/taglib/Log4jTaglibLoggerContext.java | 33 +-
log4j-to-slf4j/pom.xml | 2 +-
.../apache/logging/slf4j/SLF4JLoggerContext.java | 15 +-
log4j-web/pom.xml | 2 +-
.../logging/log4j/web/Log4jWebInitializerImpl.java | 18 +-
.../log4j/web/Log4jWebInitializerImplTest.java | 74 +-
.../resources/WEB-INF/classes/log4j-servlet.xml | 64 +-
pom.xml | 37 +-
src/changes/announcement.vm | 14 +-
src/changes/changes.xml | 121 +-
src/site/resources/images/YourKitLogo.png | Bin 0 -> 5554 bytes
src/site/resources/images/whichjar-2.x.png | Bin 0 -> 68381 bytes
src/site/resources/images/whichjar-slf4j-2.x.png | Bin 0 -> 26650 bytes
src/site/resources/images/whichjar.xlsx | Bin 14687 -> 14681 bytes
src/site/site.xml | 21 +-
src/site/xdoc/build.xml.vm | 2 +-
src/site/xdoc/faq.xml | 25 +-
src/site/xdoc/index.xml | 5 +
src/site/xdoc/manual/api.xml | 19 +-
src/site/xdoc/manual/appenders.xml | 7348 +++++++++++---------
src/site/xdoc/manual/architecture.xml | 2 +-
src/site/xdoc/manual/configuration.xml.vm | 179 +-
src/site/xdoc/manual/customconfig.xml | 51 +-
src/site/xdoc/manual/extending.xml | 3 +-
src/site/xdoc/manual/filters.xml | 123 +
src/site/xdoc/manual/index.xml | 8 +-
src/site/xdoc/manual/layouts.xml.vm | 59 +-
src/site/xdoc/manual/plugins.xml | 31 +-
src/site/xdoc/manual/thread-context.xml | 278 +-
src/site/xdoc/runtime-dependencies.xml | 32 +-
src/site/xdoc/thanks.xml | 103 +
456 files changed, 19996 insertions(+), 7540 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git
More information about the pkg-java-commits
mailing list