Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 16658 invoked from network); 5 May 2008 20:55:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 May 2008 20:55:09 -0000 Received: (qmail 19391 invoked by uid 500); 5 May 2008 20:55:10 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 19329 invoked by uid 500); 5 May 2008 20:55:10 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 19318 invoked by uid 99); 5 May 2008 20:55:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 May 2008 13:55:10 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 05 May 2008 20:54:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9EFE72388A41; Mon, 5 May 2008 13:54:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r653596 - in /geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl: StaticLoggerBinder.java StaticMarkerBinder.java Date: Mon, 05 May 2008 20:54:45 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080505205445.9EFE72388A41@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jdillon Date: Mon May 5 13:54:44 2008 New Revision: 653596 URL: http://svn.apache.org/viewvc?rev=653596&view=rev Log: Finish setup for custom SLF4J muck Modified: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Modified: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java?rev=653596&r1=653595&r2=653596&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticLoggerBinder.java Mon May 5 13:54:44 2008 @@ -22,6 +22,8 @@ import org.slf4j.ILoggerFactory; import org.slf4j.spi.LoggerFactoryBinder; +import org.apache.geronimo.framework.logging.LoggerFactory; + /** * ??? * @@ -32,17 +34,15 @@ { public static final StaticLoggerBinder SINGLETON = new StaticLoggerBinder(); - private final ILoggerFactory factory; - - public StaticLoggerBinder() { - // TODO: - } + private static final Class FACTORY_TYPE = LoggerFactory.class; + private final ILoggerFactory factory = new LoggerFactory(); + public ILoggerFactory getLoggerFactory() { return factory; } public String getLoggerFactoryClassStr() { - // TODO: + return FACTORY_TYPE.getName(); } } Modified: geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java?rev=653596&r1=653595&r2=653596&view=diff ============================================================================== --- geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java (original) +++ geronimo/server/trunk/framework/modules/geronimo-logging/src/main/java/org/slf4j/impl/StaticMarkerBinder.java Mon May 5 13:54:44 2008 @@ -20,8 +20,8 @@ package org.slf4j.impl; import org.slf4j.IMarkerFactory; -import org.slf4j.helpers.BasicMarkerFactory; import org.slf4j.spi.MarkerFactoryBinder; +import org.apache.geronimo.framework.logging.MarkerFactory; /** * ??? @@ -33,13 +33,15 @@ { public static final StaticMarkerBinder SINGLETON = new StaticMarkerBinder(); - private final IMarkerFactory factory = new BasicMarkerFactory(); + private static final Class MARKER_TYPE = MarkerFactory.class; + + private final IMarkerFactory factory = new MarkerFactory(); public IMarkerFactory getMarkerFactory() { return factory; } public String getMarkerFactoryClassStr() { - return BasicMarkerFactory.class.getName(); + return MARKER_TYPE.getName(); } }