You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/05/06 14:44:00 UTC
[50/50] logging-log4j2 git commit: Merge branch 'master' into
LOG4J-1181
Merge branch 'master' into LOG4J-1181
Conflicts:
log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java
log4j-perf/src/main/java/org/apache/logging/log4j/perf/jmh/SimpleBenchmark.java
log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/Log4j1222Test.java
src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/afd417ce
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/afd417ce
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/afd417ce
Branch: refs/heads/LOG4J-1181
Commit: afd417ce965fd6100134ac775aef1be98a927250
Parents: 5f9ad0e 759fa37
Author: Mikael St�ldal <mi...@magine.com>
Authored: Fri May 6 16:41:45 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Fri May 6 16:41:45 2016 +0200
----------------------------------------------------------------------
BUILDING.txt | 2 +-
NOTICE.txt | 2 +-
README.md | 23 +
Vagrantfile | 2 +-
log4j-1.2-api/pom.xml | 7 +-
.../main/java/org/apache/log4j/Category.java | 34 +-
.../config/Log4j1ConfigurationFactory.java | 314 ++
.../org/apache/log4j/spi/LoggerFactory.java | 9 +-
log4j-1.2-api/src/site/xdoc/index.xml | 3 +-
.../config/Log4j1ConfigurationFactoryTest.java | 88 +
...g4j-console-EnhancedPatternLayout.properties | 19 +
.../log4j-console-HtmlLayout.properties | 18 +
.../log4j-console-PatternLayout.properties | 19 +
.../log4j-console-SimpleLayout.properties | 18 +
.../log4j-console-TTCCLayout.properties | 18 +
.../log4j-console-XmlLayout.properties | 18 +
log4j-api/pom.xml | 27 +-
.../logging/log4j/CloseableThreadContext.java | 172 +
.../org/apache/logging/log4j/LogManager.java | 136 +-
.../java/org/apache/logging/log4j/Logger.java | 3008 ++++++++++++++++--
.../org/apache/logging/log4j/MarkerManager.java | 60 +-
.../log4j/message/AbstractMessageFactory.java | 12 +-
.../message/DefaultFlowMessageFactory.java | 207 ++
.../logging/log4j/message/EntryMessage.java | 26 +
.../logging/log4j/message/ExitMessage.java | 26 +
.../logging/log4j/message/FlowMessage.java | 39 +
.../log4j/message/FlowMessageFactory.java | 58 +
.../logging/log4j/message/FormattedMessage.java | 197 +-
.../log4j/message/FormattedMessageFactory.java | 7 +
.../logging/log4j/message/LocalizedMessage.java | 5 +
.../log4j/message/LocalizedMessageFactory.java | 11 +-
.../apache/logging/log4j/message/Message.java | 13 +
.../logging/log4j/message/MessageFactory2.java | 179 ++
.../log4j/message/MessageFormatMessage.java | 29 +-
.../message/MessageFormatMessageFactory.java | 8 +-
.../log4j/message/ObjectArrayMessage.java | 6 +-
.../logging/log4j/message/ObjectMessage.java | 27 +-
.../log4j/message/ParameterFormatter.java | 637 ++++
.../log4j/message/ParameterizedMessage.java | 627 +---
.../message/ParameterizedMessageFactory.java | 14 +-
.../ParameterizedNoReferenceMessageFactory.java | 51 +-
.../logging/log4j/message/ReusableMessage.java | 72 +
.../log4j/message/ReusableMessageFactory.java | 187 ++
.../log4j/message/ReusableObjectMessage.java | 118 +
.../message/ReusableParameterizedMessage.java | 292 ++
.../log4j/message/ReusableSimpleMessage.java | 105 +
.../logging/log4j/message/SimpleMessage.java | 65 +-
.../log4j/message/SimpleMessageFactory.java | 3 +-
.../log4j/message/StringFormattedMessage.java | 31 +-
.../message/StringFormatterMessageFactory.java | 8 +-
.../log4j/message/ThreadDumpMessage.java | 21 +-
.../logging/log4j/simple/SimpleLogger.java | 83 +-
.../log4j/simple/SimpleLoggerContext.java | 24 +-
.../logging/log4j/spi/AbstractLogger.java | 1625 +++++++++-
.../logging/log4j/spi/ExtendedLogger.java | 394 ++-
.../log4j/spi/ExtendedLoggerWrapper.java | 96 +-
.../logging/log4j/spi/LoggerContextKey.java | 4 +-
.../logging/log4j/spi/LoggerRegistry.java | 182 ++
.../log4j/spi/MessageFactory2Adapter.java | 118 +
.../apache/logging/log4j/spi/StandardLevel.java | 2 +-
.../apache/logging/log4j/spi/Terminable.java | 32 +
.../logging/log4j/status/StatusLogger.java | 93 +-
.../apache/logging/log4j/util/LambdaUtil.java | 24 +-
.../apache/logging/log4j/util/LoaderUtil.java | 10 +-
.../logging/log4j/util/LowLevelLogUtil.java | 67 +
.../logging/log4j/util/MessageSupplier.java | 2 +
.../log4j/util/PerformanceSensitive.java | 37 +
.../logging/log4j/util/PropertiesUtil.java | 91 +-
.../apache/logging/log4j/util/ProviderUtil.java | 2 +-
.../logging/log4j/util/ReflectionUtil.java | 7 +-
.../log4j/util/StringBuilderFormattable.java | 33 +
.../org/apache/logging/log4j/util/Strings.java | 12 +
.../org/apache/logging/log4j/util/Unbox.java | 176 +
.../java/org/apache/log4j/util/SerialUtil.java | 65 -
.../java/org/apache/log4j/util/StringsTest.java | 36 -
.../logging/log4j/AbstractLoggerTest.java | 395 ++-
.../log4j/CloseableThreadContextTest.java | 120 +
.../apache/logging/log4j/EventLoggerTest.java | 2 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 154 +-
.../apache/logging/log4j/LogManagerTest.java | 7 +
.../logging/log4j/LoggerSupplierTest.java | 235 ++
.../org/apache/logging/log4j/LoggerTest.java | 970 +++---
.../org/apache/logging/log4j/TestLogger.java | 73 +
.../java/org/apache/logging/log4j/Timer.java | 184 +-
.../logging/log4j/junit/BundleTestInfo.java | 66 +
.../org/apache/logging/log4j/junit/Mutable.java | 35 +
.../apache/logging/log4j/junit/OsgiRule.java | 68 +
.../apache/logging/log4j/junit/SerialUtil.java | 65 +
.../log4j/message/FormattedMessageTest.java | 41 +-
.../logging/log4j/message/JsonMessage.java | 66 +
.../log4j/message/LocalizedMessageTest.java | 1 +
.../log4j/message/MessageFormatMessageTest.java | 23 +-
.../apache/logging/log4j/message/Mutable.java | 34 -
.../log4j/message/ObjectMessageTest.java | 3 +-
.../log4j/message/ParameterFormatterTest.java | 191 ++
.../log4j/message/ParameterizedMessageTest.java | 30 +-
.../message/ReusableObjectMessageTest.java | 122 +
.../ReusableParameterizedMessageTest.java | 128 +
.../message/ReusableSimpleMessageTest.java | 122 +
.../message/StringFormattedMessageTest.java | 22 +-
.../log4j/message/ThreadDumpMessageTest.java | 6 +-
.../log4j/osgi/AbstractLoadBundleTest.java | 142 +-
.../logging/log4j/osgi/BundleTestInfo.java | 84 -
.../org/apache/logging/log4j/osgi/OsgiRule.java | 69 -
.../logging/log4j/util/PropertiesUtilTest.java | 65 +
.../logging/log4j/util/ReflectionUtilTest.java | 2 +
.../apache/logging/log4j/util/StringsTest.java | 9 +
.../apache/logging/log4j/util/UnboxTest.java | 157 +
.../resources/PropertiesUtilTest.properties | 29 +
log4j-bom/pom.xml | 2 +-
log4j-core/pom.xml | 21 +-
.../logging/log4j/core/AbstractLifeCycle.java | 6 +-
.../logging/log4j/core/AbstractLogEvent.java | 10 +
.../org/apache/logging/log4j/core/Appender.java | 10 +-
.../org/apache/logging/log4j/core/Filter.java | 171 +
.../org/apache/logging/log4j/core/Layout.java | 22 +-
.../apache/logging/log4j/core/LifeCycle.java | 2 +-
.../org/apache/logging/log4j/core/LogEvent.java | 18 +-
.../org/apache/logging/log4j/core/Logger.java | 259 +-
.../logging/log4j/core/LoggerContext.java | 42 +-
.../log4j/core/appender/AbstractAppender.java | 2 -
.../appender/AbstractOutputStreamAppender.java | 44 +-
.../core/appender/AbstractWriterAppender.java | 2 -
.../log4j/core/appender/AsyncAppender.java | 195 +-
.../log4j/core/appender/ConsoleAppender.java | 15 +-
.../core/appender/CountingNoOpAppender.java | 56 +
.../core/appender/DefaultErrorHandler.java | 9 +-
.../log4j/core/appender/FailoverAppender.java | 2 -
.../log4j/core/appender/FileAppender.java | 7 +-
.../log4j/core/appender/FileManager.java | 39 +-
.../core/appender/MemoryMappedFileAppender.java | 12 +-
.../core/appender/MemoryMappedFileManager.java | 35 +-
.../core/appender/OutputStreamAppender.java | 2 -
.../core/appender/OutputStreamManager.java | 157 +-
.../core/appender/RandomAccessFileAppender.java | 10 +-
.../core/appender/RandomAccessFileManager.java | 50 +-
.../core/appender/RollingFileAppender.java | 3 +-
.../RollingRandomAccessFileAppender.java | 19 +-
.../log4j/core/appender/SmtpAppender.java | 1 -
.../log4j/core/appender/SocketAppender.java | 32 +-
.../log4j/core/appender/SyslogAppender.java | 1 -
.../log4j/core/appender/TlsSyslogFrame.java | 64 +-
.../log4j/core/appender/WriterAppender.java | 2 -
.../appender/db/AbstractDatabaseAppender.java | 1 -
.../core/appender/db/jdbc/JdbcAppender.java | 1 -
.../db/jpa/AbstractLogEventWrapperEntity.java | 20 +
.../appender/db/jpa/BasicLogEventEntity.java | 22 +
.../log4j/core/appender/db/jpa/JpaAppender.java | 12 +-
.../log4j/core/appender/mom/JmsAppender.java | 11 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../appender/mom/jeromq/JeroMqAppender.java | 234 +-
.../core/appender/mom/jeromq/JeroMqManager.java | 220 ++
.../core/appender/mom/kafka/KafkaAppender.java | 22 +-
.../core/appender/mom/kafka/KafkaManager.java | 4 +
.../core/appender/rewrite/RewriteAppender.java | 2 -
.../appender/rolling/CronTriggeringPolicy.java | 1 +
.../rolling/DefaultRolloverStrategy.java | 190 +-
.../core/appender/rolling/PatternProcessor.java | 582 ++--
.../appender/rolling/RollingFileManager.java | 64 +-
.../rolling/RollingRandomAccessFileManager.java | 54 +-
.../appender/rolling/action/DeleteAction.java | 432 ++-
.../action/PathSortByModificationTime.java | 6 +-
.../core/appender/routing/IdlePurgePolicy.java | 99 +-
.../core/appender/routing/RoutingAppender.java | 3 +-
.../log4j/core/async/AsyncEventRouter.java | 7 +-
.../core/async/AsyncEventRouterFactory.java | 50 +-
.../logging/log4j/core/async/AsyncLogger.java | 178 +-
.../log4j/core/async/AsyncLoggerConfig.java | 13 +-
.../core/async/AsyncLoggerConfigDelegate.java | 12 +
.../core/async/AsyncLoggerConfigDisruptor.java | 95 +-
.../log4j/core/async/AsyncLoggerContext.java | 2 -
.../log4j/core/async/AsyncLoggerDisruptor.java | 28 +-
.../core/async/DefaultAsyncEventRouter.java | 5 +-
...efaultAsyncLoggerConfigExceptionHandler.java | 54 +
.../DefaultAsyncLoggerExceptionHandler.java | 52 +
.../core/async/DiscardingAsyncEventRouter.java | 35 +-
.../logging/log4j/core/async/DisruptorUtil.java | 268 +-
.../logging/log4j/core/async/EventRoute.java | 13 +-
.../log4j/core/async/RingBufferLogEvent.java | 252 +-
.../core/async/RingBufferLogEventHandler.java | 21 +-
.../async/RingBufferLogEventTranslator.java | 56 +-
.../core/async/ThreadNameCachingStrategy.java | 9 +-
.../core/config/AbstractConfiguration.java | 68 +-
.../log4j/core/config/AppenderControl.java | 5 +-
.../core/config/AppenderControlArraySet.java | 126 +
.../log4j/core/config/ConfigurationAware.java | 33 +
.../log4j/core/config/ConfigurationFactory.java | 66 +-
.../core/config/ConfigurationScheduler.java | 2 +-
.../log4j/core/config/ConfigurationSource.java | 51 +-
.../core/config/ConfiguratonFileWatcher.java | 8 +-
.../logging/log4j/core/config/Configurator.java | 46 +-
.../log4j/core/config/CronScheduledFuture.java | 12 +-
.../log4j/core/config/DefaultAdvertiser.java | 5 +-
.../log4j/core/config/DefaultConfiguration.java | 2 -
.../logging/log4j/core/config/LoggerConfig.java | 105 +-
.../log4j/core/config/NullConfiguration.java | 1 -
.../log4j/core/config/OrderComparator.java | 4 +-
.../core/config/ReliabilityStrategyFactory.java | 5 +-
.../builder/api/AppenderComponentBuilder.java | 9 +-
.../api/AppenderRefComponentBuilder.java | 9 +-
.../api/CompositeFilterComponentBuilder.java | 14 +-
.../builder/api/ConfigurationBuilder.java | 89 +
.../builder/api/FilterableComponentBuilder.java | 34 +
.../builder/api/LoggableComponentBuilder.java | 33 +
.../builder/api/LoggerComponentBuilder.java | 16 +-
.../builder/api/RootLoggerComponentBuilder.java | 16 +-
.../core/config/builder/api/package-info.java | 2 +
.../config/builder/impl/BuiltConfiguration.java | 23 +-
.../impl/DefaultAppenderComponentBuilder.java | 2 +
.../DefaultAppenderRefComponentBuilder.java | 2 +
...DefaultComponentAndConfigurationBuilder.java | 2 +
.../builder/impl/DefaultComponentBuilder.java | 22 +-
.../DefaultCompositeFilterComponentBuilder.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 86 +-
.../DefaultCustomLevelComponentBuilder.java | 2 +-
.../impl/DefaultFilterComponentBuilder.java | 2 +-
.../impl/DefaultLayoutComponentBuilder.java | 2 +-
.../impl/DefaultLoggerComponentBuilder.java | 33 +-
.../impl/DefaultRootLoggerComponentBuilder.java | 31 +-
.../impl/DefaultScriptComponentBuilder.java | 2 +-
.../impl/DefaultScriptFileComponentBuilder.java | 2 +
.../core/config/builder/impl/package-info.java | 2 +
.../composite/CompositeConfiguration.java | 183 ++
.../config/composite/DefaultMergeStrategy.java | 266 ++
.../core/config/composite/MergeStrategy.java | 41 +
.../core/config/composite/package-info.java | 21 +
.../core/config/json/JsonConfiguration.java | 551 ++--
.../log4j/core/config/plugins/Plugin.java | 3 +
.../config/plugins/processor/PluginCache.java | 12 +-
.../config/plugins/processor/PluginEntry.java | 2 +-
.../core/config/plugins/util/PluginBuilder.java | 11 +-
.../properties/PropertiesConfiguration.java | 8 +-
.../PropertiesConfigurationBuilder.java | 335 ++
.../PropertiesConfigurationFactory.java | 381 +--
.../core/config/status/StatusConfiguration.java | 5 +-
.../log4j/core/config/xml/XmlConfiguration.java | 16 +-
.../core/config/yaml/YamlConfiguration.java | 2 -
.../log4j/core/filter/AbstractFilter.java | 206 +-
.../log4j/core/filter/AbstractFilterable.java | 2 -
.../logging/log4j/core/filter/BurstFilter.java | 7 +-
.../log4j/core/filter/CompositeFilter.java | 402 ++-
.../core/filter/DynamicThresholdFilter.java | 14 +-
.../log4j/core/filter/LevelRangeFilter.java | 2 -
.../logging/log4j/core/filter/MapFilter.java | 2 -
.../logging/log4j/core/filter/MarkerFilter.java | 2 -
.../logging/log4j/core/filter/RegexFilter.java | 2 -
.../logging/log4j/core/filter/ScriptFilter.java | 1 -
.../log4j/core/filter/StructuredDataFilter.java | 2 -
.../core/filter/ThreadContextMapFilter.java | 2 -
.../log4j/core/filter/ThresholdFilter.java | 2 -
.../logging/log4j/core/filter/TimeFilter.java | 37 +-
.../log4j/core/impl/Log4jContextFactory.java | 43 +-
.../logging/log4j/core/impl/Log4jLogEvent.java | 161 +-
.../log4j/core/impl/MutableLogEvent.java | 429 +++
.../core/impl/ReusableLogEventFactory.java | 88 +
.../log4j/core/jackson/Initializers.java | 2 +-
.../core/jackson/Log4jJsonObjectMapper.java | 2 +-
.../core/jackson/Log4jXmlObjectMapper.java | 2 +-
.../log4j/core/jackson/Log4jYamlModule.java | 48 +
.../core/jackson/Log4jYamlObjectMapper.java | 41 +
.../log4j/core/jackson/LogEventMixIn.java | 10 +
.../apache/logging/log4j/core/jmx/Server.java | 12 +-
.../log4j/core/jmx/StatusLoggerAdminMBean.java | 2 +-
.../log4j/core/layout/AbstractCsvLayout.java | 1 -
.../core/layout/AbstractJacksonLayout.java | 18 +-
.../log4j/core/layout/AbstractLayout.java | 76 +-
.../log4j/core/layout/AbstractStringLayout.java | 87 +-
.../core/layout/ByteBufferDestination.java | 47 +
.../log4j/core/layout/CsvLogEventLayout.java | 213 +-
.../log4j/core/layout/CsvParameterLayout.java | 209 +-
.../logging/log4j/core/layout/Encoder.java | 36 +
.../logging/log4j/core/layout/GelfLayout.java | 210 +-
.../logging/log4j/core/layout/HtmlLayout.java | 1 -
.../log4j/core/layout/JacksonFactory.java | 77 +-
.../logging/log4j/core/layout/JsonLayout.java | 12 +-
.../layout/LockingStringBuilderEncoder.java | 69 +
.../core/layout/MarkerPatternSelector.java | 1 -
.../log4j/core/layout/PatternLayout.java | 71 +-
.../logging/log4j/core/layout/PatternMatch.java | 20 +-
.../log4j/core/layout/Rfc5424Layout.java | 23 +-
.../log4j/core/layout/SerializedLayout.java | 2 -
.../log4j/core/layout/StringBuilderEncoder.java | 128 +
.../logging/log4j/core/layout/SyslogLayout.java | 2 -
.../log4j/core/layout/TextEncoderHelper.java | 183 ++
.../logging/log4j/core/layout/XmlLayout.java | 2 -
.../logging/log4j/core/layout/YamlLayout.java | 824 +++++
.../AbstractConfigurationAwareLookup.java | 35 +
.../logging/log4j/core/lookup/Interpolator.java | 6 +-
.../logging/log4j/core/lookup/JndiLookup.java | 5 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 60 +-
.../logging/log4j/core/lookup/MapLookup.java | 2 +-
.../log4j/core/lookup/StrSubstitutor.java | 19 +-
.../apache/logging/log4j/core/net/Facility.java | 131 +-
.../log4j/core/net/MimeMessageBuilder.java | 15 +-
.../log4j/core/net/MulticastDnsAdvertiser.java | 34 +-
.../apache/logging/log4j/core/net/Severity.java | 2 +-
.../logging/log4j/core/net/SmtpManager.java | 22 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../core/net/mom/jms/AbstractJmsReceiver.java | 48 +
.../core/net/mom/jms/JmsQueueReceiver.java | 45 +-
.../core/net/mom/jms/JmsTopicReceiver.java | 44 +-
.../log4j/core/net/server/JmsServer.java | 26 +-
.../log4j/core/net/server/TcpSocketServer.java | 19 +-
.../logging/log4j/core/osgi/Activator.java | 13 +-
.../logging/log4j/core/pattern/AnsiEscape.java | 2 +-
.../core/pattern/ClassNamePatternConverter.java | 2 +-
.../core/pattern/DatePatternConverter.java | 81 +-
.../pattern/EqualsReplacementConverter.java | 48 +-
.../ExtendedThrowablePatternConverter.java | 6 +-
.../core/pattern/LoggerPatternConverter.java | 2 +-
.../log4j/core/pattern/MaxLengthConverter.java | 103 +
.../core/pattern/MessagePatternConverter.java | 20 +-
.../log4j/core/pattern/NameAbbreviator.java | 130 +-
.../core/pattern/NamePatternConverter.java | 7 +-
.../log4j/core/pattern/NdcPatternConverter.java | 52 +-
.../log4j/core/pattern/PatternFormatter.java | 9 +
.../pattern/RootThrowablePatternConverter.java | 6 +-
.../core/pattern/ThreadIdPatternConverter.java | 61 +
.../pattern/ThreadNamePatternConverter.java | 59 +
.../core/pattern/ThreadPatternConverter.java | 59 -
.../pattern/ThreadPriorityPatternConverter.java | 61 +
.../log4j/core/script/ScriptManager.java | 6 +-
.../logging/log4j/core/tools/Generate.java | 470 ++-
.../apache/logging/log4j/core/util/Assert.java | 7 +
.../logging/log4j/core/util/Constants.java | 83 +-
.../logging/log4j/core/util/CronExpression.java | 30 +-
.../util/DefaultShutdownCallbackRegistry.java | 4 +-
.../core/util/ExtensionLanguageMapping.java | 8 +-
.../logging/log4j/core/util/FileUtils.java | 6 +-
.../logging/log4j/core/util/JsonUtils.java | 93 +
.../logging/log4j/core/util/KeyValuePair.java | 25 +-
.../log4j/core/util/ObjectArrayIterator.java | 179 ++
.../logging/log4j/core/util/ReflectionUtil.java | 4 +-
.../logging/log4j/core/util/StringEncoder.java | 12 +-
.../logging/log4j/core/util/Transform.java | 3 +-
.../logging/log4j/core/util/WatchManager.java | 30 +-
.../core/util/datetime/FastDateParser.java | 8 +-
.../core/util/datetime/FastDatePrinter.java | 4 +-
.../core/util/datetime/FixedDateFormat.java | 30 +-
.../log4j/core/util/datetime/FormatCache.java | 4 +-
log4j-core/src/main/resources/Log4j-events.dtd | 4 +-
log4j-core/src/main/resources/Log4j-events.xsd | 2 +
.../logging/log4j/MarkerMixInJsonTest.java | 31 +
.../apache/logging/log4j/MarkerMixInTest.java | 8 +-
.../logging/log4j/MarkerMixInXmlTest.java | 31 +
.../logging/log4j/MarkerMixInYamlTest.java | 31 +
.../log4j/core/AppenderRefLevelJsonTest.java | 12 +-
.../log4j/core/AppenderRefLevelTest.java | 12 +-
.../log4j/core/BasicConfigurationFactory.java | 1 -
.../log4j/core/CustomLevelsWithFiltersTest.java | 8 +-
.../logging/log4j/core/FileConfigTest.java | 69 -
.../core/GcFreeAsynchronousLoggingTest.java | 41 +
.../log4j/core/GcFreeLoggingTestUtil.java | 176 +
.../core/GcFreeMixedSyncAyncLoggingTest.java | 41 +
.../core/GcFreeSynchronousLoggingTest.java | 40 +
.../apache/logging/log4j/core/LogEventTest.java | 2 +
.../apache/logging/log4j/core/LoggerTest.java | 43 +-
.../logging/log4j/core/LoggerUpdateTest.java | 19 +-
.../logging/log4j/core/PatternSelectorTest.java | 22 +-
.../log4j/core/PropertiesFileConfigTest.java | 69 +
.../logging/log4j/core/StrictXmlConfigTest.java | 13 +-
.../log4j/core/TimestampMessageTest.java | 10 +-
.../log4j/core/appender/FileAppenderTest.java | 21 +-
.../appender/JsonCompleteFileAppenderTest.java | 2 +-
.../MemoryMappedFileAppenderLocationTest.java | 16 +-
.../MemoryMappedFileAppenderRemapTest.java | 2 +-
.../MemoryMappedFileAppenderSimpleTest.java | 2 +-
.../appender/MemoryMappedFileManagerTest.java | 4 +-
.../appender/RandomAccessFileAppenderTests.java | 15 +-
.../appender/RandomAccessFileManagerTest.java | 22 +-
...ingRandomAccessFileAppenderRolloverTest.java | 13 +-
.../log4j/core/appender/SmtpAppenderTest.java | 24 +-
.../log4j/core/appender/SocketAppenderTest.java | 15 +-
.../log4j/core/appender/TlsSyslogFrameTest.java | 53 +-
.../appender/XmlCompleteFileAppenderTest.java | 82 +
.../core/appender/XmlFileAppenderTest.java | 1 +
.../db/AbstractDatabaseAppenderTest.java | 2 -
.../core/appender/db/jpa/JpaH2AppenderTest.java | 2 +-
.../db/jpa/JpaHyperSqlAppenderTest.java | 2 +-
.../core/appender/db/jpa/TestBaseEntity.java | 12 +
.../appender/mom/jeromq/JeroMqAppenderTest.java | 18 +-
.../appender/rolling/PatternProcessorTest.java | 1 -
...ollingAppenderNoUnconditionalDeleteTest.java | 22 +-
.../rolling/RollingAppenderSizeTest.java | 21 +-
...RandomAccessFileManagerHeaderFooterTest.java | 5 +-
.../RollingRandomAccessFileManagerTest.java | 6 +-
.../rolling/action/DeletingVisitorTest.java | 2 +-
.../rolling/action/ScriptConditionTest.java | 6 +-
.../routing/PropertiesRoutingAppenderTest.java | 1 +
.../appender/routing/RoutingAppenderTest.java | 1 +
.../routing/RoutingAppenderWithPurgingTest.java | 13 +-
.../routing/RoutingDefaultAppenderTest.java | 1 +
.../core/async/AsyncEventRouterFactoryTest.java | 57 +-
.../async/AsyncLoggerTimestampMessageTest.java | 15 +-
.../core/async/DefaultAsyncEventRouterTest.java | 25 +-
.../async/DiscardingAsyncEventRouterTest.java | 79 +-
.../core/async/RingBufferLogEventTest.java | 10 +-
.../perftest/GilsDosAndDontsLatencyTesting.txt | 29 +
.../log4j/core/async/perftest/IdleStrategy.java | 37 +
.../core/async/perftest/NoOpIdleStrategy.java | 37 +
.../log4j/core/async/perftest/PerfTest.java | 8 +-
.../core/async/perftest/PerfTestDriver.java | 2 +-
.../async/perftest/PerfTestResultFormatter.java | 4 +-
.../core/async/perftest/ResponseTimeTest.java | 329 ++
.../log4j/core/async/perftest/RunLog4j1.java | 9 +-
.../log4j/core/async/perftest/RunLog4j2.java | 8 +-
.../log4j/core/async/perftest/RunLogback.java | 8 +-
.../core/async/perftest/SimplePerfTest.bat | 47 +
.../core/async/perftest/SimplePerfTest.java | 148 +
.../log4j/core/async/perftest/SimplePerfTest.sh | 57 +
.../core/async/perftest/YieldIdleStrategy.java | 32 +
.../config/AppenderControlArraySetTest.java | 191 ++
.../core/config/CompositeConfigurationTest.java | 176 +
.../log4j/core/config/ConfigurationTest.java | 3 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../log4j/core/config/TestConfigurator.java | 11 +-
.../core/filter/AbstractScriptFilterTest.java | 4 +-
...DynamicThresholdFilterSerializationTest.java | 47 -
.../core/filter/DynamicThresholdFilterTest.java | 4 +-
.../log4j/core/filter/LevelRangeFilterTest.java | 4 +-
.../log4j/core/filter/MarkerFilterTest.java | 6 +-
.../log4j/core/filter/RegexFilterTest.java | 11 +-
.../core/filter/ThreadContextMapFilterTest.java | 16 +-
.../log4j/core/filter/ThresholdFilterTest.java | 4 +-
.../log4j/core/filter/TimeFilterTest.java | 2 +-
.../core/impl/Log4jLogEventNanoTimeTest.java | 14 +-
.../log4j/core/impl/Log4jLogEventTest.java | 42 +-
.../log4j/core/impl/MutableLogEventTest.java | 278 ++
.../core/impl/ReusableLogEventFactoryTest.java | 99 +
.../log4j/core/impl/ThrowableProxyTest.java | 15 +-
.../log4j/core/jackson/LevelMixInJsonTest.java | 29 +
.../log4j/core/jackson/LevelMixInTest.java | 9 +-
.../log4j/core/jackson/LevelMixInXmlTest.java | 32 +
.../log4j/core/jackson/LevelMixInYamlTest.java | 29 +
.../jackson/StackTraceElementMixInTest.java | 5 +
.../layout/CsvParameterLayoutAllAsyncTest.java | 69 +
.../core/layout/CsvParameterLayoutTest.java | 80 +-
.../log4j/core/layout/GelfLayoutTest.java | 102 +-
.../log4j/core/layout/PatternLayoutTest.java | 355 ++-
.../core/layout/SerializableLayoutTest.java | 66 -
.../core/layout/SpyByteBufferDestination.java | 63 +
.../core/layout/StringBuilderEncoderTest.java | 277 ++
.../log4j/core/layout/YamlLayoutTest.java | 287 ++
.../log4j/core/lookup/JndiLookupTest.java | 18 +
.../log4j/core/lookup/Log4jLookupTest.java | 32 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 16 +-
.../log4j/core/lookup/MapLookupTest.java | 25 +
.../log4j/core/net/server/ThreadIdFilter.java | 40 +
.../log4j/core/net/server/ThreadNameFilter.java | 3 +
.../core/net/server/ThreadPriorityFilter.java | 40 +
.../core/net/ssl/SslConfigurationTest.java | 27 +-
.../core/pattern/DatePatternConverterTest.java | 29 +-
.../pattern/EqualsReplacementConverterTest.java | 63 +-
.../core/pattern/MaxLengthConverterTest.java | 73 +
.../pattern/MessagePatternConverterTest.java | 8 +-
.../log4j/core/pattern/NameAbbreviatorTest.java | 14 +-
.../log4j/core/pattern/PatternParserTest.java | 60 +
.../pattern/ThreadIdPatternConverterTest.java | 39 +
.../pattern/ThreadNamePatternConverterTest.java | 39 +
.../ThreadPriorityPatternConverterTest.java | 39 +
.../apache/logging/log4j/core/util/Compare.java | 134 -
.../log4j/core/util/CronExpressionTest.java | 1 -
.../util/KeyValuePairSerializationTest.java | 39 -
.../log4j/core/util/PropertiesUtilTest.java | 42 -
.../log4j/core/util/WatchManagerTest.java | 8 +-
.../core/util/datetime/FixedDateFormatTest.java | 8 +-
.../apache/logging/log4j/junit/CleanFiles.java | 32 +-
.../logging/log4j/junit/LoggerContextRule.java | 11 +
.../log4j/test/appender/AlwaysFailAppender.java | 13 +-
.../log4j/test/appender/DeadlockAppender.java | 13 +-
.../test/appender/EncodingListAppender.java | 80 +
.../log4j/test/appender/FailOnceAppender.java | 13 +-
.../log4j/test/appender/InMemoryAppender.java | 2 -
.../log4j/test/appender/ListAppender.java | 30 +-
.../test/appender/UsesLoggingAppender.java | 22 +-
.../logging/log4j/test/layout/BasicLayout.java | 1 -
.../log4j/test/layout/SerializableLayout.java | 48 -
.../src/test/resources/JeroMqAppenderTest.xml | 3 +-
.../resources/JsonCompleteFileAppenderTest.xml | 4 +-
...cessFileAppenderLocationPropsTest.properties | 35 +
.../src/test/resources/csvParamsMixedAsync.xml | 13 +
log4j-core/src/test/resources/csvParamsSync.xml | 29 +
log4j-core/src/test/resources/gcFreeLogging.xml | 60 +
.../resources/gcFreeMixedSyncAsyncLogging.xml | 71 +
.../src/test/resources/log4j-comp-appender.json | 34 +
.../src/test/resources/log4j-comp-appender.xml | 39 +
.../src/test/resources/log4j-comp-filter.json | 9 +
.../src/test/resources/log4j-comp-filter.xml | 34 +
.../src/test/resources/log4j-comp-logger.json | 36 +
.../src/test/resources/log4j-comp-logger.xml | 41 +
.../test/resources/log4j-comp-properties.json | 16 +
.../test/resources/log4j-comp-properties.xml | 34 +
.../resources/log4j-comp-reconfig.properties | 59 +
.../src/test/resources/log4j-comp-reconfig.xml | 39 +
.../src/test/resources/log4j-rolling-xy.xml | 59 -
.../src/test/resources/log4j-rolling-xz.xml | 59 +
.../src/test/resources/log4j-routing.properties | 9 -
.../log4j-scriptFile-filters.properties | 8 -
.../src/test/resources/log4j-test1.properties | 58 +
.../src/test/resources/log4j-test2.properties | 59 +
.../log4j2-properties-root-only.properties | 6 -
.../test/resources/log4j2-properties.properties | 9 -
.../resources/perf-CountingNoOpAppender.xml | 12 +
log4j-distribution/pom.xml | 2 +-
log4j-flume-ng/pom.xml | 2 +-
.../log4j/flume/appender/FlumeAppender.java | 1 -
.../log4j/flume/appender/FlumeEvent.java | 18 +
log4j-flume-ng/src/site/xdoc/index.xml.vm | 1 +
.../appender/FlumeEmbeddedAppenderTest.java | 10 +-
log4j-iostreams/pom.xml | 2 +-
log4j-iostreams/src/site/xdoc/index.xml | 1 +
.../logging/log4j/io/AbstractStreamTest.java | 2 +-
log4j-jcl/pom.xml | 2 +-
log4j-jcl/src/site/xdoc/index.xml | 3 +-
log4j-jmx-gui/pom.xml | 6 +-
log4j-jmx-gui/src/site/xdoc/index.xml | 3 +-
log4j-jul/pom.xml | 2 +-
.../org/apache/logging/log4j/jul/ApiLogger.java | 10 +-
.../log4j/jul/DefaultLevelConverter.java | 4 +-
log4j-jul/src/site/xdoc/index.xml | 1 +
.../logging/log4j/jul/AbstractLoggerTest.java | 21 +-
.../BracketInNotInterpolatedMessageTest.java | 56 +
log4j-liquibase/pom.xml | 2 +-
log4j-liquibase/src/site/xdoc/index.xml | 3 +-
log4j-nosql/pom.xml | 2 +-
.../log4j/nosql/appender/NoSqlAppender.java | 1 -
.../nosql/appender/NoSqlDatabaseManager.java | 2 +
log4j-nosql/src/site/xdoc/index.xml.vm | 1 +
.../appender/NoSqlDatabaseManagerTest.java | 32 +-
log4j-perf/pom.xml | 2 +-
.../message/ParameterFormatterBenchmark.java | 186 ++
.../perf/jmh/AsyncAppenderLog4j1Benchmark.java | 119 +-
.../perf/jmh/AsyncAppenderLog4j2Benchmark.java | 124 +-
.../perf/jmh/AsyncAppenderLogbackBenchmark.java | 122 +-
.../log4j/perf/jmh/AsyncLoggersBenchmark.java | 141 +-
.../log4j/perf/jmh/CollectionsBenchmark.java | 12 +-
.../log4j/perf/jmh/FileAppenderBenchmark.java | 97 +-
.../perf/jmh/FileAppenderParamsBenchmark.java | 170 +
.../log4j/perf/jmh/GelfLayoutBenchmark.java | 111 +
.../log4j/perf/jmh/LoggerConfigBenchmark.java | 8 +-
.../perf/jmh/MemoryHandlerJULBenchmark.java | 164 +
.../perf/jmh/ParameterizedMessageBenchmark.java | 289 +-
.../ParameterizedMessageInliningBenchmark.java | 332 ++
.../log4j/perf/jmh/PatternLayoutBenchmark.java | 175 +-
.../logging/log4j/perf/jmh/SimpleBenchmark.java | 5 +-
.../perf/jmh/TextEncoderHelperBenchmark.java | 240 ++
...ThreadLocalVsConcurrentHashMapBenchmark.java | 186 +-
.../perf/jmh/ThreadLocalVsPoolBenchmark.java | 3 +-
.../log4j/perf/jmh/VarargsBenchmark.java | 17 +-
.../logging/log4j/perf/nogc/AbstractLogger.java | 46 +
.../logging/log4j/perf/nogc/ClassicLogger.java | 39 +
.../logging/log4j/perf/nogc/DemoAppender.java | 71 +
.../logging/log4j/perf/nogc/NoGcLayout.java | 134 +
.../logging/log4j/perf/nogc/NoGcLogger.java | 39 +
.../logging/log4j/perf/nogc/NoGcMessage.java | 106 +
.../perf/nogc/NoGcMessagePatternConverter.java | 81 +
.../log4j/perf/nogc/ParameterizedMessage.java | 757 +++++
.../apache/logging/log4j/perf/nogc/Test.java | 114 +
.../log4j/perf/util/BenchmarkMessageParams.java | 42 +
.../logging/log4j/perf/util/DemoAppender.java | 71 +
.../logging/log4j/perf/util/NoOpJULHandler.java | 41 +
.../log4j/perf/util/NoOpLog4jAppender.java | 44 +
.../log4j/perf/util/NoOpLogbackAppender.java | 33 +
.../main/resources/perf-WithoutAnyAppender.xml | 12 +
.../perf-log4j12-async-noOpAppender.xml | 30 +
.../perf-logback-async-noOpAppender.xml | 31 +
.../perf5AsyncApndNoLoc-noOpAppender.xml | 31 +
log4j-samples/.gitignore | 1 +
log4j-samples/configuration/pom.xml | 2 +-
.../CustomConfigurationFactory.java | 2 -
.../configuration/CustomConfigurationTest.java | 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 +-
.../logging/log4j/lookup/CustomLookup.java | 3 +-
.../logging/log4j/lookup/CustomMapMessage.java | 1 +
.../logging/log4j/lookup/MapMessageLookup.java | 6 +-
log4j-samples/pom.xml | 2 +-
log4j-slf4j-impl/pom.xml | 2 +-
.../org/apache/logging/slf4j/Log4jLogger.java | 3 +-
log4j-slf4j-impl/src/site/xdoc/index.xml | 3 +-
.../org/apache/logging/slf4j/Log4j1222Test.java | 1 -
log4j-taglib/pom.xml | 2 +-
.../log4j/taglib/Log4jTaglibLoggerContext.java | 28 +-
log4j-taglib/src/site/xdoc/index.xml | 3 +-
.../logging/log4j/taglib/CatchingTagTest.java | 49 +-
.../logging/log4j/taglib/DebugTagTest.java | 32 -
.../logging/log4j/taglib/EnterTagTest.java | 79 +
.../logging/log4j/taglib/EntryTagTest.java | 99 -
.../logging/log4j/taglib/ErrorTagTest.java | 32 -
.../logging/log4j/taglib/ExitTagTest.java | 42 +-
.../logging/log4j/taglib/FatalTagTest.java | 32 -
.../logging/log4j/taglib/IfEnabledTagTest.java | 26 +-
.../logging/log4j/taglib/InfoTagTest.java | 32 -
.../taglib/LoggingMessageTagSupportTest.java | 38 +-
.../logging/log4j/taglib/SetLoggerTagTest.java | 23 +-
.../logging/log4j/taglib/TagLevelTest.java | 57 +
.../logging/log4j/taglib/TagUtilsLevelTest.java | 61 +
.../logging/log4j/taglib/TagUtilsScopeTest.java | 56 +
.../logging/log4j/taglib/TagUtilsTest.java | 114 -
.../logging/log4j/taglib/TraceTagTest.java | 32 -
.../logging/log4j/taglib/WarnTagTest.java | 32 -
log4j-to-slf4j/pom.xml | 2 +-
.../org/apache/logging/slf4j/SLF4JLogger.java | 77 +-
.../logging/slf4j/SLF4JLoggerContext.java | 32 +-
.../slf4j/SLF4JLoggerContextFactory.java | 3 +-
log4j-to-slf4j/src/site/xdoc/index.xml | 7 +-
.../org/apache/logging/slf4j/LoggerTest.java | 346 +-
log4j-web/pom.xml | 2 +-
.../log4j/web/Log4jServletContextListener.java | 3 +-
.../log4j/web/Log4jWebInitializerImpl.java | 7 +-
.../log4j/web/ServletRequestThreadContext.java | 29 +
.../log4j/web/appender/ServletAppender.java | 6 +-
log4j-web/src/site/xdoc/index.xml | 3 +-
.../web/Log4jServletContextListenerTest.java | 11 -
pom.xml | 57 +-
src/changes/changes.xml | 249 +-
src/site/pdf.xml | 1 +
src/site/resources/images/ParamMsgThrpt1-4T.png | Bin 0 -> 27522 bytes
.../ResponseTimeAsyncClassicVsGcFree-label.png | Bin 0 -> 29217 bytes
.../images/ResponseTimeSyncClassicVsGcFree.png | Bin 0 -> 38428 bytes
.../ResponseTimeVsServiceTimeAsyncLoggers.png | Bin 0 -> 34779 bytes
.../SyncThroughputLoggerComparisonLinux.png | Bin 0 -> 69223 bytes
.../garbage-free2.6-SyncThroughputLinux.png | Bin 0 -> 65092 bytes
...log4j-2.5-FlightRecording-thumbnail40pct.png | Bin 0 -> 57992 bytes
.../images/log4j-2.5-FlightRecording.png | Bin 0 -> 68628 bytes
...log4j-2.6-FlightRecording-thumbnail40pct.png | Bin 0 -> 45221 bytes
.../images/log4j-2.6-FlightRecording.png | Bin 0 -> 50481 bytes
src/site/site.xml | 17 +-
src/site/xdoc/articles.xml | 8 +
src/site/xdoc/index.xml | 6 +
src/site/xdoc/manual/appenders.xml | 4 +-
src/site/xdoc/manual/async.xml | 44 +-
src/site/xdoc/manual/configuration.xml.vm | 111 +-
src/site/xdoc/manual/flowtracing.xml | 39 +-
src/site/xdoc/manual/garbagefree.xml | 494 +++
src/site/xdoc/manual/index.xml | 10 +-
src/site/xdoc/manual/layouts.xml.vm | 293 +-
src/site/xdoc/manual/markers.xml | 5 +-
src/site/xdoc/manual/migration.xml | 24 +-
src/site/xdoc/manual/thread-context.xml | 311 +-
src/site/xdoc/performance.xml | 223 +-
src/site/xdoc/runtime-dependencies.xml | 35 +-
644 files changed, 32673 insertions(+), 8705 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/afd417ce/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/afd417ce/src/site/site.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/afd417ce/src/site/xdoc/runtime-dependencies.xml
----------------------------------------------------------------------