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/03/16 14:39:06 UTC
[49/50] logging-log4j2 git commit: Merge remote-tracking branch
'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Merge remote-tracking branch 'remotes/origin/master' into LOG4J2-1278-gc-free-logger
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7b9077c3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7b9077c3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7b9077c3
Branch: refs/heads/LOG4J2-1278-gc-free-logger
Commit: 7b9077c3bdb9b21b03a9e8bdfe8f55ddc5eeb506
Parents: 2faae9c 6ba91a3
Author: rpopma <rp...@apache.org>
Authored: Wed Mar 16 17:06:17 2016 +1100
Committer: rpopma <rp...@apache.org>
Committed: Wed Mar 16 17:06:17 2016 +1100
----------------------------------------------------------------------
log4j-1.2-api/pom.xml | 5 +
.../config/Log4j1ConfigurationFactory.java | 314 +++++++++++
.../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 +
.../logging/log4j/message/ObjectMessage.java | 6 +-
.../logging/log4j/message/ReusableMessage.java | 4 +
.../log4j/message/ReusableMessageFactory.java | 123 +++++
.../log4j/message/ReusableObjectMessage.java | 94 ++++
.../message/ReusableParameterizedMessage.java | 249 ++++-----
.../ReusableParameterizedMessageFactory.java | 127 -----
.../log4j/message/ReusableSimpleMessage.java | 60 ++
.../logging/log4j/spi/AbstractLogger.java | 17 +-
.../logging/log4j/util/PropertiesUtil.java | 22 +
.../apache/logging/log4j/EventLoggerTest.java | 2 +-
.../apache/logging/log4j/LambdaLoggerTest.java | 3 +-
.../log4j/message/ParameterFormatterTest.java | 193 +++++++
.../message/ReusableObjectMessageTest.java | 122 ++++
.../ReusableParameterizedMessageTest.java | 59 ++
.../message/ReusableSimpleMessageTest.java | 122 ++++
.../logging/log4j/util/PropertiesUtilTest.java | 65 +++
.../resources/PropertiesUtilTest.properties | 29 +
log4j-core/pom.xml | 6 +
.../org/apache/logging/log4j/core/Appender.java | 8 +
.../org/apache/logging/log4j/core/Layout.java | 3 +-
.../logging/log4j/core/LoggerContext.java | 2 +
.../log4j/core/appender/AsyncAppender.java | 5 +-
.../log4j/core/appender/mom/JmsAppender.java | 10 +-
.../log4j/core/appender/mom/JmsManager.java | 2 +-
.../appender/mom/jeromq/JeroMqAppender.java | 229 +-------
.../core/appender/mom/jeromq/JeroMqManager.java | 220 ++++++++
.../core/appender/mom/kafka/KafkaAppender.java | 12 +-
.../core/appender/mom/kafka/KafkaManager.java | 4 +
.../rolling/RollingRandomAccessFileManager.java | 2 +-
.../log4j/core/async/AsyncEventRouter.java | 7 +-
.../core/async/AsyncEventRouterFactory.java | 44 +-
.../logging/log4j/core/async/AsyncLogger.java | 165 +++---
.../log4j/core/async/AsyncLoggerConfig.java | 6 +-
.../core/async/AsyncLoggerConfigDelegate.java | 2 +
.../core/async/AsyncLoggerConfigDisruptor.java | 20 +-
.../log4j/core/async/AsyncLoggerDisruptor.java | 12 +-
.../core/async/DefaultAsyncEventRouter.java | 5 +-
.../core/async/DiscardingAsyncEventRouter.java | 35 +-
.../logging/log4j/core/async/EventRoute.java | 4 +-
.../log4j/core/async/RingBufferLogEvent.java | 27 +-
.../async/RingBufferLogEventTranslator.java | 53 +-
.../core/config/AbstractConfiguration.java | 1 +
.../log4j/core/config/ConfigurationAware.java | 33 ++
.../log4j/core/config/CronScheduledFuture.java | 12 +-
.../logging/log4j/core/config/LoggerConfig.java | 51 +-
.../builder/api/AppenderComponentBuilder.java | 9 +-
.../api/AppenderRefComponentBuilder.java | 9 +-
.../api/CompositeFilterComponentBuilder.java | 14 +-
.../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 | 17 +-
.../impl/DefaultAppenderComponentBuilder.java | 2 +
.../DefaultAppenderRefComponentBuilder.java | 2 +
...DefaultComponentAndConfigurationBuilder.java | 2 +
.../builder/impl/DefaultComponentBuilder.java | 22 +-
.../DefaultCompositeFilterComponentBuilder.java | 2 +-
.../impl/DefaultConfigurationBuilder.java | 16 +-
.../DefaultCustomLevelComponentBuilder.java | 2 +-
.../impl/DefaultFilterComponentBuilder.java | 2 +-
.../impl/DefaultLayoutComponentBuilder.java | 2 +-
.../impl/DefaultLoggerComponentBuilder.java | 4 +-
.../impl/DefaultRootLoggerComponentBuilder.java | 4 +-
.../impl/DefaultScriptComponentBuilder.java | 2 +-
.../impl/DefaultScriptFileComponentBuilder.java | 2 +
.../core/config/builder/impl/package-info.java | 2 +
.../core/config/json/JsonConfiguration.java | 550 +++++++++----------
.../PropertiesConfigurationBuilder.java | 298 ++++++++++
.../PropertiesConfigurationFactory.java | 378 +------------
.../core/config/status/StatusConfiguration.java | 4 +-
.../log4j/core/config/xml/XmlConfiguration.java | 14 +-
.../log4j/core/filter/CompositeFilter.java | 76 +--
.../logging/log4j/core/impl/Log4jLogEvent.java | 16 +-
.../AbstractConfigurationAwareLookup.java | 35 ++
.../logging/log4j/core/lookup/Interpolator.java | 6 +-
.../logging/log4j/core/lookup/JndiLookup.java | 5 +-
.../logging/log4j/core/lookup/Log4jLookup.java | 60 +-
.../log4j/core/lookup/StrSubstitutor.java | 19 +-
.../logging/log4j/core/net/SmtpManager.java | 15 +-
.../log4j/core/net/SslSocketManager.java | 2 +-
.../pattern/EqualsReplacementConverter.java | 48 +-
.../logging/log4j/core/util/KeyValuePair.java | 3 -
.../log4j/core/util/ObjectArrayIterator.java | 179 ++++++
.../logging/log4j/core/util/StringEncoder.java | 2 +-
.../log4j/core/CustomLevelsWithFiltersTest.java | 8 +-
.../logging/log4j/core/GcFreeLoggingTest.java | 131 +++++
.../logging/log4j/core/LoggerUpdateTest.java | 15 +
.../appender/mom/jeromq/JeroMqAppenderTest.java | 12 +-
.../rolling/RollingAppenderSizeTest.java | 15 +-
.../core/async/AsyncEventRouterFactoryTest.java | 57 +-
.../core/async/DefaultAsyncEventRouterTest.java | 25 +-
.../async/DiscardingAsyncEventRouterTest.java | 79 +--
.../log4j/core/config/ConfigurationTest.java | 3 +-
.../core/config/CustomConfigurationTest.java | 2 +-
.../log4j/core/layout/PatternLayoutTest.java | 87 ++-
.../log4j/core/lookup/JndiLookupTest.java | 18 +
.../log4j/core/lookup/Log4jLookupTest.java | 32 +-
.../core/lookup/Log4jLookupWithSpacesTest.java | 16 +-
.../core/pattern/DatePatternConverterTest.java | 2 +-
.../pattern/EqualsReplacementConverterTest.java | 63 ++-
.../apache/logging/log4j/core/util/Compare.java | 134 -----
.../log4j/core/util/PropertiesUtilTest.java | 42 --
.../apache/logging/log4j/junit/CleanFiles.java | 2 +-
.../log4j/test/appender/AlwaysFailAppender.java | 11 +-
.../log4j/test/appender/DeadlockAppender.java | 13 +-
.../log4j/test/appender/FailOnceAppender.java | 13 +-
.../log4j/test/appender/InMemoryAppender.java | 2 -
.../log4j/test/appender/ListAppender.java | 6 +-
.../test/appender/UsesLoggingAppender.java | 22 +-
.../src/test/resources/log4j-routing.properties | 9 -
.../log4j-scriptFile-filters.properties | 8 -
.../src/test/resources/log4j-test1.properties | 58 ++
.../log4j2-properties-root-only.properties | 6 -
.../test/resources/log4j2-properties.properties | 9 -
.../appender/FlumeEmbeddedAppenderTest.java | 10 +-
log4j-jmx-gui/pom.xml | 4 +-
.../log4j/web/Log4jWebInitializerImpl.java | 5 +-
.../log4j/web/appender/ServletAppender.java | 4 +-
pom.xml | 8 +-
src/changes/changes.xml | 26 +-
src/site/xdoc/manual/async.xml | 8 +-
src/site/xdoc/manual/configuration.xml.vm | 52 +-
133 files changed, 3677 insertions(+), 2060 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7b9077c3/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --cc log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 0694973,244b8e7..f21c697
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@@ -26,9 -26,8 +26,9 @@@ import org.apache.logging.log4j.message
import org.apache.logging.log4j.message.FlowMessageFactory;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MessageFactory;
+import org.apache.logging.log4j.message.MessageFactory2;
import org.apache.logging.log4j.message.ParameterizedMessageFactory;
- import org.apache.logging.log4j.message.ReusableParameterizedMessageFactory;
+ import org.apache.logging.log4j.message.ReusableMessageFactory;
import org.apache.logging.log4j.message.StringFormattedMessage;
import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.LambdaUtil;