This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository apache-log4j2.
commit 394992f519fb59f104a87d782001b0b0e8367bac Merge: 9b8e0dd bb9a693 Author: Markus Koschany <[email protected]> Date: Sun May 10 21:36:58 2015 +0200 Merge tag 'upstream/2.2' Upstream version 2.2 # gpg: Signature made Sun 10 May 2015 21:36:54 CEST using RSA key ID 513B51E4 # gpg: Good signature from "Markus Koschany <[email protected]>" [ultimate] # gpg: aka "Markus Koschany <[email protected]>" [ultimate] .gitignore | 6 + BUILDING.txt | 16 +- NOTICE.txt | 5 +- RELEASE-NOTES.txt | 139 +- checkstyle-suppressions.xml | 25 + checkstyle.xml | 1 - log4j-1.2-api/.gitignore | 5 + log4j-1.2-api/pom.xml | 53 +- .../src/main/java/org/apache/log4j/Appender.java | 10 +- .../java/org/apache/log4j/BasicConfigurator.java | 5 +- .../src/main/java/org/apache/log4j/Category.java | 44 +- .../src/main/java/org/apache/log4j/Layout.java | 17 +- .../src/main/java/org/apache/log4j/Level.java | 14 +- .../src/main/java/org/apache/log4j/LogManager.java | 3 +- .../src/main/java/org/apache/log4j/Logger.java | 2 - .../src/main/java/org/apache/log4j/MDC.java | 2 +- .../src/main/java/org/apache/log4j/NDC.java | 80 +- .../main/java/org/apache/log4j/PatternLayout.java | 5 +- .../src/main/java/org/apache/log4j/Priority.java | 9 +- .../org/apache/log4j/PropertyConfigurator.java | 2 +- .../java/org/apache/log4j/spi/ErrorHandler.java | 11 +- .../org/apache/log4j/spi/LoggerRepository.java | 17 +- .../java/org/apache/log4j/xml/DOMConfigurator.java | 3 +- log4j-1.2-api/src/site/site.xml | 5 +- .../apache/log4j/BasicConfigurationFactory.java | 17 +- .../org/apache/log4j/CallerInformationTest.java | 65 + .../test/java/org/apache/log4j/CategoryTest.java | 14 +- .../src/test/java/org/apache/log4j/LevelTest.java | 10 +- .../src/test/java/org/apache/log4j/LoggerTest.java | 241 ++- .../test/java/org/apache/log4j/LoggingTest.java | 39 +- .../test/java/org/apache/log4j/PriorityTest.java | 4 +- .../test/java/org/apache/log4j/VelocityTest.java | 35 +- .../apache/log4j/util/SerializationTestHelper.java | 3 +- log4j-api/.gitignore | 5 + log4j-api/pom.xml | 118 +- .../java/org/apache/logging/log4j/EventLogger.java | 18 +- .../main/java/org/apache/logging/log4j/Level.java | 259 ++- .../java/org/apache/logging/log4j/LogManager.java | 234 +- .../main/java/org/apache/logging/log4j/Logger.java | 2264 ++++++++++---------- .../main/java/org/apache/logging/log4j/Marker.java | 41 +- .../org/apache/logging/log4j/MarkerManager.java | 312 ++- .../org/apache/logging/log4j/ThreadContext.java | 303 ++- .../log4j/message/AbstractMessageFactory.java | 8 +- .../log4j/message/BasicThreadInformation.java | 12 +- .../log4j/message/ExtendedThreadInformation.java | 46 +- .../logging/log4j/message/FormattedMessage.java | 16 +- .../log4j/message/FormattedMessageFactory.java | 4 +- .../logging/log4j/message/LocalizedMessage.java | 118 +- .../log4j/message/LocalizedMessageFactory.java | 52 +- .../apache/logging/log4j/message/MapMessage.java | 34 +- .../org/apache/logging/log4j/message/Message.java | 4 +- .../logging/log4j/message/MessageFactory.java | 1 - .../log4j/message/MessageFormatMessage.java | 61 +- .../log4j/message/MessageFormatMessageFactory.java | 4 +- .../logging/log4j/message/ObjectMessage.java | 29 +- .../log4j/message/ParameterizedMessage.java | 143 +- .../log4j/message/ParameterizedMessageFactory.java | 4 +- .../logging/log4j/message/SimpleMessage.java | 2 +- .../log4j/message/StringFormattedMessage.java | 2 +- .../message/StringFormatterMessageFactory.java | 4 +- .../logging/log4j/message/StructuredDataId.java | 14 +- .../log4j/message/StructuredDataMessage.java | 61 +- .../logging/log4j/message/ThreadDumpMessage.java | 16 +- .../apache/logging/log4j/message/package-info.java | 2 +- .../org/apache/logging/log4j/package-info.java | 16 +- .../apache/logging/log4j/simple/SimpleLogger.java | 68 +- .../logging/log4j/simple/SimpleLoggerContext.java | 14 +- .../log4j/simple/SimpleLoggerContextFactory.java | 7 +- .../apache/logging/log4j/simple/package-info.java | 3 +- .../apache/logging/log4j/spi/AbstractLogger.java | 1496 +++---------- .../logging/log4j/spi/AbstractLoggerAdapter.java | 109 + .../logging/log4j/spi/AbstractLoggerWrapper.java | 121 -- .../logging/log4j/spi/DefaultThreadContextMap.java | 121 +- .../log4j/spi/DefaultThreadContextStack.java | 297 +-- .../apache/logging/log4j/spi/ExtendedLogger.java | 155 ++ .../logging/log4j/spi/ExtendedLoggerWrapper.java | 129 ++ .../apache/logging/log4j/spi/LoggerAdapter.java | 38 + .../apache/logging/log4j/spi/LoggerContext.java | 8 +- .../logging/log4j/spi/LoggerContextFactory.java | 8 +- .../log4j/spi/MutableThreadContextStack.java | 72 + .../org/apache/logging/log4j/spi/Provider.java | 92 +- .../apache/logging/log4j/spi/StandardLevel.java | 99 + .../apache/logging/log4j/spi/ThreadContextMap.java | 10 +- .../logging/log4j/spi/ThreadContextStack.java | 6 +- .../org/apache/logging/log4j/spi/package-info.java | 3 +- .../log4j/status/StatusConsoleListener.java | 39 +- .../apache/logging/log4j/status/StatusData.java | 6 +- .../logging/log4j/status/StatusListener.java | 5 +- .../apache/logging/log4j/status/StatusLogger.java | 101 +- .../apache/logging/log4j/status/package-info.java | 2 +- .../org/apache/logging/log4j/util/Activator.java | 123 ++ .../apache/logging/log4j/util/EnglishEnums.java | 8 +- .../org/apache/logging/log4j/util/LoaderUtil.java | 261 +++ .../apache/logging/log4j/util/PropertiesUtil.java | 123 +- .../apache/logging/log4j/util/ProviderUtil.java | 119 +- .../apache/logging/log4j/util/ReflectionUtil.java | 332 +++ .../org/apache/logging/log4j/util/Strings.java | 125 ++ .../apache/logging/log4j/util/package-info.java | 3 +- log4j-api/src/site/site.xml | 5 +- .../java/org/apache/log4j/util/SerialUtil.java | 65 + .../java/org/apache/log4j/util/StringsTest.java | 36 + .../apache/logging/log4j/AbstractLoggerTest.java | 20 +- .../logging/log4j/AbstractSerializationTest.java | 50 + .../org/apache/logging/log4j/EventLoggerTest.java | 15 +- .../java/org/apache/logging/log4j/LevelTest.java | 165 +- .../org/apache/logging/log4j/LogManagerTest.java | 3 +- .../java/org/apache/logging/log4j/LoggerTest.java | 158 +- .../java/org/apache/logging/log4j/MarkerTest.java | 106 + .../logging/log4j/NoopThreadContextTest.java | 16 +- .../apache/logging/log4j/SerializableMatchers.java | 58 + .../java/org/apache/logging/log4j/TestLogger.java | 42 +- .../apache/logging/log4j/TestLoggerContext.java | 15 +- .../logging/log4j/TestLoggerContextFactory.java | 11 +- .../log4j/ThreadContextInheritanceTest.java | 215 ++ .../apache/logging/log4j/ThreadContextTest.java | 36 +- .../test/java/org/apache/logging/log4j/Timer.java | 8 +- .../junit/LogManagerLoggerContextFactoryRule.java | 49 + .../log4j/message/FormattedMessageTest.java | 27 +- .../log4j/message/LocalizedMessageTest.java | 71 +- .../logging/log4j/message/MapMessageTest.java | 20 +- .../MessageFormatMessageSerializationTest.java | 40 + .../log4j/message/MessageFormatMessageTest.java | 29 +- .../org/apache/logging/log4j/message/Mutable.java | 34 + .../logging/log4j/message/ObjectMessageTest.java | 54 +- .../log4j/message/ParameterizedMessageTest.java | 14 +- .../log4j/message/StringFormattedMessageTest.java | 28 +- .../log4j/message/StructuredDataMessageTest.java | 21 +- .../log4j/message/ThreadDumpMessageTest.java | 24 +- .../logging/log4j/osgi/AbstractLoadBundleTest.java | 28 +- .../apache/logging/log4j/osgi/BundleTestInfo.java | 20 +- .../org/apache/logging/log4j/osgi/OsgiRule.java | 69 + .../equinox/AbstractEquinoxLoadBundleTest.java | 24 +- .../osgi/felix/AbstractFelixLoadBundleTest.java | 24 +- .../logging/log4j/simple/SimpleLoggerTest.java | 63 + .../log4j/spi/DefaultThreadContextMapTest.java | 64 +- .../log4j/spi/DefaultThreadContextStackTest.java | 188 +- .../log4j/spi/MutableThreadContextStackTest.java | 222 +- .../status/StatusLoggerSerializationTest.java | 39 + .../logging/log4j/util/ReflectionUtilTest.java | 106 + log4j-bom/.gitignore | 2 + log4j-bom/pom.xml | 130 ++ log4j-core/.gitignore | 4 + log4j-core/pom.xml | 378 ++-- .../logging/log4j/core/AbstractLifeCycle.java | 123 ++ .../logging/log4j/core/AbstractLogEvent.java | 120 ++ .../apache/logging/log4j/core/AbstractServer.java | 38 - .../org/apache/logging/log4j/core/Appender.java | 41 +- .../apache/logging/log4j/core/ErrorHandler.java | 2 +- .../java/org/apache/logging/log4j/core/Filter.java | 16 +- .../java/org/apache/logging/log4j/core/Layout.java | 18 +- .../org/apache/logging/log4j/core/LifeCycle.java | 35 +- .../org/apache/logging/log4j/core/LogEvent.java | 157 +- .../logging/log4j/core/LogEventListener.java | 44 + .../java/org/apache/logging/log4j/core/Logger.java | 84 +- .../apache/logging/log4j/core/LoggerContext.java | 237 +- .../log4j/core/appender/AbstractAppender.java | 48 +- .../appender/AbstractOutputStreamAppender.java | 43 +- .../logging/log4j/core/appender/AsyncAppender.java | 173 +- .../log4j/core/appender/ConsoleAppender.java | 100 +- .../log4j/core/appender/DefaultErrorHandler.java | 6 +- .../log4j/core/appender/FailoverAppender.java | 41 +- .../logging/log4j/core/appender/FileAppender.java | 37 +- .../logging/log4j/core/appender/FileManager.java | 42 +- .../log4j/core/appender/JMSQueueAppender.java | 109 - .../log4j/core/appender/JMSTopicAppender.java | 110 - .../core/appender/MemoryMappedFileAppender.java | 199 ++ .../core/appender/MemoryMappedFileManager.java | 335 +++ .../log4j/core/appender/OutputStreamManager.java | 36 +- .../core/appender/RandomAccessFileAppender.java | 26 +- .../core/appender/RandomAccessFileManager.java | 41 +- .../log4j/core/appender/RollingFileAppender.java | 25 +- .../appender/RollingRandomAccessFileAppender.java | 40 +- .../logging/log4j/core/appender/SMTPAppender.java | 174 -- .../logging/log4j/core/appender/SmtpAppender.java | 175 ++ .../log4j/core/appender/SocketAppender.java | 131 +- .../log4j/core/appender/SyslogAppender.java | 87 +- .../log4j/core/appender/TLSSyslogAppender.java | 145 -- .../log4j/core/appender/TLSSyslogFrame.java | 72 - .../log4j/core/appender/TlsSyslogFrame.java | 74 + .../core/appender/db/AbstractDatabaseAppender.java | 10 +- .../core/appender/db/AbstractDatabaseManager.java | 92 +- .../log4j/core/appender/db/jdbc/ColumnConfig.java | 15 +- .../core/appender/db/jdbc/ConnectionSource.java | 2 +- .../db/jdbc/DataSourceConnectionSource.java | 4 +- .../db/jdbc/DriverManagerConnectionSource.java | 106 - .../db/jdbc/FactoryMethodConnectionSource.java | 14 +- .../log4j/core/appender/db/jdbc/JDBCAppender.java | 103 - .../core/appender/db/jdbc/JDBCDatabaseManager.java | 202 -- .../log4j/core/appender/db/jdbc/JdbcAppender.java | 105 + .../core/appender/db/jdbc/JdbcDatabaseManager.java | 255 +++ .../db/jpa/AbstractLogEventWrapperEntity.java | 86 +- .../core/appender/db/jpa/BasicLogEventEntity.java | 29 +- .../log4j/core/appender/db/jpa/JPAAppender.java | 125 -- .../core/appender/db/jpa/JPADatabaseManager.java | 152 -- .../log4j/core/appender/db/jpa/JpaAppender.java | 128 ++ .../core/appender/db/jpa/JpaDatabaseManager.java | 188 ++ .../converter/ContextMapAttributeConverter.java | 1 + .../ContextMapJsonAttributeConverter.java | 2 +- .../ContextStackJsonAttributeConverter.java | 2 +- .../db/jpa/converter/LevelAttributeConverter.java | 47 + .../db/jpa/converter/MarkerAttributeConverter.java | 21 +- .../jpa/converter/MessageAttributeConverter.java | 2 +- .../StackTraceElementAttributeConverter.java | 2 +- .../jpa/converter/ThrowableAttributeConverter.java | 6 +- .../core/appender/db/nosql/NoSQLAppender.java | 94 - .../core/appender/db/nosql/NoSQLConnection.java | 71 - .../appender/db/nosql/NoSQLDatabaseManager.java | 195 -- .../log4j/core/appender/db/nosql/NoSQLObject.java | 63 - .../core/appender/db/nosql/NoSQLProvider.java | 44 - .../appender/db/nosql/couch/CouchDBConnection.java | 72 - .../appender/db/nosql/couch/CouchDBObject.java | 64 - .../appender/db/nosql/couch/CouchDBProvider.java | 164 -- .../core/appender/db/nosql/couch/package-info.java | 20 - .../appender/db/nosql/mongo/MongoDBConnection.java | 123 -- .../appender/db/nosql/mongo/MongoDBObject.java | 66 - .../appender/db/nosql/mongo/MongoDBProvider.java | 215 -- .../core/appender/db/nosql/mongo/package-info.java | 20 - .../log4j/core/appender/db/nosql/package-info.java | 34 - .../log4j/core/appender/mom/JmsAppender.java | 203 ++ .../log4j/core/appender/mom/JmsManager.java | 170 ++ .../log4j/core/appender/mom/package-info.java | 23 + .../logging/log4j/core/appender/package-info.java | 2 +- .../core/appender/rewrite/MapRewritePolicy.java | 20 +- .../appender/rewrite/PropertiesRewritePolicy.java | 8 +- .../core/appender/rewrite/RewriteAppender.java | 9 +- .../rolling/CompositeTriggeringPolicy.java | 2 +- .../appender/rolling/DefaultRolloverStrategy.java | 320 +-- .../rolling/OnStartupTriggeringPolicy.java | 49 +- .../core/appender/rolling/PatternProcessor.java | 52 +- .../core/appender/rolling/RollingFileManager.java | 78 +- .../rolling/RollingRandomAccessFileManager.java | 70 +- .../core/appender/rolling/RolloverDescription.java | 2 +- .../appender/rolling/RolloverDescriptionImpl.java | 2 +- .../rolling/SizeBasedTriggeringPolicy.java | 10 +- .../rolling/TimeBasedTriggeringPolicy.java | 8 +- .../appender/rolling/action/AbstractAction.java | 100 + .../log4j/core/appender/rolling/action/Action.java | 49 + .../appender/rolling/action/CompositeAction.java | 106 + .../appender/rolling/action/FileRenameAction.java | 156 ++ .../appender/rolling/action/GzCompressAction.java | 134 ++ .../appender/rolling/action/ZipCompressAction.java | 146 ++ .../core/appender/rolling/action/package-info.java | 20 + .../appender/rolling/helper/AbstractAction.java | 100 - .../log4j/core/appender/rolling/helper/Action.java | 49 - .../appender/rolling/helper/CompositeAction.java | 101 - .../appender/rolling/helper/FileRenameAction.java | 146 -- .../appender/rolling/helper/GZCompressAction.java | 129 -- .../appender/rolling/helper/ZipCompressAction.java | 140 -- .../core/appender/rolling/helper/package-info.java | 20 - .../logging/log4j/core/appender/routing/Route.java | 7 +- .../log4j/core/appender/routing/Routes.java | 4 +- .../core/appender/routing/RoutingAppender.java | 8 +- .../logging/log4j/core/async/AsyncLogger.java | 228 +- .../log4j/core/async/AsyncLoggerConfig.java | 49 +- .../log4j/core/async/AsyncLoggerConfigHelper.java | 135 +- .../log4j/core/async/AsyncLoggerContext.java | 2 + .../core/async/AsyncLoggerContextSelector.java | 7 +- .../log4j/core/async/RingBufferLogEvent.java | 106 +- .../core/async/RingBufferLogEventTranslator.java | 21 + .../log4j/core/config/AbstractConfiguration.java | 833 +++++++ .../logging/log4j/core/config/AppenderControl.java | 10 +- .../logging/log4j/core/config/AppenderRef.java | 17 +- .../logging/log4j/core/config/AppendersPlugin.java | 54 + .../log4j/core/config/BaseConfiguration.java | 901 -------- .../logging/log4j/core/config/Configuration.java | 62 +- .../log4j/core/config/ConfigurationFactory.java | 274 ++- .../log4j/core/config/ConfigurationSource.java | 177 ++ .../logging/log4j/core/config/Configurator.java | 92 +- .../log4j/core/config/CustomLevelConfig.java | 99 + .../logging/log4j/core/config/CustomLevels.java | 59 + .../log4j/core/config/DefaultAdvertiser.java | 8 +- .../log4j/core/config/DefaultConfiguration.java | 20 +- .../core/config/FileConfigurationMonitor.java | 46 +- .../log4j/core/config/JSONConfiguration.java | 321 --- .../core/config/JSONConfigurationFactory.java | 75 - .../logging/log4j/core/config/LoggerConfig.java | 142 +- .../logging/log4j/core/config/LoggersPlugin.java | 56 + .../org/apache/logging/log4j/core/config/Node.java | 42 +- .../log4j/core/config/NullConfiguration.java | 5 +- .../apache/logging/log4j/core/config/Order.java | 9 +- .../logging/log4j/core/config/OrderComparator.java | 59 + .../log4j/core/config/PropertiesPlugin.java | 59 + .../apache/logging/log4j/core/config/Property.java | 17 +- .../log4j/core/config/XMLConfiguration.java | 400 ---- .../log4j/core/config/XMLConfigurationFactory.java | 51 - .../log4j/core/config/json/JsonConfiguration.java | 268 +++ .../core/config/json/JsonConfigurationFactory.java | 74 + .../log4j/core/config/json/package-info.java | 20 + .../logging/log4j/core/config/package-info.java | 2 +- .../log4j/core/config/plugins/AppendersPlugin.java | 51 - .../log4j/core/config/plugins/LoggersPlugin.java | 55 - .../logging/log4j/core/config/plugins/Plugin.java | 28 +- .../log4j/core/config/plugins/PluginAliases.java | 6 +- .../log4j/core/config/plugins/PluginAttribute.java | 75 +- .../config/plugins/PluginBuilderAttribute.java | 49 + .../core/config/plugins/PluginBuilderFactory.java | 33 + .../core/config/plugins/PluginConfiguration.java | 10 +- .../log4j/core/config/plugins/PluginElement.java | 12 +- .../log4j/core/config/plugins/PluginFactory.java | 5 +- .../log4j/core/config/plugins/PluginManager.java | 321 --- .../log4j/core/config/plugins/PluginNode.java | 9 +- .../log4j/core/config/plugins/PluginType.java | 58 - .../log4j/core/config/plugins/PluginValue.java | 12 +- .../core/config/plugins/PluginVisitorStrategy.java | 44 + .../core/config/plugins/PropertiesPlugin.java | 57 - .../log4j/core/config/plugins/ResolverUtil.java | 602 ------ .../core/config/plugins/convert/EnumConverter.java | 38 + .../core/config/plugins/convert/TypeConverter.java | 36 + .../plugins/convert/TypeConverterRegistry.java | 158 ++ .../config/plugins/convert/TypeConverters.java | 361 ++++ .../core/config/plugins/convert/package-info.java | 22 + .../log4j/core/config/plugins/package-info.java | 11 +- .../core/config/plugins/processor/PluginCache.java | 139 ++ .../core/config/plugins/processor/PluginEntry.java | 82 + .../config/plugins/processor/PluginProcessor.java | 173 ++ .../config/plugins/processor/package-info.java | 22 + .../core/config/plugins/util/PluginBuilder.java | 324 +++ .../core/config/plugins/util/PluginManager.java | 176 ++ .../core/config/plugins/util/PluginRegistry.java | 311 +++ .../log4j/core/config/plugins/util/PluginType.java | 83 + .../core/config/plugins/util/ResolverUtil.java | 414 ++++ .../core/config/plugins/util/package-info.java | 21 + .../core/config/plugins/validation/Constraint.java | 41 + .../plugins/validation/ConstraintValidator.java | 43 + .../plugins/validation/ConstraintValidators.java | 84 + .../plugins/validation/constraints/Required.java | 44 + .../validation/constraints/package-info.java | 23 + .../config/plugins/validation/package-info.java | 23 + .../validation/validators/RequiredValidator.java | 80 + .../validation/validators/package-info.java | 23 + .../plugins/visitors/AbstractPluginVisitor.java | 134 ++ .../plugins/visitors/PluginAttributeVisitor.java | 80 + .../visitors/PluginBuilderAttributeVisitor.java | 54 + .../visitors/PluginConfigurationVisitor.java | 47 + .../plugins/visitors/PluginElementVisitor.java | 109 + .../config/plugins/visitors/PluginNodeVisitor.java | 43 + .../plugins/visitors/PluginValueVisitor.java | 43 + .../config/plugins/visitors/PluginVisitor.java | 94 + .../config/plugins/visitors/PluginVisitors.java | 57 + .../core/config/plugins/visitors/package-info.java | 24 + .../core/config/status/StatusConfiguration.java | 224 ++ .../log4j/core/config/status/package-info.java | 21 + .../log4j/core/config/xml/XmlConfiguration.java | 343 +++ .../core/config/xml/XmlConfigurationFactory.java | 55 + .../log4j/core/config/xml/package-info.java | 20 + .../log4j/core/config/yaml/YamlConfiguration.java | 39 + .../core/config/yaml/YamlConfigurationFactory.java | 73 + .../log4j/core/config/yaml/package-info.java | 20 + .../logging/log4j/core/filter/AbstractFilter.java | 119 +- .../log4j/core/filter/AbstractFilterable.java | 37 +- .../logging/log4j/core/filter/BurstFilter.java | 538 ++--- .../logging/log4j/core/filter/CompositeFilter.java | 71 +- .../log4j/core/filter/DynamicThresholdFilter.java | 153 +- .../logging/log4j/core/filter/Filterable.java | 7 +- .../logging/log4j/core/filter/MapFilter.java | 23 +- .../logging/log4j/core/filter/MarkerFilter.java | 14 +- .../logging/log4j/core/filter/RegexFilter.java | 89 +- .../log4j/core/filter/StructuredDataFilter.java | 18 +- .../log4j/core/filter/ThreadContextMapFilter.java | 18 +- .../logging/log4j/core/filter/ThresholdFilter.java | 24 +- .../logging/log4j/core/filter/TimeFilter.java | 17 +- .../logging/log4j/core/filter/package-info.java | 6 +- .../apache/logging/log4j/core/helpers/Assert.java | 59 - .../logging/log4j/core/helpers/Booleans.java | 37 - .../logging/log4j/core/helpers/CachedClock.java | 74 - .../logging/log4j/core/helpers/Charsets.java | 75 - .../apache/logging/log4j/core/helpers/Clock.java | 29 - .../logging/log4j/core/helpers/ClockFactory.java | 87 - .../apache/logging/log4j/core/helpers/Closer.java | 115 - .../log4j/core/helpers/CoarseCachedClock.java | 67 - .../logging/log4j/core/helpers/Constants.java | 58 - .../logging/log4j/core/helpers/CyclicBuffer.java | 94 - .../logging/log4j/core/helpers/FileUtils.java | 99 - .../logging/log4j/core/helpers/Integers.java | 51 - .../logging/log4j/core/helpers/KeyValuePair.java | 76 - .../apache/logging/log4j/core/helpers/Loader.java | 254 --- .../logging/log4j/core/helpers/NameUtil.java | 57 - .../logging/log4j/core/helpers/NetUtils.java | 73 - .../log4j/core/helpers/OptionConverter.java | 328 --- .../log4j/core/helpers/SecretKeyProvider.java | 27 - .../apache/logging/log4j/core/helpers/Strings.java | 66 - .../logging/log4j/core/helpers/SystemClock.java | 33 - .../logging/log4j/core/helpers/Throwables.java | 66 - .../logging/log4j/core/helpers/Transform.java | 182 -- .../logging/log4j/core/helpers/UUIDUtil.java | 189 -- .../logging/log4j/core/helpers/package-info.java | 20 - .../logging/log4j/core/impl/ExtendedClassInfo.java | 116 + .../log4j/core/impl/ExtendedStackTraceElement.java | 140 ++ .../log4j/core/impl/Log4jContextFactory.java | 180 +- .../logging/log4j/core/impl/Log4jLogEvent.java | 338 ++- .../core/impl/ReflectiveCallerClassUtility.java | 158 -- .../log4j/core/impl/StackTracePackageElement.java | 75 - .../log4j/core/impl/ThrowableFormatOptions.java | 17 +- .../logging/log4j/core/impl/ThrowableProxy.java | 734 ++++--- .../logging/log4j/core/impl/package-info.java | 2 +- .../jackson/ExtendedStackTraceElementMixIn.java | 90 + .../logging/log4j/core/jackson/Initializers.java | 67 + .../logging/log4j/core/jackson/JsonConstants.java | 33 + .../logging/log4j/core/jackson/LevelMixIn.java | 45 + .../core/jackson/ListOfMapEntryDeserializer.java | 55 + .../core/jackson/ListOfMapEntrySerializer.java | 53 + .../log4j/core/jackson/Log4jJsonModule.java | 48 + .../log4j/core/jackson/Log4jJsonObjectMapper.java | 40 + .../Log4jStackTraceElementDeserializer.java | 82 + .../logging/log4j/core/jackson/Log4jXmlModule.java | 46 + .../log4j/core/jackson/Log4jXmlObjectMapper.java | 41 + .../logging/log4j/core/jackson/LogEventMixIn.java | 128 ++ .../logging/log4j/core/jackson/MapEntry.java | 110 + .../logging/log4j/core/jackson/MarkerMixIn.java | 76 + .../log4j/core/jackson/MessageSerializer.java | 45 + .../MutableThreadContextStackDeserializer.java | 51 + .../core/jackson/SimpleMessageDeserializer.java | 47 + .../log4j/core/jackson/StackTraceElementMixIn.java | 62 + .../log4j/core/jackson/ThrowableProxyMixIn.java | 80 + .../logging/log4j/core/jackson/XmlConstants.java | 38 + .../logging/log4j/core/jackson/package-info.java | 21 + .../logging/log4j/core/jmx/AppenderAdmin.java | 17 +- .../logging/log4j/core/jmx/AppenderAdminMBean.java | 13 +- .../logging/log4j/core/jmx/AsyncAppenderAdmin.java | 133 ++ .../log4j/core/jmx/AsyncAppenderAdminMBean.java | 131 ++ .../log4j/core/jmx/ContextSelectorAdmin.java | 22 +- .../log4j/core/jmx/ContextSelectorAdminMBean.java | 24 +- .../logging/log4j/core/jmx/LoggerConfigAdmin.java | 22 +- .../log4j/core/jmx/LoggerConfigAdminMBean.java | 2 +- .../logging/log4j/core/jmx/LoggerContextAdmin.java | 132 +- .../log4j/core/jmx/LoggerContextAdminMBean.java | 52 +- .../logging/log4j/core/jmx/RingBufferAdmin.java | 77 + .../log4j/core/jmx/RingBufferAdminMBean.java | 71 + .../org/apache/logging/log4j/core/jmx/Server.java | 348 ++- .../logging/log4j/core/jmx/StatusLoggerAdmin.java | 45 +- .../log4j/core/jmx/StatusLoggerAdminMBean.java | 43 +- .../logging/log4j/core/jmx/package-info.java | 2 +- .../log4j/core/layout/AbstractJacksonLayout.java | 62 + .../logging/log4j/core/layout/AbstractLayout.java | 52 +- .../log4j/core/layout/AbstractStringLayout.java | 40 +- .../logging/log4j/core/layout/GelfLayout.java | 222 ++ .../logging/log4j/core/layout/HTMLLayout.java | 338 --- .../logging/log4j/core/layout/HtmlLayout.java | 411 ++++ .../logging/log4j/core/layout/JSONLayout.java | 373 ---- .../logging/log4j/core/layout/JacksonFactory.java | 120 ++ .../logging/log4j/core/layout/JsonLayout.java | 890 ++++++++ .../logging/log4j/core/layout/LoggerFields.java | 25 +- .../logging/log4j/core/layout/PatternLayout.java | 253 ++- .../logging/log4j/core/layout/RFC5424Layout.java | 719 ------- .../logging/log4j/core/layout/Rfc5424Layout.java | 714 ++++++ .../log4j/core/layout/SerializedLayout.java | 29 +- .../logging/log4j/core/layout/SyslogLayout.java | 76 +- .../logging/log4j/core/layout/XMLLayout.java | 369 ---- .../logging/log4j/core/layout/XmlLayout.java | 297 +++ .../logging/log4j/core/layout/package-info.java | 6 +- .../logging/log4j/core/lookup/AbstractLookup.java | 36 + .../log4j/core/lookup/ContextMapLookup.java | 8 +- .../logging/log4j/core/lookup/DateLookup.java | 14 +- .../log4j/core/lookup/EnvironmentLookup.java | 16 +- .../logging/log4j/core/lookup/Interpolator.java | 106 +- .../logging/log4j/core/lookup/JavaLookup.java | 118 + .../lookup/JmxRuntimeInputArgumentsLookup.java | 52 + .../logging/log4j/core/lookup/JndiLookup.java | 43 +- .../logging/log4j/core/lookup/MapLookup.java | 116 +- .../log4j/core/lookup/ResourceBundleLookup.java | 70 + .../logging/log4j/core/lookup/StrLookup.java | 27 +- .../logging/log4j/core/lookup/StrMatcher.java | 2 +- .../logging/log4j/core/lookup/StrSubstitutor.java | 246 ++- .../log4j/core/lookup/StructuredDataLookup.java | 10 +- .../log4j/core/lookup/SystemPropertiesLookup.java | 26 +- .../logging/log4j/core/lookup/WebLookup.java | 121 -- .../logging/log4j/core/lookup/package-info.java | 5 +- .../logging/log4j/core/net/AbstractJMSManager.java | 154 -- .../log4j/core/net/AbstractJMSReceiver.java | 77 - .../log4j/core/net/AbstractSocketManager.java | 33 +- .../log4j/core/net/DatagramSocketManager.java | 39 +- .../logging/log4j/core/net/JMSQueueManager.java | 236 -- .../logging/log4j/core/net/JMSQueueReceiver.java | 106 - .../logging/log4j/core/net/JMSTopicManager.java | 236 -- .../logging/log4j/core/net/JMSTopicReceiver.java | 104 - .../apache/logging/log4j/core/net/JndiManager.java | 143 ++ .../logging/log4j/core/net/MimeMessageBuilder.java | 4 +- .../log4j/core/net/MulticastDNSAdvertiser.java | 252 --- .../log4j/core/net/MulticastDnsAdvertiser.java | 233 ++ .../apache/logging/log4j/core/net/Protocol.java | 2 + .../apache/logging/log4j/core/net/SMTPManager.java | 356 --- .../apache/logging/log4j/core/net/Severity.java | 51 +- .../apache/logging/log4j/core/net/SmtpManager.java | 356 +++ .../logging/log4j/core/net/SocketServer.java | 249 --- .../logging/log4j/core/net/SslSocketManager.java | 186 ++ .../logging/log4j/core/net/TCPSocketManager.java | 283 --- .../logging/log4j/core/net/TLSSocketManager.java | 170 -- .../logging/log4j/core/net/TcpSocketManager.java | 301 +++ .../logging/log4j/core/net/UDPSocketServer.java | 195 -- .../log4j/core/net/mom/jms/JmsQueueReceiver.java | 71 + .../log4j/core/net/mom/jms/JmsTopicReceiver.java | 70 + .../log4j/core/net/mom/jms/package-info.java | 26 + .../logging/log4j/core/net/package-info.java | 9 +- .../core/net/server/AbstractLogEventBridge.java | 44 + .../core/net/server/AbstractSocketServer.java | 131 ++ .../core/net/server/InputStreamLogEventBridge.java | 103 + .../logging/log4j/core/net/server/JmsServer.java | 113 + .../net/server/JsonInputStreamLogEventBridge.java | 85 + .../log4j/core/net/server/LogEventBridge.java | 57 + .../server/ObjectInputStreamLogEventBridge.java | 45 + .../core/net/server/SecureTcpSocketServer.java | 37 + .../log4j/core/net/server/TcpSocketServer.java | 258 +++ .../log4j/core/net/server/UdpSocketServer.java | 186 ++ .../net/server/XmlInputStreamLogEventBridge.java | 54 + .../log4j/core/net/server/package-info.java | 24 + .../net/ssl/AbstractKeyStoreConfiguration.java | 85 + .../log4j/core/net/ssl/KeyStoreConfiguration.java | 111 +- .../net/ssl/KeyStoreConfigurationException.java | 4 +- .../log4j/core/net/ssl/SSLConfiguration.java | 247 --- .../core/net/ssl/SSLConfigurationDefaults.java | 27 - .../core/net/ssl/SSLConfigurationException.java | 26 - .../log4j/core/net/ssl/SslConfiguration.java | 246 +++ .../core/net/ssl/SslConfigurationDefaults.java | 27 + .../core/net/ssl/SslConfigurationException.java | 28 + .../log4j/core/net/ssl/StoreConfiguration.java | 74 +- .../core/net/ssl/StoreConfigurationException.java | 8 +- .../core/net/ssl/TrustStoreConfiguration.java | 112 +- .../net/ssl/TrustStoreConfigurationException.java | 4 +- .../logging/log4j/core/net/ssl/package-info.java | 2 +- .../apache/logging/log4j/core/osgi/Activator.java | 101 + .../log4j/core/osgi/BundleContextSelector.java | 90 + .../logging/log4j/core/osgi/package-info.java | 21 + .../apache/logging/log4j/core/package-info.java | 2 +- .../core/pattern/AbstractPatternConverter.java | 28 +- .../core/pattern/AbstractStyleNameConverter.java | 2 +- .../logging/log4j/core/pattern/AnsiConverter.java | 24 + .../logging/log4j/core/pattern/AnsiEscape.java | 27 +- .../log4j/core/pattern/ArrayPatternConverter.java | 4 +- .../log4j/core/pattern/CachedDateFormat.java | 13 +- .../core/pattern/ClassNamePatternConverter.java | 4 +- .../log4j/core/pattern/DatePatternConverter.java | 215 +- .../core/pattern/EncodingPatternConverter.java | 108 + .../pattern/ExtendedThrowablePatternConverter.java | 14 +- .../core/pattern/FileDatePatternConverter.java | 4 +- .../core/pattern/FileLocationPatternConverter.java | 4 +- .../logging/log4j/core/pattern/FormattingInfo.java | 18 +- .../core/pattern/FullLocationPatternConverter.java | 4 +- .../log4j/core/pattern/HighlightConverter.java | 67 +- .../core/pattern/IntegerPatternConverter.java | 6 +- .../log4j/core/pattern/LevelPatternConverter.java | 47 +- .../core/pattern/LineLocationPatternConverter.java | 4 +- .../pattern/LineSeparatorPatternConverter.java | 69 +- .../core/pattern/LiteralPatternConverter.java | 8 +- .../core/pattern/LogEventPatternConverter.java | 10 +- .../log4j/core/pattern/LoggerPatternConverter.java | 4 +- .../log4j/core/pattern/MDCPatternConverter.java | 96 - .../log4j/core/pattern/MapPatternConverter.java | 12 +- .../log4j/core/pattern/MarkerPatternConverter.java | 4 +- .../log4j/core/pattern/MdcPatternConverter.java | 96 + .../core/pattern/MessagePatternConverter.java | 4 +- .../pattern/MethodLocationPatternConverter.java | 4 +- .../log4j/core/pattern/NDCPatternConverter.java | 58 - .../log4j/core/pattern/NameAbbreviator.java | 16 +- .../log4j/core/pattern/NdcPatternConverter.java | 58 + .../log4j/core/pattern/PatternConverter.java | 9 +- .../log4j/core/pattern/PatternFormatter.java | 18 +- .../logging/log4j/core/pattern/PatternParser.java | 445 ++-- .../log4j/core/pattern/RegexReplacement.java | 8 +- .../core/pattern/RegexReplacementConverter.java | 4 +- .../core/pattern/RelativeTimePatternConverter.java | 6 +- .../pattern/RootThrowablePatternConverter.java | 16 +- .../pattern/SequenceNumberPatternConverter.java | 2 +- .../logging/log4j/core/pattern/StyleConverter.java | 84 +- .../log4j/core/pattern/ThreadPatternConverter.java | 4 +- .../core/pattern/ThrowablePatternConverter.java | 15 +- .../log4j/core/pattern/UUIDPatternConverter.java | 67 - .../log4j/core/pattern/UuidPatternConverter.java | 67 + .../core/selector/ClassLoaderContextSelector.java | 129 +- .../log4j/core/selector/JNDIContextSelector.java | 169 -- .../log4j/core/selector/JndiContextSelector.java | 157 ++ .../logging/log4j/core/selector/package-info.java | 2 +- .../apache/logging/log4j/core/tools/Generate.java | 556 +++++ .../logging/log4j/core/tools/package-info.java | 20 + .../org/apache/logging/log4j/core/util/Assert.java | 62 + .../apache/logging/log4j/core/util/Booleans.java | 40 + .../apache/logging/log4j/core/util/Builder.java | 45 + .../logging/log4j/core/util/CachedClock.java | 88 + .../logging/log4j/core/util/Cancellable.java | 30 + .../apache/logging/log4j/core/util/Charsets.java | 101 + .../org/apache/logging/log4j/core/util/Clock.java | 29 + .../logging/log4j/core/util/ClockFactory.java | 91 + .../org/apache/logging/log4j/core/util/Closer.java | 164 ++ .../logging/log4j/core/util/CoarseCachedClock.java | 78 + .../apache/logging/log4j/core/util/Constants.java | 58 + .../logging/log4j/core/util/CyclicBuffer.java | 94 + .../core/util/DefaultShutdownCallbackRegistry.java | 181 ++ .../apache/logging/log4j/core/util/FileUtils.java | 119 + .../apache/logging/log4j/core/util/Integers.java | 67 + .../apache/logging/log4j/core/util/JndiCloser.java | 55 + .../logging/log4j/core/util/KeyValuePair.java | 155 ++ .../org/apache/logging/log4j/core/util/Loader.java | 334 +++ .../apache/logging/log4j/core/util/NameUtil.java | 59 + .../apache/logging/log4j/core/util/NetUtils.java | 74 + .../logging/log4j/core/util/OptionConverter.java | 328 +++ .../apache/logging/log4j/core/util/Patterns.java | 51 + .../logging/log4j/core/util/ReflectionUtil.java | 195 ++ .../logging/log4j/core/util/SecretKeyProvider.java | 32 + .../apache/logging/log4j/core/util/SetUtils.java | 46 + .../log4j/core/util/ShutdownCallbackRegistry.java | 56 + .../logging/log4j/core/util/SystemClock.java | 33 + .../apache/logging/log4j/core/util/Throwables.java | 172 ++ .../apache/logging/log4j/core/util/Transform.java | 184 ++ .../apache/logging/log4j/core/util/TypeUtil.java | 199 ++ .../apache/logging/log4j/core/util/UuidUtil.java | 196 ++ .../logging/log4j/core/util/package-info.java | 20 + .../core/web/Log4jServletContainerInitializer.java | 55 - .../core/web/Log4jServletContextListener.java | 58 - .../logging/log4j/core/web/Log4jServletFilter.java | 82 - .../log4j/core/web/Log4jWebInitializer.java | 71 - .../log4j/core/web/Log4jWebInitializerImpl.java | 202 -- .../logging/log4j/core/web/package-info.java | 22 - log4j-core/src/main/resources/Log4j-config.xsd | 13 + log4j-core/src/main/resources/Log4j-events.dtd | 7 +- log4j-core/src/main/resources/Log4j-events.xsd | 6 +- log4j-core/src/main/resources/Log4j-levels.xsd | 31 + .../resources/META-INF/log4j-provider.properties | 4 +- .../services/javax.annotation.processing.Processor | 17 + .../javax.servlet.ServletContainerInitializer | 1 - log4j-core/src/site/resources/images/logo.jpg | Bin 8184 -> 0 bytes log4j-core/src/site/resources/images/ls-logo.jpg | Bin 32725 -> 0 bytes log4j-core/src/site/site.xml | 5 +- log4j-core/src/site/xdoc/index.xml | 11 +- .../logging/dumbster/smtp/SimpleSmtpServer.java | 14 +- .../apache/logging/dumbster/smtp/SmtpMessage.java | 4 +- .../apache/logging/dumbster/smtp/SmtpRequest.java | 8 +- .../log4j/DebugDisabledPerformanceComparison.java | 267 --- .../logging/log4j/FilterPerformanceComparison.java | 3 + .../apache/logging/log4j/LocationPerfCheck.java | 46 - .../apache/logging/log4j/Log4jInitPerformance.java | 54 - .../org/apache/logging/log4j/LogRolloverTest.java | 41 + .../org/apache/logging/log4j/MarkerMixInTest.java | 93 + .../logging/log4j/PerformanceComparison.java | 5 +- .../org/apache/logging/log4j/PerformanceRun.java | 38 +- .../logging/log4j/categories/PerformanceTests.java | 24 + .../logging/log4j/categories/package-info.java | 22 + .../log4j/core/AppenderRefLevelJsonTest.java | 88 + .../logging/log4j/core/AppenderRefLevelTest.java | 61 +- .../log4j/core/BasicConfigurationFactory.java | 12 +- .../logging/log4j/core/CollectionLoggingTest.java | 30 +- .../logging/log4j/core/ExtendedLevelTest.java | 69 + .../apache/logging/log4j/core/FileConfigTest.java | 52 +- .../apache/logging/log4j/core/HostNameTest.java | 72 + .../apache/logging/log4j/core/LateConfigTest.java | 42 +- .../org/apache/logging/log4j/core/LevelTest.java | 130 ++ .../logging/log4j/core/LogEventFactoryTest.java | 83 +- .../apache/logging/log4j/core/LogEventTest.java | 26 +- .../apache/logging/log4j/core/LoggerDateTest.java | 52 + .../log4j/core/LoggerSerializationTest.java | 44 + .../org/apache/logging/log4j/core/LoggerTest.java | 143 +- .../logging/log4j/core/LoggerUpdateTest.java | 59 +- .../org/apache/logging/log4j/core/LookupTest.java | 47 + .../logging/log4j/core/ShutdownDisabledTest.java | 37 +- .../apache/logging/log4j/core/SimplePerfTest.java | 9 +- .../logging/log4j/core/StrictXMLConfigTest.java | 162 -- .../logging/log4j/core/StrictXmlConfigTest.java | 133 ++ .../logging/log4j/core/ThreadedPerfTest.java | 18 +- .../apache/logging/log4j/core/ThreadedTest.java | 61 +- .../java/org/apache/logging/log4j/core/Timer.java | 271 --- .../logging/log4j/core/TimestampMessageTest.java | 105 + .../org/apache/logging/log4j/core/XMLEvents.java | 72 - .../org/apache/logging/log4j/core/XmlEvents.java | 70 + .../core/appender/AsyncAppenderNoLocationTest.java | 53 +- .../log4j/core/appender/AsyncAppenderTest.java | 23 +- .../ConsoleAppenderAnsiStyleJira180Main.java | 4 +- .../ConsoleAppenderAnsiStyleJira272Main.java | 4 +- .../ConsoleAppenderAnsiStyleJira319Main.java | 4 +- .../ConsoleAppenderAnsiStyleLayoutMain.java | 2 +- .../ConsoleAppenderNoAnsiStyleLayoutMain.java | 60 + .../log4j/core/appender/ConsoleAppenderTest.java | 55 +- .../log4j/core/appender/FailoverAppenderTest.java | 75 +- .../log4j/core/appender/FileAppenderTest.java | 125 +- .../appender/JSONCompleteFileAppenderTest.java | 108 - .../logging/log4j/core/appender/Jira739Test.java | 53 + .../appender/JsonCompleteFileAppenderTest.java | 96 + .../MemoryMappedFileAppenderLocationTest.java | 98 + .../MemoryMappedFileAppenderRemapTest.java | 98 + .../MemoryMappedFileAppenderSimpleTest.java | 89 + .../core/appender/MemoryMappedFileManagerTest.java | 102 + .../core/appender/OutputStreamAppenderTest.java | 14 +- .../log4j/core/appender/ProgressConsoleTest.java | 75 + .../RandomAccessFileAppenderLocationTest.java | 61 - .../appender/RandomAccessFileAppenderTest.java | 61 - .../appender/RandomAccessFileAppenderTests.java | 95 + .../core/appender/RandomAccessFileManagerTest.java | 45 +- ...ollingRandomAccessFileAppenderLocationTest.java | 61 - ...ollingRandomAccessFileAppenderRolloverTest.java | 12 +- .../RollingRandomAccessFileAppenderTest.java | 61 - .../log4j/core/appender/SMTPAppenderTest.java | 184 -- .../log4j/core/appender/SmtpAppenderTest.java | 185 ++ .../log4j/core/appender/SocketAppenderTest.java | 129 +- .../log4j/core/appender/SyslogAppenderTest.java | 19 +- .../core/appender/SyslogAppenderTestBase.java | 55 +- .../log4j/core/appender/TLSSyslogAppenderTest.java | 110 - .../log4j/core/appender/TLSSyslogFrameTest.java | 71 - .../log4j/core/appender/TlsSyslogAppenderTest.java | 117 + .../log4j/core/appender/TlsSyslogFrameTest.java | 71 + .../core/appender/XmlCompactFileAppenderTest.java | 15 +- .../XmlCompactFileAppenderValidationTest.java | 2 +- .../XmlCompactFileAsyncAppenderValidationTest.java | 2 +- .../core/appender/XmlCompleteFileAppenderTest.java | 15 +- .../log4j/core/appender/XmlFileAppenderTest.java | 17 +- .../appender/XmlRandomAccessFileAppenderTest.java | 15 +- .../appender/db/AbstractDatabaseAppenderTest.java | 16 +- .../appender/db/AbstractDatabaseManagerTest.java | 81 +- .../appender/db/jdbc/AbstractJdbcAppenderTest.java | 99 +- .../core/appender/db/jdbc/ColumnConfigTest.java | 7 +- .../db/jdbc/DataSourceConnectionSourceTest.java | 83 +- .../db/jdbc/DriverManagerConnectionSourceTest.java | 207 -- .../db/jdbc/FactoryMethodConnectionSourceTest.java | 18 + .../core/appender/db/jdbc/JdbcH2AppenderTest.java | 5 +- .../appender/db/jdbc/JdbcHyperSqlAppenderTest.java | 4 +- .../appender/db/jpa/AbstractJpaAppenderTest.java | 54 +- .../core/appender/db/jpa/JpaH2AppenderTest.java | 10 +- .../appender/db/jpa/JpaHyperSqlAppenderTest.java | 23 +- .../log4j/core/appender/db/jpa/TestBaseEntity.java | 23 +- .../core/appender/db/jpa/TestBasicEntity.java | 1 + .../ContextMapAttributeConverterTest.java | 3 +- .../converter/MarkerAttributeConverterTest.java | 20 +- .../converter/ThrowableAttributeConverterTest.java | 4 +- .../core/appender/db/nosql/NoSQLAppenderTest.java | 81 - .../db/nosql/NoSQLDatabaseManagerTest.java | 557 ----- .../log4j/core/appender/mom/JmsAppenderIT.java | 126 ++ .../log4j/core/appender/mom/JmsAppenderTest.java | 139 ++ .../appender/rewrite/MapRewritePolicyTest.java | 77 +- .../core/appender/rewrite/RewriteAppenderTest.java | 57 +- .../core/appender/rewrite/TestRewritePolicy.java | 4 +- .../rolling/AbstractRollingAppenderSizeTest.java | 92 - .../rolling/OnStartupTriggeringPolicyTest.java | 6 +- .../appender/rolling/PatternProcessorTest.java | 211 ++ .../rolling/RollingAppenderSizeGzTest.java | 34 - .../appender/rolling/RollingAppenderSizeTest.java | 100 + .../rolling/RollingAppenderSizeZipTest.java | 34 - .../rolling/RollingAppenderTimeAndSizeTest.java | 59 +- .../appender/rolling/RollingAppenderTimeTest.java | 75 +- .../rolling/RollingAppenderUncompressedTest.java | 6 +- .../rolling/RollingFileAppenderAccessTest.java | 50 + ...ingRandomAccessFileManagerHeaderFooterTest.java | 120 ++ .../RollingRandomAccessFileManagerTest.java | 60 +- .../rolling/action/FileRenameActionTest.java | 128 ++ .../rolling/helper/FileRenameActionTest.java | 128 -- .../appender/routing/JSONRoutingAppender2Test.java | 85 - .../appender/routing/JSONRoutingAppenderTest.java | 85 - .../appender/routing/JsonRoutingAppender2Test.java | 76 + .../appender/routing/JsonRoutingAppenderTest.java | 76 + .../core/appender/routing/RoutingAppenderTest.java | 63 +- .../routing/RoutingAppenderWithJndiTest.java | 77 +- .../routing/RoutingDefaultAppenderTest.java | 62 +- .../core/async/AsyncLoggerConfigAutoFlushTest.java | 57 + .../log4j/core/async/AsyncLoggerConfigTest.java | 5 +- .../log4j/core/async/AsyncLoggerConfigTest2.java | 5 +- .../AsyncLoggerConfigUseAfterShutdownTest.java | 46 + .../core/async/AsyncLoggerContextSelectorTest.java | 11 +- .../log4j/core/async/AsyncLoggerContextTest.java | 4 +- .../log4j/core/async/AsyncLoggerLocationTest.java | 10 +- .../logging/log4j/core/async/AsyncLoggerTest.java | 12 +- .../async/AsyncLoggerTestCachedThreadName.java | 75 + .../async/AsyncLoggerTestUncachedThreadName.java | 76 + .../core/async/AsyncLoggerThreadContextTest.java | 76 + .../async/AsyncLoggerThreadNameStrategyTest.java | 69 + .../async/AsyncLoggerTimestampMessageTest.java | 104 + .../async/AsyncLoggerUseAfterShutdownTest.java | 62 + .../async/AsyncLoggersWithAsyncAppenderTest.java | 74 + .../AsyncLoggersWithAsyncLoggerConfigTest.java | 74 + .../log4j/core/async/AsyncRootReloadTest.java | 60 + .../log4j/core/async/RingBufferLogEventTest.java | 173 ++ .../log4j/core/async/perftest/MTPerfTest.java | 111 - .../log4j/core/async/perftest/MtPerfTest.java | 111 + .../log4j/core/async/perftest/PerfTest.java | 99 +- .../log4j/core/async/perftest/PerfTestDriver.java | 140 +- .../async/perftest/PerfTestResultFormatter.java | 12 +- .../logging/log4j/core/config/AdvertiserTest.java | 13 +- .../log4j/core/config/BaseConfigurationTest.java | 74 - .../log4j/core/config/ConfigurationTest.java | 141 ++ .../log4j/core/config/CustomConfigurationTest.java | 101 + .../logging/log4j/core/config/FileOutputTest.java | 50 +- .../log4j/core/config/InMemoryAdvertiser.java | 6 +- .../log4j/core/config/MissingRootLoggerTest.java | 81 + .../core/config/ReconfigurationDeadlockTest.java | 127 ++ .../log4j/core/config/TestConfigurator.java | 131 +- .../log4j/core/config/TestConfiguratorError.java | 2 +- .../logging/log4j/core/config/XIncludeTest.java | 142 ++ .../core/config/XMLConfigurationPropsTest.java | 106 - .../log4j/core/config/XMLConfigurationTest.java | 174 -- .../log4j/core/config/XMLLoggerPropsTest.java | 84 - .../plugins/convert/TypeConverterRegistryTest.java | 80 + .../config/plugins/convert/TypeConvertersTest.java | 204 ++ .../core/config/plugins/processor/FakePlugin.java | 33 + .../plugins/processor/PluginProcessorTest.java | 93 + .../plugins/util/PluginManagerPackagesTest.java | 114 + .../core/config/plugins/util/ResolverUtilTest.java | 155 ++ .../plugins/validation/ValidatingPlugin.java | 69 + .../validators/RequiredValidatorTest.java | 63 + .../core/config/xml/XmlConfigurationPropsTest.java | 100 + .../log4j/core/config/xml/XmlLoggerPropsTest.java | 82 + .../logging/log4j/core/filter/BurstFilterTest.java | 65 +- .../DynamicThresholdFilterSerializationTest.java | 47 + .../core/filter/DynamicThresholdFilterTest.java | 41 +- .../logging/log4j/core/filter/MapFilterTest.java | 33 +- .../log4j/core/filter/MarkerFilterTest.java | 23 +- .../logging/log4j/core/filter/RegexFilterTest.java | 53 +- .../core/filter/StructuredDataFilterTest.java | 26 +- .../core/filter/ThreadContextMapFilterTest.java | 24 +- .../log4j/core/filter/ThresholdFilterTest.java | 14 +- .../logging/log4j/core/filter/TimeFilterTest.java | 18 +- .../log4j/core/helpers/CachedClockTest.java | 47 - .../logging/log4j/core/helpers/CharsetsTest.java | 65 - .../log4j/core/helpers/ClockFactoryTest.java | 85 - .../log4j/core/helpers/SystemClockTest.java | 47 - .../logging/log4j/core/helpers/UUIDTest.java | 123 -- .../logging/log4j/core/impl/Log4jLogEventTest.java | 161 +- .../log4j/core/impl/ReflectionComparison.java | 108 - .../core/impl/ThrowableFormatOptionsTest.java | 57 +- .../log4j/core/impl/ThrowableProxyTest.java | 171 +- .../core/jackson/JacksonIssue429MyNamesTest.java | 127 ++ .../log4j/core/jackson/JacksonIssue429Test.java | 92 + .../logging/log4j/core/jackson/LevelMixInTest.java | 100 + .../core/jackson/StackTraceElementMixInTest.java | 83 + .../apache/logging/log4j/core/jmx/ServerTest.java | 120 ++ .../logging/log4j/core/layout/GelfLayoutTest.java | 204 ++ .../logging/log4j/core/layout/HTMLLayoutTest.java | 126 -- .../logging/log4j/core/layout/HtmlLayoutTest.java | 157 ++ .../logging/log4j/core/layout/JSONLayoutTest.java | 133 -- .../logging/log4j/core/layout/JsonLayoutTest.java | 283 +++ .../log4j/core/layout/LogEventFixtures.java | 99 + .../log4j/core/layout/PatternLayoutTest.java | 236 +- .../log4j/core/layout/RFC5424LayoutTest.java | 427 ---- .../log4j/core/layout/Rfc5424LayoutTest.java | 457 ++++ .../log4j/core/layout/SerializedLayoutTest.java | 55 +- .../log4j/core/layout/SyslogLayoutTest.java | 17 +- .../logging/log4j/core/layout/XMLLayoutTest.java | 112 - .../logging/log4j/core/layout/XmlLayoutTest.java | 274 +++ .../log4j/core/lookup/ContextMapLookupTest.java | 54 +- .../logging/log4j/core/lookup/DateLookupTest.java | 83 +- .../log4j/core/lookup/EnvironmentLookupTest.java | 3 +- .../log4j/core/lookup/InterpolatorTest.java | 36 +- .../logging/log4j/core/lookup/JndiLookupTest.java | 15 +- .../lookup/MainInputArgumentsJmxLookupTest.java | 57 + .../core/lookup/MainInputArgumentsMapLookup.java | 57 + .../logging/log4j/core/lookup/MapLookupTest.java | 67 + .../core/lookup/ResourceBundleLookupTest.java | 51 + .../log4j/core/lookup/StrSubstitutorTest.java | 17 +- .../core/lookup/StructuredDataLookupTest.java | 3 +- .../core/lookup/SystemPropertiesLookupTest.java | 4 +- .../log4j/core/net/AbstractSocketServerTest.java | 141 -- .../log4j/core/net/JMSQueueAppenderTest.java | 83 - .../log4j/core/net/JMSQueueFailoverTest.java | 128 -- .../logging/log4j/core/net/JMSQueueTest.java | 143 -- .../log4j/core/net/JMSTopicFailoverTest.java | 127 -- .../logging/log4j/core/net/JMSTopicTest.java | 144 -- .../logging/log4j/core/net/PriorityTest.java | 4 +- .../log4j/core/net/SocketMessageLossTest.java | 28 +- .../log4j/core/net/SocketReconnectTest.java | 37 +- .../apache/logging/log4j/core/net/SocketTest.java | 39 +- .../log4j/core/net/TCPSocketServerTest.java | 53 - .../log4j/core/net/UDPSocketServerTest.java | 53 - .../log4j/core/net/mock/MockSyslogServer.java | 4 +- .../core/net/mock/MockSyslogServerFactory.java | 19 +- .../log4j/core/net/mock/MockTCPSyslogServer.java | 76 - .../log4j/core/net/mock/MockTLSSyslogServer.java | 133 -- .../log4j/core/net/mock/MockTcpSyslogServer.java | 77 + .../log4j/core/net/mock/MockTlsSyslogServer.java | 137 ++ .../log4j/core/net/mock/MockUDPSyslogServer.java | 56 - .../log4j/core/net/mock/MockUdpSyslogServer.java | 57 + .../core/net/server/AbstractSocketServerTest.java | 219 ++ .../core/net/server/SslXmlSocketServerTest.java | 91 + .../core/net/server/TcpJsonSocketServerTest.java | 62 + .../net/server/TcpSerializedSocketServerTest.java | 63 + .../core/net/server/TcpXmlSocketServerTest.java | 65 + .../core/net/server/UdpJsonSocketServerTest.java | 58 + .../net/server/UdpSerializedSocketServerTest.java | 58 + .../core/net/server/UdpXmlSocketServerTest.java | 61 + .../core/net/ssl/KeyStoreConfigurationTest.java | 25 +- .../ssl/LegacyBSDTLSSyslogInputStreamReader.java | 57 - .../ssl/LegacyBsdTlsSyslogInputStreamReader.java | 61 + .../log4j/core/net/ssl/SSLConfigurationTest.java | 64 - .../log4j/core/net/ssl/SslConfigurationTest.java | 65 + .../log4j/core/net/ssl/StoreConfigurationTest.java | 22 +- .../core/net/ssl/TLSSyslogInputStreamReader.java | 90 - .../net/ssl/TLSSyslogInputStreamReaderBase.java | 35 - .../log4j/core/net/ssl/TLSSyslogMessageFormat.java | 23 - .../log4j/core/net/ssl/TLSSyslogTestUtil.java | 74 - .../logging/log4j/core/net/ssl/TestConstants.java | 2 + .../core/net/ssl/TlsSyslogInputStreamReader.java | 91 + .../net/ssl/TlsSyslogInputStreamReaderBase.java | 35 + .../log4j/core/net/ssl/TlsSyslogMessageFormat.java | 23 + .../log4j/core/net/ssl/TlsSyslogTestUtil.java | 75 + .../core/net/ssl/TrustStoreConfigurationTest.java | 22 +- .../log4j/core/pattern/CallerInformationTest.java | 63 + .../core/pattern/DatePatternConverterTest.java | 133 ++ .../core/pattern/EncodingPatternConverterTest.java | 48 + .../ExtendedThrowablePatternConverterTest.java | 21 +- .../log4j/core/pattern/ExtendedThrowableTest.java | 51 +- .../core/pattern/LevelPatternConverterTest.java | 6 +- .../core/pattern/LiteralPatternConverterTest.java | 43 + .../core/pattern/MapPatternConverterTest.java | 3 +- .../core/pattern/MarkerPatternConverterTest.java | 4 +- .../core/pattern/MessagePatternConverterTest.java | 14 +- .../log4j/core/pattern/NameAbbreviatorTest.java | 74 +- .../log4j/core/pattern/PatternParserTest.java | 76 +- .../log4j/core/pattern/PatternParserTest2.java | 92 + .../pattern/RegexReplacementConverterTest.java | 6 +- .../log4j/core/pattern/RegexReplacementTest.java | 75 +- .../pattern/RootThrowablePatternConverterTest.java | 8 +- .../log4j/core/pattern/RootThrowableTest.java | 46 +- .../log4j/core/pattern/StyleConverterTest.java | 59 +- .../pattern/ThrowablePatternConverterTest.java | 9 +- .../logging/log4j/core/pattern/ThrowableTest.java | 48 +- .../selector/ClassLoaderContextSelectorTest.java | 62 + .../log4j/core/selector/TestClassLoader.java | 73 + .../logging/log4j/core/selector/a/Logging1.java | 26 + .../logging/log4j/core/selector/b/Logging2.java | 26 + .../logging/log4j/core/selector/c/Logging3.java | 26 + .../log4j/core/tools/GenerateCustomLoggerTest.java | 136 ++ .../core/tools/GenerateExtendedLoggerTest.java | 156 ++ .../logging/log4j/core/util/CharsetsTest.java | 65 + .../logging/log4j/core/util/ClockFactoryTest.java | 103 + .../apache/logging/log4j/core/util/Compare.java | 2 +- .../logging/log4j/core/util/FileUtilsTest.java | 69 + .../logging/log4j/core/util/IntegersTest.java | 41 + .../core/util/KeyValuePairSerializationTest.java | 39 + .../apache/logging/log4j/core/util/Profiler.java | 59 +- .../core/util/ShutdownCallbackRegistryTest.java | 92 + .../log4j/core/util/StandardCharsetsTest.java | 71 + .../logging/log4j/core/util/SystemClockTest.java | 46 + .../logging/log4j/core/util/ThrowablesTest.java | 39 + .../org/apache/logging/log4j/core/util/Timer.java | 273 +++ .../apache/logging/log4j/core/util/UuidTest.java | 122 ++ .../web/Log4jServletContainerInitializerTest.java | 141 -- .../core/web/Log4jServletContextListenerTest.java | 112 - .../log4j/core/web/Log4jServletFilterTest.java | 153 -- .../core/web/Log4jWebInitializerImplTest.java | 358 ---- .../logging/log4j/core/web/WebLookupTest.java | 70 - .../apache/logging/log4j/hamcrest/Descriptors.java | 44 + .../logging/log4j/hamcrest/FileMatchers.java | 163 ++ .../apache/logging/log4j/hamcrest/MapMatchers.java | 62 + .../org/apache/logging/log4j/junit/CleanFiles.java | 65 + .../logging/log4j/junit/InitialLoggerContext.java | 144 ++ .../apache/logging/log4j/junit/package-info.java | 22 + .../logging/log4j/test/AvailablePortFinder.java | 155 ++ .../apache/logging/log4j/test/ExtendedLevels.java | 30 + .../log4j/test/SomethingThatUsesLogging.java | 36 + .../log4j/test/appender/AlwaysFailAppender.java | 2 + .../log4j/test/appender/FailOnceAppender.java | 8 +- .../log4j/test/appender/InMemoryAppender.java | 6 +- .../logging/log4j/test/appender/ListAppender.java | 55 +- .../log4j/test/appender/UsesLoggingAppender.java | 72 + .../logging/log4j/test/layout/BasicLayout.java | 21 +- .../resources/AsyncLoggerConfigAutoFlushTest.xml | 20 + .../src/test/resources/AsyncLoggerConfigTest.xml | 2 +- .../src/test/resources/AsyncLoggerConfigTest2.xml | 2 +- log4j-core/src/test/resources/AsyncLoggerTest.xml | 2 +- .../resources/AsyncLoggerThreadContextTest.xml | 17 + .../resources/AsyncLoggerTimestampMessageTest.xml | 17 + .../AsyncLoggersWithAsyncAppenderTest.xml | 17 + .../AsyncLoggersWithAsyncLoggerConfigTest.xml | 14 + .../src/test/resources/ContextMapLookupTest.xml | 29 + log4j-core/src/test/resources/FlumeFuncTest.xml | 2 +- .../resources/JSONCompleteFileAppenderTest.xml | 14 - log4j-core/src/test/resources/JmsAppenderTest.xml | 42 + .../resources/JsonCompleteFileAppenderTest.xml | 14 + log4j-core/src/test/resources/LOG4J2-739.xml | 28 + log4j-core/src/test/resources/LOG4J2-807.xml | 32 + .../src/test/resources/META-INF/persistence.xml | 2 + .../MemoryMappedFileAppenderLocationTest.xml | 18 + .../MemoryMappedFileAppenderRemapTest.xml | 18 + .../resources/MemoryMappedFileAppenderTest.xml | 18 + log4j-core/src/test/resources/README.md | 88 + ...ingRandomAccessFileAppenderHeaderFooterTest.xml | 22 + .../resources/ShutdownCallbackRegistryTest.xml | 32 + .../test/resources/XmlCompactFileAppenderTest.xml | 2 +- .../src/test/resources/bad/log4j-badfilename.xml | 6 +- .../test/resources/bad/log4j-badfilterparam.xml | 6 +- .../src/test/resources/bad/log4j-badlayout.xml | 6 +- .../src/test/resources/bad/log4j-loggers.xml | 6 +- .../src/test/resources/bad/log4j-nofilter.xml | 10 +- log4j-core/src/test/resources/bad/log4j-status.xml | 6 +- .../customplugin/FixedStringLayout.java.source | 54 + .../src/test/resources/customplugin/log4j2-741.xml | 29 + .../log4j+config+with+plus+characters.xml | 31 + log4j-core/src/test/resources/log4j-Level.xml | 62 + log4j-core/src/test/resources/log4j-advertiser.xml | 2 +- .../test/resources/log4j-asynch-no-location.xml | 2 +- log4j-core/src/test/resources/log4j-asynch.xml | 2 +- log4j-core/src/test/resources/log4j-burst.xml | 2 +- .../src/test/resources/log4j-collectionLogging.xml | 39 + log4j-core/src/test/resources/log4j-config.json | 48 + .../src/test/resources/log4j-customLevel.xml | 48 + log4j-core/src/test/resources/log4j-date.xml | 42 + log4j-core/src/test/resources/log4j-failover.xml | 2 +- log4j-core/src/test/resources/log4j-fatalOnly.xml | 34 + log4j-core/src/test/resources/log4j-filetest.xml | 6 +- .../src/test/resources/log4j-jmsqueue-failover.xml | 52 - log4j-core/src/test/resources/log4j-jmsqueue.xml | 31 - .../src/test/resources/log4j-jmstopic-failover.xml | 52 - .../src/test/resources/log4j-loggerprops.xml | 25 +- log4j-core/src/test/resources/log4j-lookup.xml | 16 + log4j-core/src/test/resources/log4j-props.xml | 2 +- log4j-core/src/test/resources/log4j-props1.xml | 2 +- .../src/test/resources/log4j-reference-level.json | 38 + .../src/test/resources/log4j-reference-level.xml | 2 +- log4j-core/src/test/resources/log4j-replace.xml | 2 +- log4j-core/src/test/resources/log4j-rewrite.xml | 2 +- log4j-core/src/test/resources/log4j-rolling-gz.xml | 2 +- .../src/test/resources/log4j-rolling-zip.xml | 2 +- log4j-core/src/test/resources/log4j-rolling2.xml | 10 +- log4j-core/src/test/resources/log4j-rolling3.xml | 2 +- log4j-core/src/test/resources/log4j-rolling4.xml | 2 +- .../test/resources/log4j-rootthrowablefilter.xml | 2 +- .../src/test/resources/log4j-routing-by-jndi.xml | 5 +- log4j-core/src/test/resources/log4j-routing.json | 2 +- log4j-core/src/test/resources/log4j-routing.xml | 2 +- log4j-core/src/test/resources/log4j-routing2.json | 5 +- log4j-core/src/test/resources/log4j-routing3.xml | 2 +- log4j-core/src/test/resources/log4j-socket.xml | 18 +- log4j-core/src/test/resources/log4j-socket2.xml | 18 +- log4j-core/src/test/resources/log4j-strict1.xml | 10 +- log4j-core/src/test/resources/log4j-style.xml | 2 +- log4j-core/src/test/resources/log4j-test1.json | 74 + log4j-core/src/test/resources/log4j-test1.xml | 8 +- log4j-core/src/test/resources/log4j-test1.yaml | 48 + log4j-core/src/test/resources/log4j-test2.xml | 35 +- log4j-core/src/test/resources/log4j-test3.xml | 3 +- log4j-core/src/test/resources/log4j-threaded.xml | 6 +- log4j-core/src/test/resources/log4j-throwable.xml | 2 +- .../src/test/resources/log4j-throwablefilter.xml | 2 +- log4j-core/src/test/resources/log4j-xinclude.xml | 10 +- log4j-core/src/test/resources/log4j12-perf.xml | 4 +- log4j-core/src/test/resources/log4j12-perf2.xml | 31 - log4j-core/src/test/resources/log4j2-180.xml | 2 +- log4j-core/src/test/resources/log4j2-272.xml | 2 +- log4j-core/src/test/resources/log4j2-319.xml | 6 +- log4j-core/src/test/resources/log4j2-744.xml | 31 + .../src/test/resources/log4j2-calling-class.xml | 37 + log4j-core/src/test/resources/log4j2-config.xml | 3 +- .../resources/log4j2-console-highlight-default.xml | 4 +- .../resources/log4j2-console-highlight-logback.xml | 4 +- .../test/resources/log4j2-console-highlight.xml | 4 +- .../src/test/resources/log4j2-console-progress.xml | 31 + .../test/resources/log4j2-console-style-ansi.xml | 30 +- .../resources/log4j2-console-style-name-ansi.xml | 4 +- .../resources/log4j2-console-style-no-ansi.xml | 32 + log4j-core/src/test/resources/log4j2-console.xml | 4 +- .../src/test/resources/log4j2-dynamicfilter.xml | 2 +- log4j-core/src/test/resources/log4j2-mapfilter.xml | 2 +- .../src/test/resources/log4j2-perf-filter.xml | 6 +- log4j-core/src/test/resources/log4j2-perf.xml | 6 +- log4j-core/src/test/resources/log4j2-perf2.xml | 32 - log4j-core/src/test/resources/log4j2-sdfilter.xml | 2 +- log4j-core/src/test/resources/logback-flume.xml | 4 +- .../src/test/resources/logback-perf-filter.xml | 4 +- log4j-core/src/test/resources/logback-perf.xml | 4 +- log4j-core/src/test/resources/logback-perf2.xml | 29 - log4j-core/src/test/resources/logback-subst.xml | 4 +- .../src/test/resources/missingRootLogger.xml | 43 +- .../core/appender/db/jdbc/log4j2-data-source.xml | 6 +- .../appender/db/jdbc/log4j2-h2-driver-manager.xml | 45 - .../appender/db/jdbc/log4j2-h2-factory-method.xml | 6 +- .../db/jdbc/log4j2-hsqldb-driver-manager.xml | 45 - .../db/jdbc/log4j2-hsqldb-factory-method.xml | 6 +- .../core/appender/db/jpa/log4j2-h2-jpa-base.xml | 6 +- .../core/appender/db/jpa/log4j2-h2-jpa-basic.xml | 4 +- .../appender/db/jpa/log4j2-hsqldb-jpa-base.xml | 6 +- .../appender/db/jpa/log4j2-hsqldb-jpa-basic.xml | 4 +- .../core/impl/ForceNoDefClassFoundError.class | Bin 0 -> 1309 bytes .../log4j/core/lookup/resource-bundle.properties | 1 + .../core/lookup/resource-bundle_en.properties | 1 + log4j-core/src/test/resources/perf9MMapNoLoc.xml | 19 + .../test/resources/reconfiguration-deadlock.xml | 19 + log4j-core/src/test/resources/rollover-test.xml | 18 + log4j-core/src/test/resources/serializedEvent.dat | Bin 0 -> 2251 bytes log4j-core/src/test/resources/xml-events.xml | 2 +- log4j-distribution/pom.xml | 79 +- log4j-distribution/src/assembly/osgi-bin.xml | 66 - log4j-distribution/src/assembly/src.xml | 1 + log4j-flume-ng/.gitignore | 4 + log4j-flume-ng/pom.xml | 123 +- .../apache/logging/log4j/flume/appender/Agent.java | 2 +- .../log4j/flume/appender/FlumeAppender.java | 44 +- .../log4j/flume/appender/FlumeAvroManager.java | 71 +- .../flume/appender/FlumeConfigurationBuilder.java | 288 --- .../log4j/flume/appender/FlumeEmbeddedManager.java | 147 +- .../logging/log4j/flume/appender/FlumeEvent.java | 50 +- .../logging/log4j/flume/appender/FlumeNode.java | 82 - .../flume/appender/FlumePersistentManager.java | 182 +- log4j-flume-ng/src/site/site.xml | 5 +- log4j-flume-ng/src/site/xdoc/index.xml | 243 --- log4j-flume-ng/src/site/xdoc/index.xml.vm | 244 +++ .../log4j/flume/appender/FlumeAppenderTest.java | 29 +- .../flume/appender/FlumeEmbeddedAgentTest.java | 45 +- .../flume/appender/FlumeEmbeddedAppenderTest.java | 54 +- .../appender/FlumePersistentAppenderTest.java | 86 +- .../log4j/flume/appender/FlumePersistentPerf.java | 41 +- .../logging/log4j/flume/test/FlumeKeyProvider.java | 6 +- .../src/test/resources/default_embedded.xml | 4 +- log4j-flume-ng/src/test/resources/embedded.xml | 36 +- log4j-flume-ng/src/test/resources/persistent.xml | 2 +- log4j-iostreams/.gitignore | Bin 0 -> 69 bytes log4j-iostreams/pom.xml | 199 ++ .../apache/logging/log4j/io/ByteStreamLogger.java | 154 ++ .../apache/logging/log4j/io/CharStreamLogger.java | 114 + .../org/apache/logging/log4j/io/IoBuilder.java | 377 ++++ .../log4j/io/LoggerBufferedInputStream.java | 71 + .../logging/log4j/io/LoggerBufferedReader.java | 81 + .../logging/log4j/io/LoggerFilterOutputStream.java | 83 + .../logging/log4j/io/LoggerFilterWriter.java | 92 + .../apache/logging/log4j/io/LoggerInputStream.java | 76 + .../logging/log4j/io/LoggerOutputStream.java | 72 + .../apache/logging/log4j/io/LoggerPrintStream.java | 231 ++ .../apache/logging/log4j/io/LoggerPrintWriter.java | 240 +++ .../org/apache/logging/log4j/io/LoggerReader.java | 87 + .../org/apache/logging/log4j/io/LoggerWriter.java | 83 + .../org/apache/logging/log4j/io/package-info.java | 21 + log4j-iostreams/src/site/site.xml | 52 + log4j-iostreams/src/site/xdoc/index.xml | 66 + .../log4j/io/AbstractLoggerOutputStreamTest.java | 142 ++ .../logging/log4j/io/AbstractLoggerWriterTest.java | 142 ++ .../logging/log4j/io/AbstractStreamTest.java | 59 + .../log4j/io/IoBuilderCallerInfoTesting.java | 55 + .../org/apache/logging/log4j/io/IoBuilderTest.java | 50 + .../LoggerBufferedInputStreamCallerInfoTest.java | 72 + .../log4j/io/LoggerBufferedInputStreamTest.java | 33 + .../io/LoggerBufferedReaderCallerInfoTest.java | 90 + .../logging/log4j/io/LoggerBufferedReaderTest.java | 46 + .../log4j/io/LoggerFilterOutputStreamTest.java | 39 + .../logging/log4j/io/LoggerFilterWriterTest.java | 37 + .../log4j/io/LoggerInputStreamCallerInfoTest.java | 57 + .../logging/log4j/io/LoggerInputStreamTest.java | 130 ++ .../log4j/io/LoggerOutputStreamCallerInfoTest.java | 52 + .../logging/log4j/io/LoggerOutputStreamTest.java | 38 + .../log4j/io/LoggerPrintStreamCallerInfoTest.java | 148 ++ .../logging/log4j/io/LoggerPrintStreamTest.java | 125 ++ .../log4j/io/LoggerPrintWriterCallerInfoTest.java | 148 ++ .../log4j/io/LoggerPrintWriterJdbcH2Test.java | 103 + .../logging/log4j/io/LoggerPrintWriterTest.java | 127 ++ .../log4j/io/LoggerReaderCallerInfoTest.java | 60 + .../apache/logging/log4j/io/LoggerReaderTest.java | 144 ++ .../apache/logging/log4j/io/LoggerWriterTest.java | 36 + .../test/resources/log4j2-jdbc-driver-manager.xml | 20 + .../test/resources/log4j2-streams-calling-info.xml | 36 + .../test/resources/log4j2-streams-unit-test.xml | 30 + log4j-jcl/.gitignore | 4 + log4j-jcl/pom.xml | 61 +- .../org/apache/logging/log4j/jcl/Log4jLog.java | 107 +- .../org/apache/logging/log4j/jcl/LogAdapter.java | 42 + .../apache/logging/log4j/jcl/LogFactoryImpl.java | 57 +- .../org/apache/logging/log4j/jcl/package-info.java | 2 +- .../services/org.apache.commons.logging.LogFactory | 2 +- log4j-jcl/src/site/site.xml | 5 +- log4j-jcl/src/site/xdoc/index.xml | 6 +- .../logging/log4j/jcl/CallerInformationTest.java | 67 + .../org/apache/logging/log4j/jcl/LoggerTest.java | 61 +- log4j-jcl/src/test/resources/log4j-test1.xml | 4 +- log4j-jmx-gui/.gitignore | 4 + log4j-jmx-gui/pom.xml | 50 +- .../org/apache/logging/log4j/jmx/gui/Client.java | 135 +- .../log4j/jmx/gui/ClientEditConfigPanel.java | 7 +- .../apache/logging/log4j/jmx/gui/ClientGUI.java | 228 -- .../log4j/jmx/gui/ClientGUIJConsolePlugin.java | 49 - .../apache/logging/log4j/jmx/gui/ClientGui.java | 338 +++ .../log4j/jmx/gui/ClientGuiJConsolePlugin.java | 49 + .../services/com.sun.tools.jconsole.JConsolePlugin | 2 +- log4j-jmx-gui/src/site/site.xml | 5 +- log4j-jul/.gitignore | 3 + log4j-jul/pom.xml | 186 ++ .../logging/log4j/jul/AbstractLoggerAdapter.java | 37 + .../org/apache/logging/log4j/jul/ApiLogger.java | 235 ++ .../apache/logging/log4j/jul/ApiLoggerAdapter.java | 40 + .../org/apache/logging/log4j/jul/Constants.java | 44 + .../org/apache/logging/log4j/jul/CoreLogger.java | 79 + .../logging/log4j/jul/CoreLoggerAdapter.java | 40 + .../logging/log4j/jul/DefaultLevelConverter.java | 68 + .../apache/logging/log4j/jul/LevelConverter.java | 46 + .../apache/logging/log4j/jul/LevelTranslator.java | 87 + .../org/apache/logging/log4j/jul/LogManager.java | 97 + .../apache/logging/log4j/jul/WrappedLogger.java | 77 + log4j-jul/src/site/site.xml | 52 + log4j-jul/src/site/xdoc/index.xml | 126 ++ .../logging/log4j/jul/AbstractLoggerTest.java | 104 + .../apache/logging/log4j/jul/ApiLoggerTest.java | 76 + .../logging/log4j/jul/CallerInformationTest.java | 78 + .../apache/logging/log4j/jul/CoreLoggerTest.java | 76 + .../logging/log4j/jul/JavaLevelTranslatorTest.java | 73 + .../log4j/jul/Log4jLevelTranslatorTest.java | 67 + log4j-jul/src/test/resources/log4j2-test.xml | 42 + log4j-nosql/.gitignore | 4 + log4j-nosql/pom.xml | 174 ++ .../log4j/nosql/appender/DefaultNoSqlObject.java | 66 + .../log4j/nosql/appender/NoSqlAppender.java | 95 + .../log4j/nosql/appender/NoSqlConnection.java | 76 + .../log4j/nosql/appender/NoSqlDatabaseManager.java | 218 ++ .../logging/log4j/nosql/appender/NoSqlObject.java | 63 + .../log4j/nosql/appender/NoSqlProvider.java | 49 + .../nosql/appender/couchdb/CouchDbConnection.java | 75 + .../nosql/appender/couchdb/CouchDbProvider.java | 165 ++ .../log4j/nosql/appender/couchdb/package-info.java | 20 + .../nosql/appender/mongodb/MongoDbConnection.java | 126 ++ .../nosql/appender/mongodb/MongoDbObject.java | 66 + .../nosql/appender/mongodb/MongoDbProvider.java | 215 ++ .../log4j/nosql/appender/mongodb/package-info.java | 20 + .../logging/log4j/nosql/appender/package-info.java | 34 + log4j-nosql/src/site/site.xml | 52 + log4j-nosql/src/site/xdoc/index.xml.vm | 85 + .../log4j/nosql/appender/NoSqlAppenderTest.java | 74 + .../nosql/appender/NoSqlDatabaseManagerTest.java | 569 +++++ log4j-osgi/core-osgi-async/pom.xml | 145 -- log4j-osgi/core-osgi-jpa/pom.xml | 145 -- log4j-osgi/core-osgi-net/pom.xml | 145 -- log4j-osgi/core-osgi-nosql-couch/pom.xml | 145 -- log4j-osgi/core-osgi-nosql-mongo/pom.xml | 145 -- log4j-osgi/core-osgi-reduced/pom.xml | 150 -- log4j-osgi/pom.xml | 51 - log4j-perf/.gitignore | 4 + log4j-perf/pom.xml | 209 ++ .../perf/jmh/AsyncAppenderLog4j1Benchmark.java | 101 + .../perf/jmh/AsyncAppenderLog4j2Benchmark.java | 101 + .../perf/jmh/AsyncAppenderLogbackBenchmark.java | 103 + .../log4j/perf/jmh/AsyncLoggersBenchmark.java | 102 + .../logging/log4j/perf/jmh/ClocksBenchmark.java | 197 ++ .../perf/jmh/ConfiguratorInitializeBenchmark.java | 70 + .../log4j/perf/jmh/DebugDisabledBenchmark.java | 107 + .../log4j/perf/jmh/FormatterLoggerBenchmark.java | 137 ++ .../log4j/perf/jmh/JdbcAppenderBenchmark.java | 204 ++ .../log4j/perf/jmh/JpaAppenderBenchmark.java | 198 ++ .../log4j/perf/jmh/Log4jLogEventBenchmark.java | 95 + .../log4j/perf/jmh/PatternLayoutBenchmark.java | 149 ++ .../log4j/perf/jmh/ReflectionBenchmark.java | 145 ++ .../logging/log4j/perf/jmh/SimpleBenchmark.java | 115 + .../log4j/perf/jmh/StringEncodingBenchmark.java | 100 + .../log4j/perf/jmh/TimeFormatBenchmark.java | 253 +++ .../log4j/perf/jmh/UuidGeneratorBenchmark.java | 51 + .../log4j/perf/jmh/jpa/TestBasicEntity.java | 66 + .../logging/log4j/perf/jmh/package-info.java | 24 + .../src/main/resources/META-INF/persistence.xml | 73 + log4j-perf/src/main/resources/log4j12-perf2.xml | 31 + .../src/main/resources/log4j2-jdbc-appender.xml | 58 + .../src/main/resources/log4j2-jpa-appender.xml | 43 + log4j-perf/src/main/resources/log4j2-perf2.xml | 32 + log4j-perf/src/main/resources/logback-perf2.xml | 29 + .../src/main/resources/perf-log4j12-async.xml | 36 + .../src/main/resources/perf-logback-async.xml | 37 + log4j-perf/src/main/resources/perf3PlainNoLoc.xml | 31 + .../src/main/resources/perf5AsyncApndNoLoc.xml | 34 + log4j-samples/.gitignore | 2 + log4j-samples/flume-common/.gitignore | 4 + log4j-samples/flume-common/pom.xml | 10 +- .../logging/log4j/samples/app/LogEventFactory.java | 10 +- .../logging/log4j/samples/app/LoggingApp.java | 8 +- .../log4j/samples/app/LoggingController.java | 7 +- .../log4j/samples/app/MockEventsSupplier.java | 10 +- .../logging/log4j/samples/dto/Constraint.java | 4 +- .../logging/log4j/samples/dto/RequestContext.java | 6 +- .../logging/log4j/samples/util/NamingUtils.java | 14 +- log4j-samples/flume-embedded/.gitignore | 4 + log4j-samples/flume-embedded/pom.xml | 6 +- .../flume-embedded/src/main/webapp/WEB-INF/web.xml | 2 +- log4j-samples/flume-remote/.gitignore | 4 + log4j-samples/flume-remote/pom.xml | 6 +- .../flume-remote/src/main/webapp/WEB-INF/web.xml | 2 +- log4j-samples/pom.xml | 15 +- log4j-slf4j-impl/.gitignore | 4 + log4j-slf4j-impl/pom.xml | 65 +- .../apache/logging/slf4j/EventDataConverter.java | 50 + .../java/org/apache/logging/slf4j/Log4jLogger.java | 437 ++++ .../apache/logging/slf4j/Log4jLoggerFactory.java | 46 + .../org/apache/logging/slf4j/Log4jMDCAdapter.java | 62 + .../java/org/apache/logging/slf4j/Log4jMarker.java | 96 + .../apache/logging/slf4j/Log4jMarkerFactory.java | 138 ++ .../org/apache/logging/slf4j/package-info.java | 4 +- .../java/org/slf4j/helpers/EventDataConverter.java | 50 - .../java/org/slf4j/helpers/Log4jLoggerFactory.java | 112 - .../java/org/slf4j/helpers/Log4jMDCAdapter.java | 62 - .../java/org/slf4j/helpers/Log4jMarkerFactory.java | 60 - .../main/java/org/slf4j/helpers/MarkerWrapper.java | 68 - .../main/java/org/slf4j/helpers/package-info.java | 20 - .../src/main/java/org/slf4j/impl/SLF4JLogger.java | 529 ----- .../java/org/slf4j/impl/StaticLoggerBinder.java | 5 +- .../main/java/org/slf4j/impl/StaticMDCBinder.java | 2 +- .../java/org/slf4j/impl/StaticMarkerBinder.java | 5 +- log4j-slf4j-impl/src/site/site.xml | 5 +- log4j-slf4j-impl/src/site/xdoc/index.xml | 6 +- .../logging/slf4j/CallerInformationTest.java | 67 + .../org/apache/logging/slf4j/CustomFlatMarker.java | 76 + .../java/org/apache/logging/slf4j/LoggerTest.java | 98 +- .../java/org/apache/logging/slf4j/MarkerTest.java | 31 +- .../org/apache/logging/slf4j/OptionalTest.java | 56 +- .../org/apache/logging/slf4j/SerializeTest.java | 47 + .../src/test/resources/log4j-test1.xml | 6 +- log4j-taglib/.gitignore | 4 + log4j-taglib/pom.xml | 61 +- .../org/apache/logging/log4j/taglib/DumpTag.java | 1 + .../org/apache/logging/log4j/taglib/EntryTag.java | 1 + .../logging/log4j/taglib/Log4jTaglibLogger.java | 10 +- .../log4j/taglib/Log4jTaglibLoggerContext.java | 16 +- .../log4j/taglib/LoggingMessageTagSupport.java | 7 +- .../org/apache/logging/log4j/taglib/TagUtils.java | 1 + log4j-taglib/src/site/site.xml | 5 +- .../logging/log4j/taglib/CatchingTagTest.java | 4 +- .../apache/logging/log4j/taglib/DebugTagTest.java | 2 +- .../apache/logging/log4j/taglib/DumpTagTest.java | 3 +- .../apache/logging/log4j/taglib/EntryTagTest.java | 11 +- .../apache/logging/log4j/taglib/ErrorTagTest.java | 2 +- .../apache/logging/log4j/taglib/ExitTagTest.java | 11 +- .../apache/logging/log4j/taglib/FatalTagTest.java | 2 +- .../logging/log4j/taglib/IfEnabledTagTest.java | 4 +- .../apache/logging/log4j/taglib/InfoTagTest.java | 2 +- .../log4j/taglib/LoggingMessageTagSupportTest.java | 11 +- .../apache/logging/log4j/taglib/TagUtilsTest.java | 66 +- .../apache/logging/log4j/taglib/TraceTagTest.java | 2 +- .../apache/logging/log4j/taglib/WarnTagTest.java | 2 +- log4j-to-slf4j/.gitignore | 4 + log4j-to-slf4j/pom.xml | 55 +- .../java/org/apache/logging/slf4j/SLF4JLogger.java | 146 +- .../apache/logging/slf4j/SLF4JLoggerContext.java | 6 +- .../logging/slf4j/SLF4JLoggerContextFactory.java | 11 +- log4j-to-slf4j/src/site/site.xml | 5 +- .../logging/slf4j/CallerInformationTest.java | 65 + .../apache/logging/slf4j/InitialLoggerContext.java | 71 + .../java/org/apache/logging/slf4j/LoggerTest.java | 95 +- .../java/org/apache/logging/slf4j/TestUtil.java | 47 + .../src/test/resources/logback-calling-class.xml | 38 + log4j-web/.gitignore | 4 + log4j-web/pom.xml | 190 ++ .../web/Log4jServletContainerInitializer.java | 66 + .../log4j/web/Log4jServletContextListener.java | 62 + .../logging/log4j/web/Log4jServletFilter.java | 87 + .../logging/log4j/web/Log4jWebInitializerImpl.java | 259 +++ .../logging/log4j/web/Log4jWebLifeCycle.java | 43 + .../apache/logging/log4j/web/Log4jWebSupport.java | 88 + .../logging/log4j/web/WebLoggerContextUtils.java | 129 ++ .../org/apache/logging/log4j/web/WebLookup.java | 108 + .../log4j/web/appender/ServletAppender.java | 87 + .../org/apache/logging/log4j/web/package-info.java | 24 + .../javax.servlet.ServletContainerInitializer | 17 + .../src/main/resources/META-INF/web-fragment.xml | 0 .../src/main/resources/log4j2.component.properties | 16 + log4j-web/src/site/site.xml | 52 + log4j-web/src/site/xdoc/index.xml | 59 + .../web/Log4jServletContainerInitializerTest.java | 189 ++ .../log4j/web/Log4jServletContextListenerTest.java | 110 + .../logging/log4j/web/Log4jServletFilterTest.java | 152 ++ .../log4j/web/Log4jWebInitializerImplTest.java | 490 +++++ .../logging/log4j/web/ServletAppenderTest.java | 68 + .../logging/log4j/web/ShutdownPropertyTest.java | 33 + .../apache/logging/log4j/web/TestAsyncServlet.java | 60 + .../apache/logging/log4j/web/WebLookupTest.java | 102 + .../resources/WEB-INF/classes/log4j-servlet.xml | 33 + .../resources/WEB-INF/classes/log4j-webvar.xml | 29 + pom.xml | 674 ++++-- src/assembly/site.xml | 4 +- src/changes/announcement.vm | 16 +- src/changes/changes.xml | 909 +++++++- src/ide/Intellij/13/IntellijSettings.jar | Bin 0 -> 16778 bytes src/ide/eclipse/4.3.2/organize-imports.importorder | 9 + src/site/apt/download.apt.vm | 16 +- src/site/pdf.xml | 4 +- src/site/resources/css/bootstrap.css | 2 +- src/site/resources/css/site.css | 27 +- .../resources/images/jmx-jconsole-editconfig.png | Bin 145106 -> 74904 bytes src/site/resources/images/jmx-jconsole-mbeans.png | Bin 151211 -> 61770 bytes .../resources/images/jmx-jconsole-statuslogger.png | Bin 306006 -> 90738 bytes .../resources/images/jmx-standalone-editconfig.png | Bin 143751 -> 66682 bytes .../images/jmx-standalone-statuslogger.png | Bin 264462 -> 83934 bytes src/site/resources/images/logo.jpg | Bin 24805 -> 14818 bytes src/site/resources/images/whichjar-2.1.png | Bin 0 -> 68404 bytes src/site/resources/images/whichjar-slf4j-2.1.png | Bin 0 -> 26700 bytes src/site/resources/images/whichjar.xlsx | Bin 0 -> 14687 bytes src/site/site.vm | 2 +- src/site/site.xml | 89 +- src/site/xdoc/build.xml.vm | 30 +- src/site/xdoc/changelog.xml | 2 +- src/site/xdoc/faq.xml | 60 +- src/site/xdoc/guidelines.xml | 361 ++++ src/site/xdoc/index.xml | 56 +- src/site/xdoc/javadoc.xml | 25 +- src/site/xdoc/javastyle.xml | 805 +++++++ src/site/xdoc/manual/api.xml | 30 +- src/site/xdoc/manual/appenders.xml | 1865 ++++++++-------- src/site/xdoc/manual/architecture.xml | 206 +- src/site/xdoc/manual/async.xml | 1995 ++++++++--------- src/site/xdoc/manual/configuration.xml.vm | 813 +++++-- src/site/xdoc/manual/customconfig.xml | 137 ++ src/site/xdoc/manual/customloglevels.xml.vm | 326 +++ src/site/xdoc/manual/eventlogging.xml | 6 +- src/site/xdoc/manual/extending.xml | 139 +- src/site/xdoc/manual/filters.xml | 149 +- src/site/xdoc/manual/flowtracing.xml | 14 +- src/site/xdoc/manual/index.xml | 33 +- src/site/xdoc/manual/jmx.xml | 170 -- src/site/xdoc/manual/jmx.xml.vm | 172 ++ src/site/xdoc/manual/layouts.xml.vm | 315 ++- src/site/xdoc/manual/logsep.xml | 31 +- src/site/xdoc/manual/lookups.xml | 201 +- src/site/xdoc/manual/markers.xml | 24 +- src/site/xdoc/manual/messages.xml | 38 +- src/site/xdoc/manual/migration.xml | 61 +- src/site/xdoc/manual/plugins.xml | 182 +- src/site/xdoc/manual/thread-context.xml | 37 +- src/site/xdoc/manual/webapp.xml | 309 ++- src/site/xdoc/maven-artifacts.xml.vm | 207 +- src/site/xdoc/performance.xml | 52 +- src/site/xdoc/runtime-dependencies.xml | 203 ++ 1401 files changed, 75741 insertions(+), 39485 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-log4j2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
