[jboss-cvs] jboss-seam/src/main/org/jboss/seam/log ...
Gavin King
gavin.king at jboss.com
Thu Feb 15 12:52:53 EST 2007
User: gavin
Date: 07/02/15 12:52:53
Modified: src/main/org/jboss/seam/log JDKProvider.java
Log4JProvider.java LogImpl.java Logging.java
Log:
line numbers for internal seam logging
Revision Changes Path
1.2 +6 -3 jboss-seam/src/main/org/jboss/seam/log/JDKProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JDKProvider.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/log/JDKProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- JDKProvider.java 16 Dec 2006 02:16:28 -0000 1.1
+++ JDKProvider.java 15 Feb 2007 17:52:53 -0000 1.2
@@ -6,10 +6,12 @@
public class JDKProvider implements LogProvider
{
private final Logger logger;
+ private final boolean isWrapped;
- JDKProvider(String category)
+ JDKProvider(String category, boolean wrapped)
{
this.logger = Logger.getLogger(category);
+ this.isWrapped = wrapped;
}
private void log( Level level, Object object, Throwable ex )
@@ -21,9 +23,10 @@
StackTraceElement locations[]=dummyException.getStackTrace();
String className="unknown";
String methodName="unknown";
- if( locations!=null && locations.length>3 )
+ int depth = isWrapped ? 3 : 2;
+ if( locations!=null && locations.length>depth )
{
- StackTraceElement caller=locations[3];
+ StackTraceElement caller=locations[depth];
className=caller.getClassName();
methodName=caller.getMethodName();
}
1.2 +22 -14 jboss-seam/src/main/org/jboss/seam/log/Log4JProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Log4JProvider.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/log/Log4JProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Log4JProvider.java 16 Dec 2006 02:16:28 -0000 1.1
+++ Log4JProvider.java 15 Feb 2007 17:52:53 -0000 1.2
@@ -6,52 +6,60 @@
public final class Log4JProvider implements LogProvider
{
private final Logger logger;
+ private final boolean isWrapped;
- private static final String FQCN = LogImpl.class.getName();
+ private static final String LOG_IMPL_FQCN = LogImpl.class.getName();
+ private static final String LOG_PROVIDER_FQCN = Log4JProvider.class.getName();
- Log4JProvider(String category)
+ Log4JProvider(String category, boolean wrapped)
{
logger = Logger.getLogger(category);
+ isWrapped = wrapped;
+ }
+
+ private String getFQCN()
+ {
+ return isWrapped ? LOG_IMPL_FQCN : LOG_PROVIDER_FQCN;
}
public void debug(Object object)
{
- logger.log(FQCN, Level.DEBUG, object, null);
+ logger.log( getFQCN(), Level.DEBUG, object, null);
}
public void debug(Object object, Throwable t)
{
- logger.log(FQCN, Level.DEBUG, object, t);
+ logger.log( getFQCN(), Level.DEBUG, object, t);
}
public void error(Object object)
{
- logger.log(FQCN, Level.ERROR, object, null);
+ logger.log( getFQCN(), Level.ERROR, object, null);
}
public void error(Object object, Throwable t)
{
- logger.log(FQCN, Level.ERROR, object, t);
+ logger.log( getFQCN(), Level.ERROR, object, t);
}
public void fatal(Object object)
{
- logger.log(FQCN, Level.FATAL, object, null);
+ logger.log( getFQCN(), Level.FATAL, object, null);
}
public void fatal(Object object, Throwable t)
{
- logger.log(FQCN, Level.DEBUG, object, t);
+ logger.log( getFQCN(), Level.DEBUG, object, t);
}
public void info(Object object)
{
- logger.log(FQCN, Level.INFO, object, null);
+ logger.log( getFQCN(), Level.INFO, object, null);
}
public void info(Object object, Throwable t)
{
- logger.log(FQCN, Level.INFO, object, t);
+ logger.log( getFQCN(), Level.INFO, object, t);
}
public boolean isDebugEnabled()
@@ -86,22 +94,22 @@
public void trace(Object object)
{
- logger.log(FQCN, Level.DEBUG, object, null);
+ logger.log( getFQCN(), Level.DEBUG, object, null);
}
public void trace(Object object, Throwable t)
{
- logger.log(FQCN, Level.DEBUG, object, t);
+ logger.log( getFQCN(), Level.DEBUG, object, t);
}
public void warn(Object object)
{
- logger.log(FQCN, Level.WARN, object, null);
+ logger.log( getFQCN(), Level.WARN, object, null);
}
public void warn(Object object, Throwable t)
{
- logger.log(FQCN, Level.WARN, object, t);
+ logger.log( getFQCN(), Level.WARN, object, t);
}
}
1.10 +8 -2 jboss-seam/src/main/org/jboss/seam/log/LogImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LogImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/log/LogImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- LogImpl.java 21 Dec 2006 02:38:27 -0000 1.9
+++ LogImpl.java 15 Feb 2007 17:52:53 -0000 1.10
@@ -1,9 +1,12 @@
package org.jboss.seam.log;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+
import org.jboss.seam.core.Interpolator;
+
/**
* Implementation of the Log interface using commons logging.
*
@@ -12,13 +15,16 @@
public class LogImpl implements Log, Externalizable
{
private static final long serialVersionUID = -1664298172030714342L;
+
private transient LogProvider log;
private String category;
+
public LogImpl() {} //for Externalizable
+
LogImpl(String category)
{
this.category = category;
- this.log = Logging.getLogProvider(category);
+ this.log = Logging.getLogProvider(category, true);
}
public boolean isDebugEnabled()
{
@@ -143,7 +149,7 @@
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
category = (String) in.readObject();
- log = Logging.getLogProvider(category);
+ log = Logging.getLogProvider(category, true);
}
public void writeExternal(ObjectOutput out) throws IOException
{
1.3 +4 -4 jboss-seam/src/main/org/jboss/seam/log/Logging.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Logging.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/log/Logging.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Logging.java 16 Dec 2006 02:58:11 -0000 1.2
+++ Logging.java 15 Feb 2007 17:52:53 -0000 1.3
@@ -30,16 +30,16 @@
return new LogImpl( clazz.getName() );
}
- public static LogProvider getLogProvider(String category)
+ static LogProvider getLogProvider(String category, boolean wrapped)
{
return isLog4JAvailable ?
- new Log4JProvider(category) :
- new JDKProvider(category);
+ new Log4JProvider(category, wrapped) :
+ new JDKProvider(category, wrapped);
}
public static LogProvider getLogProvider(Class clazz)
{
- return getLogProvider(clazz.getName());
+ return getLogProvider( clazz.getName(), false );
}
}
More information about the jboss-cvs-commits
mailing list