You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/28 10:32:21 UTC

[45/50] [abbrv] logging-log4j2 git commit: Merge branch 'master' into LOG4J-1181

Merge branch 'master' into LOG4J-1181


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ca59f13c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ca59f13c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ca59f13c

Branch: refs/heads/LOG4J2-1528
Commit: ca59f13c6b30ed68b195209f9c73ad7f03093001
Parents: 403bb13 350887e
Author: Mikael St�ldal <mi...@staldal.nu>
Authored: Sat Aug 27 11:40:08 2016 +0200
Committer: Mikael St�ldal <mi...@staldal.nu>
Committed: Sat Aug 27 11:40:08 2016 +0200

----------------------------------------------------------------------
 RELEASE-NOTES.txt                               |   66 +-
 log4j-1.2-api/pom.xml                           |    7 +-
 .../config/Log4j1ConfigurationFactory.java      |  283 +-
 .../log4j/config/Log4j1ConfigurationParser.java |  327 +
 .../apache/log4j/layout/Log4j1XmlLayout.java    |  161 +
 .../pattern/Log4j1MdcPatternConverter.java      |   91 +
 .../pattern/Log4j1NdcPatternConverter.java      |   63 +
 .../apache/log4j/BasicConfigurationFactory.java |   13 +-
 .../config/Log4j1ConfigurationFactoryTest.java  |   64 +-
 .../log4j/layout/Log4j1XmlLayoutTest.java       |   84 +
 .../pattern/Log4j1MdcPatternConverterTest.java  |   79 +
 .../pattern/Log4j1NdcPatternConverterTest.java  |   74 +
 ...g4j-console-EnhancedPatternLayout.properties |    3 +-
 .../log4j-console-HtmlLayout.properties         |    3 +-
 .../log4j-console-PatternLayout.properties      |    1 -
 .../log4j-console-SimpleLayout.properties       |    1 -
 .../log4j-console-TTCCLayout.properties         |    3 +-
 .../log4j-console-XmlLayout.properties          |    5 +-
 .../log4j-file-SimpleLayout.properties          |   17 +
 log4j-api/pom.xml                               |    2 +-
 .../logging/log4j/CloseableThreadContext.java   |    2 +-
 .../java/org/apache/logging/log4j/Logger.java   |   20 +
 .../org/apache/logging/log4j/ThreadContext.java |   66 +-
 .../logging/log4j/message/ObjectMessage.java    |   10 +
 .../log4j/message/ReusableObjectMessage.java    |   10 +
 .../log4j/spi/DefaultThreadContextMap.java      |   18 +-
 .../logging/log4j/spi/ThreadContextMap.java     |   63 +-
 .../logging/log4j/spi/ThreadContextMap2.java    |   40 +
 .../logging/log4j/spi/ThreadContextStack.java   |    1 +
 .../apache/logging/log4j/util/Constants.java    |    1 +
 .../apache/logging/log4j/util/LoaderUtil.java   |   28 +-
 .../org/apache/logging/log4j/util/Unbox.java    |    1 +
 .../log4j/CloseableThreadContextTest.java       |   11 +-
 .../org/apache/logging/log4j/LoggerTest.java    |    2 +-
 .../logging/log4j/ThreadContextHolder.java      |   79 +
 .../apache/logging/log4j/ThreadContextTest.java |   21 +
 .../apache/logging/log4j/TraceLoggingTest.java  |    1 -
 .../logging/log4j/junit/BundleTestInfo.java     |  137 +-
 .../apache/logging/log4j/junit/OsgiRule.java    |  141 +-
 .../log4j/junit/ThreadContextMapRule.java       |   37 +
 .../logging/log4j/junit/ThreadContextRule.java  |   78 +
 .../log4j/junit/ThreadContextStackRule.java     |   37 +
 .../log4j/spi/DefaultThreadContextMapTest.java  |   26 +-
 log4j-bom/pom.xml                               |    2 +-
 log4j-core/.gitignore                           |   11 +-
 log4j-core/pom.xml                              |   14 +-
 .../logging/log4j/core/AbstractLifeCycle.java   |    8 +
 .../apache/logging/log4j/core/LifeCycle.java    |   13 +
 .../logging/log4j/core/LoggerContext.java       |  153 +-
 .../log4j/core/appender/AbstractAppender.java   |   58 +
 .../log4j/core/appender/AbstractManager.java    |   19 +-
 .../appender/AbstractOutputStreamAppender.java  |   21 +
 .../core/appender/ConfigurationFactoryData.java |   50 +
 .../log4j/core/appender/ConsoleAppender.java    |   84 +-
 .../log4j/core/appender/FileAppender.java       |  292 +-
 .../log4j/core/appender/FileManager.java        |   99 +-
 .../core/appender/MemoryMappedFileManager.java  |    6 +-
 .../core/appender/OutputStreamManager.java      |   71 +-
 .../core/appender/RandomAccessFileAppender.java |    2 +-
 .../core/appender/RandomAccessFileManager.java  |   29 +-
 .../core/appender/RollingFileAppender.java      |  597 +-
 .../RollingRandomAccessFileAppender.java        |    2 +-
 .../log4j/core/appender/WriterManager.java      |    2 +-
 .../appender/db/AbstractDatabaseManager.java    |    6 +-
 .../appender/db/jdbc/JdbcDatabaseManager.java   |    4 +-
 .../appender/db/jpa/JpaDatabaseManager.java     |    2 +-
 .../log4j/core/appender/mom/JmsManager.java     |    2 +-
 .../core/appender/mom/jeromq/JeroMqManager.java |    2 +-
 .../core/appender/mom/kafka/KafkaAppender.java  |    7 +-
 .../core/appender/mom/kafka/KafkaManager.java   |  185 +-
 .../appender/rolling/CronTriggeringPolicy.java  |   37 +-
 .../rolling/DefaultRolloverStrategy.java        |   19 +-
 .../log4j/core/appender/rolling/FileSize.java   |    1 +
 .../rolling/OnStartupTriggeringPolicy.java      |    3 +
 .../core/appender/rolling/PatternProcessor.java |   12 +-
 .../appender/rolling/RollingFileManager.java    |   82 +-
 .../rolling/RollingRandomAccessFileManager.java |   36 +-
 .../core/appender/rolling/TriggeringPolicy.java |    2 +-
 .../rolling/action/CommonsCompressAction.java   |    9 +-
 .../rolling/action/FileRenameAction.java        |   69 +-
 .../core/async/AsyncLoggerConfigDisruptor.java  |    3 +-
 .../log4j/core/async/AsyncLoggerDisruptor.java  |    3 +-
 .../log4j/core/async/DaemonThreadFactory.java   |   53 -
 .../log4j/core/async/RingBufferLogEvent.java    |    6 +-
 .../core/config/AbstractConfiguration.java      |   42 +-
 .../log4j/core/config/AppenderControl.java      |    3 +-
 .../log4j/core/config/AppendersPlugin.java      |    4 +-
 .../log4j/core/config/Configuration.java        |    8 +
 .../log4j/core/config/ConfigurationFactory.java |   86 +-
 .../core/config/ConfigurationScheduler.java     |   45 +-
 .../core/config/ConfiguratonFileWatcher.java    |   10 +-
 .../logging/log4j/core/config/Configurator.java |   36 +-
 .../log4j/core/config/CronScheduledFuture.java  |   43 +-
 .../log4j/core/config/DefaultConfiguration.java |    2 +-
 .../logging/log4j/core/config/LoggerConfig.java |   36 +-
 .../log4j/core/config/NullConfiguration.java    |    2 +-
 .../builder/api/ConfigurationBuilder.java       |   20 +-
 .../config/builder/impl/BuiltConfiguration.java |    5 +-
 .../impl/DefaultConfigurationBuilder.java       |   53 +-
 .../DefaultCustomLevelComponentBuilder.java     |    2 +-
 .../composite/CompositeConfiguration.java       |    4 +-
 .../config/composite/DefaultMergeStrategy.java  |    7 +-
 .../core/config/json/JsonConfiguration.java     |   14 +-
 .../config/json/JsonConfigurationFactory.java   |    5 +-
 .../config/plugins/PluginBuilderFactory.java    |    1 +
 .../config/plugins/PluginConfiguration.java     |    1 +
 .../core/config/plugins/PluginFactory.java      |    2 +-
 .../log4j/core/config/plugins/PluginNode.java   |    1 +
 .../core/config/plugins/util/PluginBuilder.java |    6 +-
 .../config/plugins/util/PluginRegistry.java     |    1 -
 .../core/config/plugins/util/ResolverUtil.java  |   13 +-
 .../plugins/visitors/PluginValueVisitor.java    |    5 +-
 .../properties/PropertiesConfiguration.java     |    8 +-
 .../PropertiesConfigurationBuilder.java         |   18 +-
 .../PropertiesConfigurationFactory.java         |   13 +-
 .../log4j/core/config/xml/XmlConfiguration.java |   47 +-
 .../config/xml/XmlConfigurationFactory.java     |    6 +-
 .../core/config/yaml/YamlConfiguration.java     |    7 +-
 .../config/yaml/YamlConfigurationFactory.java   |    5 +-
 .../log4j/core/filter/AbstractFilter.java       |    3 +-
 .../log4j/core/filter/AbstractFilterable.java   |   27 +
 .../core/filter/DynamicThresholdFilter.java     |   85 +-
 .../log4j/core/filter/ThresholdFilter.java      |   16 +-
 .../log4j/core/impl/DefaultLogEventFactory.java |    7 +-
 .../log4j/core/impl/ExtendedClassInfo.java      |   23 +-
 .../core/impl/ExtendedStackTraceElement.java    |   46 +-
 .../log4j/core/impl/Log4jContextFactory.java    |    6 +-
 .../log4j/core/impl/ThrowableFormatOptions.java |  541 +-
 .../logging/log4j/core/impl/ThrowableProxy.java | 1390 +++--
 .../log4j/core/jackson/Initializers.java        |   10 +-
 .../log4j/core/jackson/Log4jJsonModule.java     |    9 +-
 .../core/jackson/Log4jJsonObjectMapper.java     |    6 +-
 .../log4j/core/jackson/Log4jXmlModule.java      |    6 +-
 .../core/jackson/Log4jXmlObjectMapper.java      |    9 +-
 .../log4j/core/jackson/Log4jYamlModule.java     |    9 +-
 .../core/jackson/Log4jYamlObjectMapper.java     |    6 +-
 .../ThrowableProxyWithoutStacktraceMixIn.java   |   77 +
 .../log4j/core/jmx/LoggerContextAdmin.java      |    4 +-
 .../apache/logging/log4j/core/jmx/Server.java   |   19 +-
 .../log4j/core/layout/AbstractStringLayout.java |   57 +-
 .../logging/log4j/core/layout/HtmlLayout.java   |   14 +
 .../log4j/core/layout/JacksonFactory.java       |   22 +-
 .../logging/log4j/core/layout/JsonLayout.java   |   14 +-
 .../log4j/core/layout/PatternLayout.java        |   33 +-
 .../logging/log4j/core/layout/XmlLayout.java    |   15 +-
 .../logging/log4j/core/layout/YamlLayout.java   |   13 +-
 .../logging/log4j/core/net/JndiManager.java     |    2 +-
 .../logging/log4j/core/net/SmtpManager.java     |    4 +-
 .../core/net/server/AbstractSocketServer.java   |    7 +-
 .../log4j/core/net/server/JmsServer.java        |   10 +-
 .../server/JsonInputStreamLogEventBridge.java   |    2 +-
 .../core/pattern/DatePatternConverter.java      |    2 +-
 .../ExtendedThrowablePatternConverter.java      |    3 +-
 .../log4j/core/pattern/HighlightConverter.java  |   38 +-
 .../log4j/core/pattern/HtmlTextRenderer.java    |   38 +
 .../log4j/core/pattern/JAnsiTextRenderer.java   |  332 +
 .../core/pattern/MessagePatternConverter.java   |   83 +-
 .../log4j/core/pattern/NameAbbreviator.java     |    2 +
 .../log4j/core/pattern/PlainTextRenderer.java   |   40 +
 .../pattern/RootThrowablePatternConverter.java  |    2 +-
 .../log4j/core/pattern/StyleConverter.java      |   24 +-
 .../log4j/core/pattern/TextRenderer.java        |   46 +
 .../log4j/core/script/ScriptManager.java        |    1 -
 .../core/selector/BasicContextSelector.java     |  131 +-
 .../core/selector/CoreContextSelectors.java     |   25 +
 .../logging/log4j/core/util/ArrayUtils.java     |  124 +
 .../apache/logging/log4j/core/util/Assert.java  |   38 -
 .../logging/log4j/core/util/Constants.java      |   11 -
 .../util/DefaultShutdownCallbackRegistry.java   |    7 +
 .../apache/logging/log4j/core/util/Loader.java  |    6 +-
 .../logging/log4j/core/util/Log4jThread.java    |  138 +-
 .../log4j/core/util/Log4jThreadFactory.java     |   99 +
 .../logging/log4j/core/util/TypeUtil.java       |   21 +
 .../core/util/datetime/FastDateParser.java      |   54 +-
 .../core/util/datetime/FixedDateFormat.java     |   77 +-
 .../log4j/FormatterLoggerManualExample.java     |    7 +-
 .../apache/logging/log4j/LogRolloverTest.java   |   18 +-
 .../logging/log4j/MarkerMixInXmlTest.java       |    2 +-
 .../log4j/core/BasicConfigurationFactory.java   |    6 +-
 .../logging/log4j/core/StrictXmlConfigTest.java |    1 -
 .../ConsoleAppenderAnsiMessagesMain.java        |  110 +-
 .../ConsoleAppenderAnsiStyleJira180Main.java    |  119 +-
 .../ConsoleAppenderAnsiStyleJira272Main.java    |  121 +-
 .../ConsoleAppenderAnsiStyleJira319Main.java    |  123 +-
 .../ConsoleAppenderAnsiStyleLayoutMain.java     |  149 +-
 .../ConsoleAppenderAnsiStyleNameLayoutMain.java |   11 +-
 ...nsoleAppenderDefaultSuppressedThrowable.java |  131 +-
 ...nsoleAppenderHighlightLayoutDefaultMain.java |   11 +-
 ...nsoleAppenderHighlightLayoutLogbackMain.java |   11 +-
 .../ConsoleAppenderHighlightLayoutMain.java     |   11 +-
 .../ConsoleAppenderJAnsiMessageMain.java        |  154 +-
 .../ConsoleAppenderJAnsiXExceptionMain.java     |   76 +
 .../ConsoleAppenderNoAnsiStyleLayoutMain.java   |  145 +-
 .../core/appender/ConsoleAppenderTest.java      |    8 +-
 .../log4j/core/appender/FileAppenderTest.java   |  306 +-
 .../log4j/core/appender/Jira739Test.java        |  103 +-
 .../appender/JsonCompleteFileAppenderTest.java  |   37 +-
 .../core/appender/OutputStreamAppenderTest.java |  214 +-
 .../core/appender/ProgressConsoleTest.java      |    7 +-
 .../appender/RandomAccessFileManagerTest.java   |   18 +-
 .../appender/XmlCompleteFileAppenderTest.java   |   68 +-
 .../ContextStackJsonAttributeConverterTest.java |   19 +-
 .../appender/mom/jeromq/JeroMqAppenderTest.java |   10 +-
 .../core/appender/rolling/FileSizeTest.java     |    4 +-
 .../rolling/OnStartupTriggeringPolicyTest.java  |   49 +-
 .../RandomRollingAppenderOnStartupTest.java     |    2 +-
 .../RollingAppenderCronOnceADayTest.java        |  125 +
 .../rolling/RollingAppenderCronTest.java        |   12 +-
 .../RollingAppenderCustomDeleteActionTest.java  |    2 +-
 ...lingAppenderDeleteAccumulatedCount1Test.java |    2 +-
 ...lingAppenderDeleteAccumulatedCount2Test.java |    2 +-
 ...ollingAppenderDeleteAccumulatedSizeTest.java |    2 +-
 .../RollingAppenderDeleteMaxDepthTest.java      |    2 +-
 .../RollingAppenderDeleteNestedTest.java        |    2 +-
 .../RollingAppenderDeleteScriptFri13thTest.java |    2 +-
 .../RollingAppenderDeleteScriptTest.java        |    2 +-
 ...ollingAppenderNoUnconditionalDeleteTest.java |    2 +-
 .../rolling/RollingAppenderOnStartupTest.java   |    2 +-
 .../rolling/RollingAppenderSizeTest.java        |   51 +-
 .../rolling/RollingAppenderTimeAndSizeTest.java |    4 +-
 .../rolling/RollingAppenderTimeTest.java        |    2 +-
 .../rolling/RollingFileAppenderAccessTest.java  |   56 +-
 ...RandomAccessFileManagerHeaderFooterTest.java |    3 +-
 .../RollingRandomAccessFileManagerTest.java     |   24 +-
 .../core/async/RingBufferLogEventTest.java      |   18 +-
 .../core/config/CompositeConfigurationTest.java |   51 +-
 .../log4j/core/config/ConfigurationTest.java    |    6 +
 .../log4j/core/config/ConfiguratorTest.java     |    5 +-
 .../core/config/CustomConfigurationTest.java    |   13 +-
 .../log4j/core/config/TestConfigurator.java     |   24 +-
 .../core/config/TestConfiguratorError.java      |   13 +-
 .../builder/ConfigurationAssemblerTest.java     |   36 +-
 .../builder/CustomConfigurationFactory.java     |   18 +-
 .../plugins/util/PluginManagerPackagesTest.java |   12 +-
 .../util/ResolverUtilCustomProtocolTest.java    |  208 +
 .../config/plugins/util/ResolverUtilTest.java   |  126 +-
 .../AbstractPluginWithGenericBuilder.java       |   59 +
 .../PluginWithGenericSubclassFoo1Builder.java   |   55 +
 .../plugins/validation/ValidatingPlugin.java    |    2 +-
 .../ValidatingPluginWithGenericBuilder.java     |   75 +
 .../ValidatingPluginWithTypedBuilder.java       |   70 +
 .../validators/RequiredValidatorTest.java       |    1 +
 .../ValidatingPluginWithGenericBuilderTest.java |   66 +
 ...luginWithGenericSubclassFoo1BuilderTest.java |   68 +
 .../ValidatingPluginWithTypedBuilderTest.java   |   71 +
 .../core/config/xml/XmlLoggerPropsTest.java     |    8 +-
 .../core/filter/DynamicThresholdFilterTest.java |   47 +-
 .../core/impl/ThrowableFormatOptionsTest.java   |  208 +-
 .../log4j/core/jackson/LevelMixInJsonTest.java  |    2 +-
 .../jackson/StackTraceElementMixInTest.java     |    2 +-
 .../core/layout/CsvLogEventLayoutTest.java      |    8 +-
 .../core/layout/CsvParameterLayoutTest.java     |   73 +-
 .../log4j/core/layout/GelfLayoutTest.java       |   12 +-
 .../log4j/core/layout/HtmlLayoutTest.java       |    7 +-
 .../log4j/core/layout/JsonLayoutTest.java       |   59 +-
 .../log4j/core/layout/Log4j2_1482_CoreTest.java |   20 +
 .../log4j/core/layout/Log4j2_1482_Test.java     |   89 +
 .../log4j/core/layout/LogEventFixtures.java     |    6 +-
 .../layout/PatternLayoutLookupDateTest.java     |   28 +
 .../layout/PatternLayoutNoLookupDateTest.java   |   26 +
 .../log4j/core/layout/PatternLayoutTest.java    |   18 +-
 .../log4j/core/layout/Rfc5424LayoutTest.java    |   21 +-
 .../log4j/core/layout/SerializedLayoutTest.java |    7 +-
 .../log4j/core/layout/SyslogLayoutTest.java     |    9 +-
 .../log4j/core/layout/XmlLayoutTest.java        |   66 +-
 .../log4j/core/layout/YamlLayoutTest.java       |   55 +-
 .../lookup/MainInputArgumentsLookupTest.java    |   11 +-
 .../net/server/AbstractSocketServerTest.java    |    4 +-
 .../osgi/equinox/EquinoxLoadCoreBundleTest.java |    6 +-
 .../osgi/felix/FelixLoadCoreBundleTest.java     |    4 +
 .../core/pattern/DatePatternConverterTest.java  |   22 +
 .../core/pattern/HighlightConverterTest.java    |   78 +
 .../core/pattern/MdcPatternConverterTest.java   |   29 +-
 .../core/pattern/MessageJansiConverterTest.java |   62 +
 .../pattern/MessagePatternConverterTest.java    |  197 +-
 .../pattern/MessageStyledConverterTest.java     |   62 +
 .../core/pattern/NdcPatternConverterTest.java   |   77 +
 .../core/pattern/RegexReplacementTest.java      |   17 +-
 .../core/util/datetime/FixedDateFormatTest.java |   35 +-
 .../junit/AbstractExternalFileCleaner.java      |  232 +-
 .../apache/logging/log4j/junit/CleanFiles.java  |   38 +-
 .../logging/log4j/junit/CleanFolders.java       |   45 +-
 .../logging/log4j/junit/LoggerContextRule.java  |   33 +-
 .../junit/URLStreamHandlerFactoryRule.java      |   96 +
 .../log4j/test/appender/InMemoryAppender.java   |    7 +-
 log4j-core/src/test/resources/gcFreeLogging.xml |   11 +-
 .../resources/gcFreeMixedSyncAsyncLogging.xml   |   10 +-
 .../log4j-comp-logger-attr-override.json        |   38 +
 .../test/resources/log4j-comp-logger-root.xml   |   44 +
 .../test/resources/log4j-comp-root-loggers.xml  |   46 +
 .../src/test/resources/log4j-list-nolookups.xml |   29 +
 .../src/test/resources/log4j-loggerprops.xml    |    4 +-
 .../src/test/resources/log4j-message-ansi.xml   |   34 +
 .../src/test/resources/log4j-message-styled.xml |   34 +
 .../test/resources/log4j-rolling-7z-lazy.xml    |   59 +
 .../test/resources/log4j-rolling-bzip2-lazy.xml |   60 +
 .../resources/log4j-rolling-cron-once-a-day.xml |   47 +
 .../src/test/resources/log4j-rolling-cron.xml   |    2 +-
 .../src/test/resources/log4j-rolling-cron2.xml  |    2 +-
 .../resources/log4j-rolling-deflate-lazy.xml    |   60 +
 .../test/resources/log4j-rolling-gz-lazy.xml    |   59 +
 .../resources/log4j-rolling-pack200-lazy.xml    |   60 +
 .../test/resources/log4j-rolling-xz-lazy.xml    |   60 +
 .../test/resources/log4j-rolling-zip-lazy.xml   |   60 +
 log4j-core/src/test/resources/log4j-style.xml   |    4 +-
 log4j-core/src/test/resources/log4j2-1482.xml   |   27 +
 .../test/resources/log4j2-console-msg-ansi.xml  |   31 +
 .../log4j2-console-xex-ansi-custom.xml          |   31 +
 .../resources/log4j2-console-xex-ansi-kirk.xml  |   31 +
 .../test/resources/log4j2-console-xex-ansi.xml  |   31 +
 .../test/resources/log4j2-properties.properties |    1 +
 log4j-distribution/pom.xml                      |    2 +-
 log4j-flume-ng/pom.xml                          |    3 +-
 .../flume/appender/AbstractFlumeManager.java    |    2 +-
 .../log4j/flume/appender/FlumeAppender.java     |   41 +-
 .../flume/appender/FlumePersistentManager.java  | 1730 +++---
 .../log4j/flume/appender/FlumeAppenderTest.java |   49 +-
 log4j-iostreams/pom.xml                         |    2 +-
 log4j-jcl/pom.xml                               |    2 +-
 log4j-jmx-gui/pom.xml                           |    3 +-
 log4j-jul/pom.xml                               |    3 +-
 log4j-liquibase/pom.xml                         |    2 +-
 log4j-nosql/pom.xml                             |    8 +-
 .../appender/NoSqlDatabaseManagerTest.java      |    5 +
 log4j-perf/pom.xml                              |    2 +-
 log4j-samples/configuration/pom.xml             |    2 +-
 .../configuration/CustomConfiguration.java      |   13 +-
 .../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                           |    2 +-
 log4j-slf4j-impl/pom.xml                        |    7 +-
 .../org/apache/logging/slf4j/Log4j1222Test.java |    1 -
 .../logging/slf4j/Log4j2_1482_Slf4jTest.java    |   41 +
 .../src/test/resources/log4j2-1482.xml          |   27 +
 log4j-taglib/pom.xml                            |    2 +-
 log4j-to-slf4j/pom.xml                          |    2 +-
 .../org/apache/logging/slf4j/MDCContextMap.java |   12 +-
 log4j-web/pom.xml                               |    3 +-
 .../org/apache/logging/log4j/web/WebLookup.java |    8 -
 pom.xml                                         |   24 +-
 src/changes/announcement.vm                     |   17 +-
 src/changes/changes.xml                         | 5709 +++++++++---------
 src/site/apt/download.apt.vm                    |   15 +
 src/site/resources/images/logo.png              |  Bin 41622 -> 40736 bytes
 src/site/resources/logo/logo-java-2-2.6.2.png   |  Bin 0 -> 40736 bytes
 src/site/resources/logo/logo-java-2-2.6.2.xcf   |  Bin 0 -> 66719 bytes
 src/site/site.xml                               |    7 +
 src/site/xdoc/articles.xml                      |   46 +-
 src/site/xdoc/manual/appenders.xml              |   39 +-
 src/site/xdoc/manual/configuration.xml.vm       |    6 +-
 src/site/xdoc/manual/customconfig.xml           |   10 +-
 src/site/xdoc/manual/extending.xml              |   22 +-
 src/site/xdoc/manual/garbagefree.xml            |   10 +-
 src/site/xdoc/manual/layouts.xml.vm             |  120 +-
 src/site/xdoc/manual/lookups.xml                |   18 +-
 358 files changed, 14689 insertions(+), 8042 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ca59f13c/log4j-bom/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ca59f13c/log4j-samples/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ca59f13c/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ca59f13c/src/site/site.xml
----------------------------------------------------------------------