geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
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 GMT
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();
     }
 }



Mime
View raw message