Index: log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/Server.java (revision ) @@ -30,7 +30,7 @@ import javax.management.ObjectName; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.AsyncAppender; import org.apache.logging.log4j.core.async.AsyncLogger; @@ -38,7 +38,7 @@ import org.apache.logging.log4j.core.async.AsyncLoggerContext; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.impl.Log4jContextFactory; -import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.spi.ContextSelector; import org.apache.logging.log4j.spi.LoggerContextFactory; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/EnvironmentLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/EnvironmentLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/EnvironmentLookupTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.core.lookup; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.Test; import static org.junit.Assert.assertNotNull; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/DefaultErrorHandler.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.appender; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.ErrorHandler; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (revision ) @@ -18,8 +18,8 @@ import java.io.Serializable; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueAppenderTest.java (revision ) @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/web/WebLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/web/WebLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/web/WebLookupTest.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.core.web; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.FileAppender; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderRef.java (revision ) @@ -18,7 +18,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAliases; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/OutputStreamManager.java (revision ) @@ -19,7 +19,7 @@ import java.io.IOException; import java.io.OutputStream; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; /** * Manage an OutputStream so that it can be shared by multiple Appenders and will Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SyslogAppenderTestBase.java (revision ) @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.net.mock.MockSyslogServer; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java (revision ) @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.BasicConfigurationFactory; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileManager.java (revision ) @@ -25,7 +25,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; /** * Extends OutputStreamManager but instead of using a buffered output stream, Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ContextMapLookup.java (revision ) @@ -19,6 +19,7 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Looks up keys from system properties. Index: log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerDateTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerDateTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerDateTest.java (revision ) @@ -20,6 +20,7 @@ import org.apache.logging.log4j.core.appender.FileAppender; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.junit.AfterClass; import org.junit.Before; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java (revision ) @@ -25,7 +25,7 @@ import java.io.Serializable; import java.util.concurrent.Semaphore; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.FileManager; import org.apache.logging.log4j.core.appender.ManagerFactory; Index: log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java (revision 1587603) +++ log4j-1.2-api/src/test/java/org/apache/log4j/LoggerTest.java (revision ) @@ -21,7 +21,7 @@ import java.util.Locale; import java.util.ResourceBundle; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.AbstractAppender; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingRandomAccessFileAppender.java (revision ) @@ -21,8 +21,8 @@ import java.util.Map; import java.util.zip.Deflater; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.rolling.DefaultRolloverStrategy; import org.apache.logging.log4j.core.appender.rolling.RollingRandomAccessFileManager; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/selector/JNDIContextSelector.java (revision ) @@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.impl.ContextAnchor; +import org.apache.logging.log4j.core.spi.NamedContextSelector; import org.apache.logging.log4j.status.StatusLogger; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java (revision ) @@ -18,7 +18,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.helpers.KeyValuePair; import org.junit.Test; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/config/MissingRootLoggerTest.java (revision ) @@ -18,7 +18,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.junit.InitialLoggerContext; import org.junit.Rule; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MarkerFilterTest.java (revision ) @@ -19,7 +19,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.message.SimpleMessage; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/LogEventFactoryTest.java (revision ) @@ -32,6 +32,7 @@ import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.impl.LogEventFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/BurstFilterTest.java (revision ) @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppenderControl.java (revision ) @@ -17,8 +17,8 @@ package org.apache.logging.log4j.core.config; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AppenderLoggingException; import org.apache.logging.log4j.core.filter.AbstractFilterable; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/JndiLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/JndiLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/JndiLookupTest.java (revision ) @@ -23,6 +23,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.After; import org.junit.Before; import org.junit.Test; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java (revision ) @@ -24,8 +24,8 @@ import java.lang.reflect.Constructor; import java.nio.charset.Charset; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; import org.apache.logging.log4j.core.config.plugins.PluginElement; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppender.java (revision ) @@ -21,8 +21,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.logging.log4j.LoggingException; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.AppenderLoggingException; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/web/Log4jWebInitializerImpl.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/web/Log4jWebInitializerImpl.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/web/Log4jWebInitializerImpl.java (revision ) @@ -32,8 +32,8 @@ import org.apache.logging.log4j.core.impl.Log4jContextFactory; import org.apache.logging.log4j.core.lookup.Interpolator; import org.apache.logging.log4j.core.lookup.StrSubstitutor; -import org.apache.logging.log4j.core.selector.ContextSelector; -import org.apache.logging.log4j.core.selector.NamedContextSelector; +import org.apache.logging.log4j.core.spi.ContextSelector; +import org.apache.logging.log4j.core.spi.NamedContextSelector; import org.apache.logging.log4j.spi.LoggerContextFactory; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java (revision ) @@ -30,6 +30,7 @@ import javax.naming.NamingException; import org.apache.logging.log4j.ThreadContext; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java (revision ) @@ -21,13 +21,13 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; /** * Appends log events as bytes to a byte output stream. The stream encoding is defined in the layout. - * + * * @param The kind of {@link OutputStreamManager} under management */ public abstract class AbstractOutputStreamAppender extends AbstractAppender { @@ -67,7 +67,7 @@ /** * Gets the manager. - * + * * @return the manager. */ public M getManager() { Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueTest.java (revision ) @@ -27,8 +27,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StructuredDataLookup.java (revision ) @@ -18,6 +18,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.message.StructuredDataMessage; /** Index: log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java (revision 1587603) +++ log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/OptionalTest.java (revision ) @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.helpers.Constants; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/TLSSyslogAppender.java (revision ) @@ -16,8 +16,8 @@ */ package org.apache.logging.log4j.core.appender; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.plugins.*; import org.apache.logging.log4j.core.helpers.Booleans; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/OutputStreamAppenderTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.appender; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.LogEvent; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/EnvironmentLookup.java (revision ) @@ -18,6 +18,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Looks up keys from environment variables. Index: log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/net/AbstractSocketManager.java (revision ) @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.OutputStreamManager; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelJsonTest.java (revision ) @@ -21,6 +21,7 @@ import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/AbstractDatabaseAppenderTest.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.core.appender.db; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.junit.After; import org.junit.Test; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/PropertiesPlugin.java (revision ) @@ -23,7 +23,7 @@ import org.apache.logging.log4j.core.config.Property; import org.apache.logging.log4j.core.lookup.Interpolator; import org.apache.logging.log4j.core.lookup.MapLookup; -import org.apache.logging.log4j.core.lookup.StrLookup; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Handles properties defined in the configuration. Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/JndiLookup.java (revision ) @@ -21,6 +21,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Looks up keys from JNDI resources. Index: log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java (revision 1587603) +++ log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/EntryTagTest.java (revision ) @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpSerializedSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpSerializedSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpSerializedSocketServerTest.java (revision ) @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.junit.AfterClass; import org.junit.BeforeClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/DateLookupTest.java (revision ) @@ -20,6 +20,7 @@ import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.message.Message; import org.junit.Test; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JDBCAppender.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.core.appender.db.jdbc; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; Index: log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java (revision 1587603) +++ log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeAppenderTest.java (revision ) @@ -43,7 +43,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.message.StructuredDataMessage; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java (revision ) @@ -41,6 +41,7 @@ import org.apache.logging.log4j.core.helpers.Assert; import org.apache.logging.log4j.core.helpers.NetUtils; import org.apache.logging.log4j.core.jmx.Server; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.spi.AbstractLoggerProvider; import org.apache.logging.log4j.status.StatusLogger; @@ -294,7 +295,7 @@ * Whether this collection is a copy of the underlying collection or not is undefined. Therefore, modify this collection at your own * risk. *

- * + * * @return a collection of the current loggers. */ public Collection getLoggers() { Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileAppender.java (revision ) @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpJsonSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpJsonSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpJsonSocketServerTest.java (revision ) @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.junit.AfterClass; import org.junit.BeforeClass; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerContextSelector.java (revision ) @@ -22,7 +22,7 @@ import java.util.List; import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.spi.ContextSelector; /** * {@code ContextSelector} that returns the singleton {@code AsyncLoggerContext}. Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookupTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.core.lookup; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.Assert; import org.junit.Test; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (revision ) @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.AppenderRef; import org.apache.logging.log4j.core.config.Configuration; @@ -136,7 +136,7 @@ /** * Creates and returns a new {@code RingBufferAdmin} that instruments the * ringbuffer of this {@code AsyncLoggerConfig}. - * + * * @param contextName name of the {@code LoggerContext} */ public RingBufferAdmin createRingBufferAdmin(String contextName) { Index: log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/test/appender/ListAppender.java (revision ) @@ -16,8 +16,8 @@ */ package org.apache.logging.log4j.test.appender; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/Appender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/spi/Appender.java (revision ) @@ -14,9 +14,12 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.core; +package org.apache.logging.log4j.core.spi; import java.io.Serializable; +import org.apache.logging.log4j.core.ErrorHandler; +import org.apache.logging.log4j.core.LifeCycle; +import org.apache.logging.log4j.core.LogEvent; /** * Appends log events. Index: log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractLayout.java (revision ) @@ -19,7 +19,7 @@ import java.io.Serializable; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.status.StatusLogger; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java (revision ) @@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rewrite/RewriteAppender.java (revision ) @@ -20,8 +20,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.AppenderControl; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RandomAccessFileAppender.java (revision ) @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.plugins.Plugin; Index: log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java (revision 1587603) +++ log4j-jcl/src/test/java/org/apache/logging/log4j/jcl/LoggerTest.java (revision ) @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.helpers.Constants; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSQueueAppender.java (revision ) @@ -18,8 +18,8 @@ import java.io.Serializable; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.AppenderLoggingException; @@ -47,7 +47,7 @@ /** * Actual writing occurs here. - * + * * @param event The LogEvent. */ @Override Index: log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLLoggerPropsTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLLoggerPropsTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/config/xml/XMLLoggerPropsTest.java (revision ) @@ -21,7 +21,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppenderTest.java (revision ) @@ -25,7 +25,7 @@ import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfiguration.java (revision ) @@ -19,8 +19,8 @@ import java.io.Serializable; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.ConsoleAppender; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.util.PropertiesUtil; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AsyncAppender.java (revision ) @@ -24,8 +24,8 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.atomic.AtomicLong; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.AppenderControl; import org.apache.logging.log4j.core.config.AppenderRef; @@ -179,11 +179,11 @@ @PluginFactory public static AsyncAppender createAppender(@PluginElement("AppenderRef") final AppenderRef[] appenderRefs, @PluginAttribute("errorRef") @PluginAliases("error-ref") final String errorRef, - @PluginAttribute("blocking") final String blocking, + @PluginAttribute("blocking") final String blocking, @PluginAttribute("bufferSize") final String size, @PluginAttribute("name") final String name, @PluginAttribute("includeLocation") final String includeLocation, - @PluginElement("Filter") final Filter filter, + @PluginElement("Filter") final Filter filter, @PluginConfiguration final Configuration config, @PluginAttribute("ignoreExceptions") final String ignore) { if (name == null) { @@ -265,7 +265,7 @@ * all registered {@code AppenderControl} objects, and returns {@code true} * if at least one appender call was successful, {@code false} otherwise. * Any exceptions are silently ignored. - * + * * @param event the event to forward to the registered appenders * @return {@code true} if at least one appender call succeeded, {@code false} otherwise */ @@ -302,7 +302,7 @@ } return result; } - + /** * Returns {@code true} if this AsyncAppender will take a snapshot of the stack with * every log event to determine the class and method where the logging call @@ -312,7 +312,7 @@ public boolean isIncludeLocation() { return includeLocation; } - + /** * Returns {@code true} if this AsyncAppender will block when the queue is full, * or {@code false} if events are dropped when the queue is full. @@ -321,7 +321,7 @@ public boolean isBlocking() { return blocking; } - + /** * Returns the name of the appender that any errors are logged to or {@code null}. * @return the name of the appender that any errors are logged to or {@code null} @@ -329,11 +329,11 @@ public String getErrorRef() { return errorRef; } - + public int getQueueCapacity() { return queueSize; } - + public int getQueueRemainingCapacity() { return queue.remainingCapacity(); } Index: log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RootThrowableTest.java (revision ) @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java (revision ) @@ -31,6 +31,7 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.ParameterizedMessageFactory; import org.apache.logging.log4j.message.StringFormatterMessageFactory; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/ContextSelectorAdmin.java (revision ) @@ -19,7 +19,7 @@ import javax.management.ObjectName; import org.apache.logging.log4j.core.helpers.Assert; -import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.spi.ContextSelector; /** * Implementation of the {@code ContextSelectorAdminMBean} interface. @@ -31,7 +31,7 @@ /** * Constructs a new {@code ContextSelectorAdmin}. - * + * * @param contextName name of the LoggerContext under which to register this * ContextSelectorAdmin. Note that the ContextSelector may be * registered multiple times, once for each LoggerContext. In web @@ -54,7 +54,7 @@ /** * Returns the {@code ObjectName} of this mbean. - * + * * @return the {@code ObjectName} * @see ContextSelectorAdminMBean#NAME */ Index: log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java (revision 1587603) +++ log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java (revision ) @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import java.util.List; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/AbstractJdbcAppenderTest.java (revision ) @@ -28,7 +28,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.DefaultConfiguration; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThresholdFilterTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.filter; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.message.SimpleMessage; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java (revision ) @@ -38,7 +38,7 @@ /** *

A flexible layout configurable with pattern string. The goal of this class - * is to {@link org.apache.logging.log4j.core.Layout#toByteArray format} a {@link LogEvent} and return the results. + * is to {@link org.apache.logging.log4j.core.spi.Layout#toByteArray format} a {@link LogEvent} and return the results. * The format of the result depends on the conversion pattern. *

*

Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java (revision ) @@ -23,7 +23,7 @@ import java.io.Serializable; import java.nio.ByteBuffer; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.AppenderLoggingException; import org.apache.logging.log4j.core.appender.ManagerFactory; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/Interpolator.java (revision ) @@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginManager; import org.apache.logging.log4j.core.config.plugins.PluginType; import org.apache.logging.log4j.core.helpers.Loader; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.status.StatusLogger; /** Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java (revision ) @@ -20,8 +20,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.rewrite.RewritePolicy; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java (revision ) @@ -27,8 +27,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.filter.ThreadContextMapFilter; import org.apache.logging.log4j.junit.CleanFiles; @@ -64,7 +64,7 @@ @Rule public TestRule rules; - + private InitialLoggerContext init; private LoggerContext ctx; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/selector/NamedContextSelector.java =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/selector/NamedContextSelector.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/spi/NamedContextSelector.java (revision ) @@ -14,11 +14,12 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.core.selector; +package org.apache.logging.log4j.core.spi; import java.net.URI; import org.apache.logging.log4j.core.LoggerContext; +import org.apache.logging.log4j.core.spi.ContextSelector; /** * ContextSelectors that have a name. Index: log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (revision 1587603) +++ log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeAppender.java (revision ) @@ -19,8 +19,8 @@ import java.io.Serializable; import java.util.Locale; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.config.Property; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java (revision ) @@ -28,7 +28,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpXmlSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpXmlSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpXmlSocketServerTest.java (revision ) @@ -19,7 +19,7 @@ import java.io.InputStream; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.junit.AfterClass; import org.junit.BeforeClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/CallerInformationTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/CallerInformationTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/CallerInformationTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.pattern; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.junit.InitialLoggerContext; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/AppenderRefLevelTest.java (revision ) @@ -26,6 +26,7 @@ import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpSerializedSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpSerializedSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpSerializedSocketServerTest.java (revision ) @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.junit.AfterClass; import org.junit.BeforeClass; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractAppender.java (revision ) @@ -18,10 +18,10 @@ import java.io.Serializable; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.ErrorHandler; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.filter.AbstractFilterable; import org.apache.logging.log4j.core.helpers.Integers; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookup.java (revision ) @@ -18,6 +18,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Looks up keys from system properties. Index: log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilter.java (revision ) @@ -18,7 +18,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; @@ -32,7 +32,7 @@ * */ public abstract class AbstractFilter implements Filter, LifeCycle { - + /** * Allow subclasses access to the status logger without creating another instance. */ Index: log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/net/TLSSocketManager.java (revision ) @@ -28,7 +28,7 @@ import javax.net.ssl.SSLSocketFactory; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.helpers.Strings; import org.apache.logging.log4j.core.net.ssl.SSLConfiguration; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/MapFilterTest.java (revision ) @@ -19,8 +19,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.Configurator; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java (revision ) @@ -32,9 +32,9 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AsyncAppender; import org.apache.logging.log4j.core.appender.ConsoleAppender; @@ -52,10 +52,10 @@ import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.core.lookup.Interpolator; import org.apache.logging.log4j.core.lookup.MapLookup; -import org.apache.logging.log4j.core.lookup.StrLookup; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.core.lookup.StrSubstitutor; import org.apache.logging.log4j.core.net.Advertiser; -import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.spi.ContextSelector; import org.apache.logging.log4j.spi.LoggerContextFactory; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.PropertiesUtil; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrSubstitutor.java (revision ) @@ -25,6 +25,7 @@ import java.util.Properties; import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Substitutes variables within a string by values. Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java (revision ) @@ -19,7 +19,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LoggingException; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/AppenderAdmin.java (revision ) @@ -18,7 +18,7 @@ import javax.management.ObjectName; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.filter.AbstractFilterable; import org.apache.logging.log4j.core.helpers.Assert; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (revision ) @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; Index: log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java (revision 1587603) +++ log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/LoggingMessageTagSupportTest.java (revision ) @@ -32,7 +32,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.MarkerManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FailoverAppender.java (revision ) @@ -21,8 +21,8 @@ import java.util.Map; import org.apache.logging.log4j.LoggingException; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.AppenderControl; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/config/CustomConfigurationTest.java (revision ) @@ -19,8 +19,8 @@ import java.io.File; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.appender.FileAppender; import org.apache.logging.log4j.core.config.xml.XMLConfiguration; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jpa/JPAAppender.java (revision ) @@ -18,7 +18,7 @@ import java.lang.reflect.Constructor; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender; Index: log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/test/appender/InMemoryAppender.java (revision ) @@ -19,7 +19,7 @@ import java.io.ByteArrayOutputStream; import java.io.Serializable; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender; import org.apache.logging.log4j.core.appender.OutputStreamManager; import org.apache.logging.log4j.core.filter.CompositeFilter; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/jms/JMSTopicAppender.java (revision ) @@ -18,8 +18,8 @@ import java.io.Serializable; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.AppenderLoggingException; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jpa/AbstractJpaAppenderTest.java (revision ) @@ -26,7 +26,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.DefaultConfiguration; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java (revision ) @@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.BasicConfigurationFactory; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ContextMapLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ContextMapLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/ContextMapLookupTest.java (revision ) @@ -17,6 +17,7 @@ package org.apache.logging.log4j.core.lookup; import org.apache.logging.log4j.ThreadContext; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.Test; import static org.junit.Assert.assertEquals; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/nosql/NoSQLAppender.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.core.appender.db.nosql; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.appender.AbstractAppender; import org.apache.logging.log4j.core.appender.db.AbstractDatabaseAppender; import org.apache.logging.log4j.core.config.plugins.Plugin; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ContextSelector.java =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ContextSelector.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/spi/ContextSelector.java (revision ) @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.core.selector; +package org.apache.logging.log4j.core.spi; import java.net.URI; import java.util.List; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/LevelTest.java (revision ) @@ -28,6 +28,7 @@ import org.apache.logging.log4j.MarkerManager; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.ObjectMessage; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java (revision 1587603) +++ log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/CatchingTagTest.java (revision ) @@ -28,7 +28,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/FileAppenderTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.appender; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.layout.PatternLayout; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/SystemPropertiesLookupTest.java (revision ) @@ -16,6 +16,7 @@ */ package org.apache.logging.log4j.core.lookup; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/HostNameTest.java (revision ) @@ -22,6 +22,7 @@ import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.helpers.NetUtils; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/ThrowableTest.java (revision ) @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java (revision ) @@ -29,6 +29,7 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.message.StructuredDataMessage; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/WebLookup.java (revision ) @@ -24,6 +24,7 @@ import org.apache.logging.log4j.core.impl.ContextAnchor; import javax.servlet.ServletContext; +import org.apache.logging.log4j.core.spi.StrLookup; @Plugin(name = "web", category = "Lookup") Index: log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java (revision ) @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java (revision 1587603) +++ log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java (revision ) @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.helpers.Constants; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/filter/AbstractFilterable.java (revision ) @@ -19,7 +19,7 @@ import java.util.Iterator; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Required.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Required.java (revision ) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/Required.java (revision ) @@ -0,0 +1,31 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.logging.log4j.core.config.plugins; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Identifies a Plugin parameter as required (not {@code null}). + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.PARAMETER) +public @interface Required { +} Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/StrLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/spi/StrLookup.java (revision ) @@ -14,7 +14,7 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.core.lookup; +package org.apache.logging.log4j.core.spi; import org.apache.logging.log4j.core.LogEvent; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/Layout.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/spi/Layout.java (revision ) @@ -14,13 +14,14 @@ * See the license for the specific language governing permissions and * limitations under the license. */ -package org.apache.logging.log4j.core; +package org.apache.logging.log4j.core.spi; import java.io.Serializable; import java.util.Map; +import org.apache.logging.log4j.core.LogEvent; /** - * Lays out a {@linkplain LogEvent} in different formats. + * Lays out a {@linkplain org.apache.logging.log4j.core.LogEvent} in different formats. * * The formats are: *

    @@ -31,11 +32,11 @@ *
  • * {@linkplain String}
    • *
  • - * {@linkplain LogEvent}
    • + * {@linkplain org.apache.logging.log4j.core.LogEvent} *
* * @param - * The {@link Serializable} type returned by {@link #toSerializable(LogEvent)} + * The {@link Serializable} type returned by {@link #toSerializable(org.apache.logging.log4j.core.LogEvent)} * * @doubt There is still a need for a character-based layout for character based event sinks (databases, etc). Would * introduce an EventEncoder, EventRenderer or something similar for the logging event to byte encoding. (RG) A layout Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpJsonSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpJsonSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/TcpJsonSocketServerTest.java (revision ) @@ -19,7 +19,7 @@ import java.io.InputStream; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.junit.AfterClass; import org.junit.BeforeClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StructuredDataLookupTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StructuredDataLookupTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StructuredDataLookupTest.java (revision ) @@ -19,6 +19,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.impl.Log4jLogEvent; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.StructuredDataMessage; import org.junit.Test; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpXmlSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpXmlSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/UdpXmlSocketServerTest.java (revision ) @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.junit.AfterClass; import org.junit.BeforeClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/StrSubstitutorTest.java (revision ) @@ -17,6 +17,7 @@ package org.apache.logging.log4j.core.lookup; import org.apache.logging.log4j.ThreadContext; +import org.apache.logging.log4j.core.spi.StrLookup; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java (revision ) @@ -19,7 +19,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.Configurator; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/ExtendedLevelTest.java (revision ) @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.ExtendedLevels; import org.apache.logging.log4j.test.appender.ListAppender; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/AppendersPlugin.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.core.config.plugins; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/AbstractSocketServerTest.java (revision ) @@ -27,9 +27,9 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; @@ -66,15 +66,15 @@ private static final String MESSAGE_2 = "This is test message 2"; private final LoggerContext ctx = (LoggerContext) LogManager.getContext(false); - + private final boolean expectLengthException; private final String port; private final String protocol; - + private final Logger root = ctx.getLogger(AbstractSocketServerTest.class.getSimpleName()); - + protected AbstractSocketServerTest(final String protocol, final String port, final boolean expectLengthException) { this.protocol = protocol; this.port = port; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/Filter.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/spi/Filter.java (revision ) @@ -15,10 +15,12 @@ * limitations under the license. */ -package org.apache.logging.log4j.core; +package org.apache.logging.log4j.core.spi; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.util.EnglishEnums; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java (revision ) @@ -26,6 +26,8 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.core.filter.CompositeFilter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.message.SimpleMessage; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java (revision ) @@ -24,7 +24,7 @@ import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.helpers.Loader; import org.apache.logging.log4j.core.selector.ClassLoaderContextSelector; -import org.apache.logging.log4j.core.selector.ContextSelector; +import org.apache.logging.log4j.core.spi.ContextSelector; import org.apache.logging.log4j.spi.LoggerContextFactory; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.PropertiesUtil; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/selector/ClassLoaderContextSelector.java (revision ) @@ -31,6 +31,7 @@ import org.apache.logging.log4j.core.helpers.Loader; import org.apache.logging.log4j.core.impl.ContextAnchor; import org.apache.logging.log4j.core.impl.ReflectiveCallerClassUtility; +import org.apache.logging.log4j.core.spi.ContextSelector; import org.apache.logging.log4j.status.StatusLogger; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/StructuredDataFilterTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.filter; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.Configurator; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/filter/CompositeFilter.java (revision ) @@ -24,7 +24,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/config/TestConfigurator.java (revision ) @@ -19,9 +19,9 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.filter.CompositeFilter; import org.apache.logging.log4j.core.layout.PatternLayout; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/Configuration.java (revision ) @@ -18,8 +18,8 @@ import java.util.Map; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.filter.Filterable; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.filter; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.message.Message; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.appender; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.helpers.Constants; import org.apache.logging.log4j.core.impl.Log4jLogEvent; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/JSONRoutingAppender2Test.java (revision ) @@ -25,7 +25,7 @@ import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicTest.java (revision ) @@ -27,8 +27,8 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderLoggingException.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderLoggingException.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderLoggingException.java (revision ) @@ -26,7 +26,7 @@ * features like the {@link FailoverAppender} work properly. * * Also note that appenders must provide a way to suppress exceptions when the user desires and abide by - * that instruction. See {@link org.apache.logging.log4j.core.Appender#ignoreExceptions()}, which is the standard + * that instruction. See {@link org.apache.logging.log4j.core.spi.Appender#ignoreExceptions()}, which is the standard * way to do this. */ public class AppenderLoggingException extends LoggingException { Index: log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java (revision ) @@ -29,7 +29,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/ResourceBundleLookup.java (revision ) @@ -21,6 +21,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; /** * Looks up keys from resource bundles. @@ -30,9 +31,9 @@ /** * Looks up the value for the key in the format "BundleName:BundleKey". - * + * * For example: "com.domain.messages:MyKey". - * + * * @param key * the key to be looked up, may be null * @return The value for the key. @@ -62,9 +63,9 @@ /** * Looks up the value for the key in the format "BundleName:BundleKey". - * + * * For example: "com.domain.messages:MyKey". - * + * * @param event * The current LogEvent. * @param key Index: log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java (revision ) @@ -25,6 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerUpdateTest.java (revision ) @@ -27,6 +27,7 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.core.config.LoggerConfig; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.appender.ListAppender; import org.junit.AfterClass; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/net/SMTPManager.java (revision ) @@ -37,7 +37,7 @@ import javax.mail.util.ByteArrayDataSource; import org.apache.logging.log4j.LoggingException; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.AbstractManager; import org.apache.logging.log4j.core.appender.ManagerFactory; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/selector/BasicContextSelector.java (revision ) @@ -23,6 +23,7 @@ import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.impl.ContextAnchor; +import org.apache.logging.log4j.core.spi.ContextSelector; /** * Returns either this Thread's context or the default LoggerContext. Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SMTPAppender.java (revision ) @@ -19,8 +19,8 @@ import java.io.Serializable; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.config.plugins.PluginAttribute; Index: log4j-core/src/test/java/org/apache/logging/log4j/junit/InitialLoggerContext.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/junit/InitialLoggerContext.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/junit/InitialLoggerContext.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.junit; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.Logger; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; Index: src/site/xdoc/manual/architecture.xml IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/site/xdoc/manual/architecture.xml (revision 1587603) +++ src/site/xdoc/manual/architecture.xml (revision ) @@ -516,7 +516,7 @@ More than one Appender can be attached to a Logger.

An Appender can be added to a Logger by calling the - addLoggerAppender + addLoggerAppender method of the current Configuration. If a LoggerConfig matching the name of the Logger does not exist, one will be created, the Appender will be attached to it and then all Loggers will be notified to update their LoggerConfig references. Index: log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/net/TCPSocketManager.java (revision ) @@ -28,7 +28,7 @@ import java.util.Map; import java.util.concurrent.CountDownLatch; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.AppenderLoggingException; import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.appender.OutputStreamManager; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/filter/Filterable.java (revision ) @@ -16,7 +16,7 @@ */ package org.apache.logging.log4j.core.filter; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LogEvent; /** Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/DateLookup.java (revision ) @@ -23,6 +23,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.status.StatusLogger; /** Index: log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/net/DatagramSocketManager.java (revision ) @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.helpers.Strings; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java (revision ) @@ -20,6 +20,7 @@ import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.spi.StrLookup; import org.apache.logging.log4j.message.MapMessage; /** Index: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/appender/AsyncAppenderTest.java (revision ) @@ -25,7 +25,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LoggingException; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.ConfigurationFactory; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/appender/RollingFileAppender.java (revision ) @@ -21,8 +21,8 @@ import java.util.Map; import java.util.zip.Deflater; -import org.apache.logging.log4j.core.Filter; -import org.apache.logging.log4j.core.Layout; +import org.apache.logging.log4j.core.spi.Filter; +import org.apache.logging.log4j.core.spi.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.appender.rolling.DefaultRolloverStrategy; import org.apache.logging.log4j.core.appender.rolling.RollingFileManager; Index: log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java (revision 1587603) +++ log4j-taglib/src/test/java/org/apache/logging/log4j/taglib/ExitTagTest.java (revision ) @@ -27,7 +27,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.Appender; +import org.apache.logging.log4j.core.spi.Appender; import org.apache.logging.log4j.core.LoggerContext; import org.apache.logging.log4j.core.config.ConfigurationFactory; import org.apache.logging.log4j.status.StatusLogger; Index: log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java (revision 1587603) +++ log4j-core/src/test/java/org/apache/logging/log4j/core/filter/TimeFilterTest.java (revision ) @@ -17,7 +17,7 @@ package org.apache.logging.log4j.core.filter; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.LogEvent; import org.junit.Test; Index: log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (revision 1587603) +++ log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java (revision ) @@ -20,8 +20,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.Filter; +import org.apache.logging.log4j.core.spi.Appender; +import org.apache.logging.log4j.core.spi.Filter; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;