Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 72BC110F47 for ; Sun, 7 Jul 2013 19:26:36 +0000 (UTC) Received: (qmail 45594 invoked by uid 500); 7 Jul 2013 19:26:36 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 45572 invoked by uid 500); 7 Jul 2013 19:26:36 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 45565 invoked by uid 99); 7 Jul 2013 19:26:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jul 2013 19:26:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Jul 2013 19:26:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 182DF23888CD; Sun, 7 Jul 2013 19:26:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Sun, 07 Jul 2013 19:26:13 -0000 To: commits@logging.apache.org From: nickwilliams@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130707192614.182DF23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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) {