You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ni...@apache.org on 2013/07/07 21:26:13 UTC

svn commit: r1500514 - in /logging/log4j/log4j2/trunk: api/src/main/java/org/apache/logging/log4j/spi/ api/src/test/java/org/apache/logging/log4j/ log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/

Author: nickwilliams
Date: Sun Jul  7 19:26:13 2013
New Revision: 1500514

URL: http://svn.apache.org/r1500514
Log:
Per discussions on mailing list, increasing visibility of AbstractLogger#log(Marker, String, Level, Message, Throwable) so that anyone can call it. This will enable https://issues.jboss.org/browse/JBLOGGING-95 to be easily accomplished.

Modified:
    logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
    logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
    logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java

Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java?rev=1500514&r1=1500513&r2=1500514&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java (original)
+++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java Sun Jul  7 19:26:13 2013
@@ -1457,7 +1457,7 @@ public abstract class AbstractLogger imp
      * @param data   The Message.
      * @param t      A Throwable or null.
      */
-    protected abstract void log(Marker marker, String fqcn, Level level, Message data, Throwable t);
+    public abstract void log(Marker marker, String fqcn, Level level, Message data, Throwable t);
 
     /**
      * Logs a Throwable to be thrown.

Modified: logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java?rev=1500514&r1=1500513&r2=1500514&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java (original)
+++ logging/log4j/log4j2/trunk/api/src/test/java/org/apache/logging/log4j/AbstractLoggerTest.java Sun Jul  7 19:26:13 2013
@@ -149,7 +149,7 @@ public class AbstractLoggerTest extends 
     }
 
     @Override
-    protected void log(final Marker marker, final String fqcn, final Level level, final Message data, final Throwable t) {
+    public void log(final Marker marker, final String fqcn, final Level level, final Message data, final Throwable t) {
         assertTrue("Incorrect Level. Expected " + currentLevel + ", actual " + level, level.equals(currentLevel));
         if (marker == null) {
             if (currentEvent.markerName != null) {

Modified: logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java?rev=1500514&r1=1500513&r2=1500514&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-to-slf4j/src/main/java/org/apache/logging/slf4j/SLF4JLogger.java Sun Jul  7 19:26:13 2013
@@ -46,7 +46,7 @@ public class SLF4JLogger extends Abstrac
     }
 
     @Override
-    protected void log(final Marker marker, final String fqcn, final Level level, final Message data,
+    public void log(final Marker marker, final String fqcn, final Level level, final Message data,
                        final Throwable t) {
         if (locationAwareLogger != null) {
             if (data instanceof LoggerNameAwareMessage) {