Hello,
The included patches allow Jboss (latest CVS-snapshot) to work with log4j 1.2alpa1,
xdoclet-related patches are also included. You can continue to use your own subclass
of Category although this is likely to cause problems if and when you decide to
support the LogManager architecture.
Let me know if you need further clarifications. Regards,
ps: JBoss is pretty awesome. Well done!
--
Ceki Gülcü - http://qos.ch
Index: server/src/main/org/jboss/logging/TracePriority.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/logging/TracePriority.java,v
retrieving revision 1.1
diff -u -r1.1 TracePriority.java
--- server/src/main/org/jboss/logging/TracePriority.java 2001/09/11 18:35:02
1.1
+++ server/src/main/org/jboss/logging/TracePriority.java 2001/10/01 08:12:49
@@ -6,7 +6,7 @@
*/
package org.jboss.logging;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
/** Adds a trace priority that is below the standard log4j DEBUG priority.
This is a custom priority that is 100 below the Priority.DEBUG_INT and
@@ -19,11 +19,11 @@
@author [EMAIL PROTECTED]
@version $Revision: 1.1 $
*/
-public class TracePriority extends Priority
+public class TracePriority extends Level
{
// Constants -----------------------------------------------------
/** The integer representation of the priority, (Priority.DEBUG_INT - 100) */
- public static final int TRACE_INT = Priority.DEBUG_INT - 100;
+ public static final int TRACE_INT = Level.DEBUG_INT - 100;
/** The TRACE priority object singleton */
public static final TracePriority TRACE = new TracePriority(TRACE_INT, "TRACE");
@@ -34,27 +34,27 @@
fails, then this method returns the specified default.
@return the Priority object for name if one exists, defaultPriority otherwize.
*/
- public static Priority toPriority(String name, Priority defaultPriority)
+ public static Level toLevel(String name, Level defaultLevel)
{
if( name == null )
return TRACE;
- Priority p = TRACE;
+ Level p = TRACE;
if( name.charAt(0) != 'T' )
- p = Priority.toPriority(name, defaultPriority);
+ p = Level.toLevel(name, defaultLevel);
return p;
}
/** Convert an integer passed as argument to a priority. If the conversion
fails, then this method returns the specified default.
@return the Priority object for i if one exists, defaultPriority otherwize.
*/
- public static Priority toPriority(int i, Priority defaultPriority)
+ public static Level toLevel(int i, Level defaultLevel)
{
- Priority p;
+ Level p;
if( i == TRACE_INT )
p = TRACE;
else
- p = Priority.toPriority(i);
+ p = Level.toLevel(i);
return p;
}
Index: DocletUtil.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/util/DocletUtil.java,v
retrieving revision 1.5
diff -u -r1.5 DocletUtil.java
--- DocletUtil.java 2001/09/04 14:46:27 1.5
+++ DocletUtil.java 2001/10/01 06:47:44
@@ -5,6 +5,7 @@
import java.util.*;
import com.sun.javadoc.*;
import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
/**
* @author Ara Abrahamian ([EMAIL PROTECTED])
@@ -186,9 +187,9 @@
* @param name Description of Parameter
* @return The Category value
*/
- protected static Category getCategory( Class clazz, String name )
+ protected static Logger getCategory( Class clazz, String name )
{
- Category cat = Category.getInstance( clazz.getName() + "." + name );
+ Logger cat = Logger.getLogger( clazz.getName() + "." + name );
return cat;
}
Index: server/src/main/org/jboss/logging/Logger.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/logging/Logger.java,v
retrieving revision 1.13
diff -u -r1.13 Logger.java
--- server/src/main/org/jboss/logging/Logger.java 2001/09/11 18:35:02 1.13
+++ server/src/main/org/jboss/logging/Logger.java 2001/10/01 08:16:03
@@ -6,8 +6,9 @@
*/
package org.jboss.logging;
-import org.apache.log4j.Category;
-import org.apache.log4j.spi.CategoryFactory;
+//import org.apache.log4j.Logger;
+//import org.apache.log4j.spi.LoggerFactory;
+import org.apache.log4j.LogManager;
/** A custom log4j Category subclass that add a trace level priority.
* @see #isTraceEnabled
@@ -17,29 +18,29 @@
* @author [EMAIL PROTECTED]
* @version $Revision: 1.13 $
*/
-public class Logger extends Category
+public class Logger extends org.apache.log4j.Logger
{
// Constants -----------------------------------------------------
// Attributes ----------------------------------------------------
- private static CategoryFactory factory = new LoggerFactory();
+ private static org.apache.log4j.spi.LoggerFactory factory = new LoggerFactory();
// Static --------------------------------------------------------
/** This method overrides {@link Category#getInstance} by supplying
its own factory type as a parameter.
@param name, the category name
*/
- public static Category getInstance(String name)
+ public static org.apache.log4j.Logger getInstance(String name)
{
- return Category.getInstance(name, factory);
+ return LogManager.getLogger(name, factory);
}
/** This method overrides {@link Category#getInstance} by supplying
its own factory type as a parameter.
@param clazz, the Class whose name will be used as the category name
*/
- public static Category getInstance(Class clazz)
+ public static org.apache.log4j.Logger getInstance(Class clazz)
{
- return Category.getInstance(clazz.getName(), factory);
+ return LogManager.getLogger(clazz.getName(), factory);
}
/** Create a Logger instance given the category name.
@@ -47,7 +48,7 @@
*/
public static Logger create(String name)
{
- Logger logger = (Logger) Category.getInstance(name, factory);
+ Logger logger = (Logger) LogManager.getLogger(name, factory);
return logger;
}
/** Create a Logger instance given the category class. This simply
@@ -56,12 +57,12 @@
*/
public static Logger create(Class clazz)
{
- Logger logger = (Logger) Category.getInstance(clazz.getName(), factory);
+ Logger logger = (Logger) LogManager.getLogger(clazz.getName(), factory);
return logger;
}
// Constructors --------------------------------------------------
- /** Creates new JBossCategory with the given category name.
+ /** Creates new JBossorg.apache.log4j.Logger with the given category name.
@param name, the category name.
*/
public Logger(String name)
@@ -75,9 +76,9 @@
*/
public boolean isTraceEnabled()
{
- if( hierarchy.isDisabled(TracePriority.TRACE_INT) )
+ if( repository.isDisabled(TracePriority.TRACE_INT) )
return false;
- return TracePriority.TRACE.isGreaterOrEqual(this.getChainedPriority());
+ return TracePriority.TRACE.isGreaterOrEqual(this.getChainedLevel());
}
/** Issue a log msg with a priority of TRACE.
Index: server/src/main/org/jboss/logging/LoggerFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/logging/LoggerFactory.java,v
retrieving revision 1.1
diff -u -r1.1 LoggerFactory.java
--- server/src/main/org/jboss/logging/LoggerFactory.java 2001/09/11 18:35:02
1.1
+++ server/src/main/org/jboss/logging/LoggerFactory.java 2001/10/01 08:20:47
@@ -6,16 +6,14 @@
*/
package org.jboss.logging;
-import org.apache.log4j.Category;
-import org.apache.log4j.spi.CategoryFactory;
/** A custom category factory that returns Logger instaneces
* @author [EMAIL PROTECTED]
* @version $Revision: 1.1 $
*/
-public class LoggerFactory implements CategoryFactory
+public class LoggerFactory implements org.apache.log4j.spi.LoggerFactory
{
- public Category makeNewCategoryInstance(String name)
+ public org.apache.log4j.Logger makeNewLoggerInstance(String name)
{
return new Logger(name);
}
Index: security/src/main/org/jboss/security/srp/TracePriority.java
===================================================================
RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/srp/TracePriority.java,v
retrieving revision 1.1
diff -u -r1.1 TracePriority.java
--- security/src/main/org/jboss/security/srp/TracePriority.java 2001/03/06 08:35:31
1.1
+++ security/src/main/org/jboss/security/srp/TracePriority.java 2001/10/01 08:11:51
@@ -1,6 +1,6 @@
package org.jboss.security.srp;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
/** Adds a trace priority that is below the standard log4j debug priority.
@@ -9,7 +9,7 @@
@author [EMAIL PROTECTED]
@version $Revision: 1.1 $
*/
-public class TracePriority extends Priority
+public class TracePriority extends Level
{
static final int TRACE_INT = 800;
public static final TracePriority TRACE = new TracePriority(TRACE_INT, "TRACE");
@@ -19,24 +19,24 @@
super(level, strLevel, 7);
}
- public static Priority toPriority(String name)
+ public static Level toLevel(String name)
{
if( name == null )
return TRACE;
- Priority p = TRACE;
+ Level p = TRACE;
if( name.charAt(0) != 'T' )
- p = Priority.toPriority(name);
+ p = Level.toLevel(name);
return p;
}
- public static Priority toPriority(int i) throws IllegalArgumentException
+ public static Level toLevel(int i) throws IllegalArgumentException
{
- Priority p;
+ Level p;
if( i == TRACE_INT )
p = TRACE;
else
- p = Priority.toPriority(i);
+ p = Level.toLevel(i);
return p;
}
}
Index: TemplateEngine.java
===================================================================
RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/util/TemplateEngine.java,v
retrieving revision 1.17
diff -u -r1.17 TemplateEngine.java
--- TemplateEngine.java 2001/09/24 22:35:57 1.17
+++ TemplateEngine.java 2001/10/01 06:49:54
@@ -7,6 +7,7 @@
import com.sun.javadoc.*;
import org.apache.tools.ant.BuildException;
+import org.apache.log4j.Logger;
import org.apache.log4j.Category;
/**
@@ -673,9 +674,9 @@
* @param name Description of Parameter
* @return The Category value
*/
- protected static Category getCategory( Class clazz, String name )
+ protected static Logger getCategory( Class clazz, String name )
{
- return Category.getInstance( clazz.getName() + "." + name );
+ return Logger.getLogger( clazz.getName() + "." + name );
}
/**
Index: server/src/main/org/jboss/logging/log4j/ConsoleAppender.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/logging/log4j/ConsoleAppender.java,v
retrieving revision 1.5
diff -u -r1.5 ConsoleAppender.java
--- server/src/main/org/jboss/logging/log4j/ConsoleAppender.java 2001/08/03
17:15:53 1.5
+++ server/src/main/org/jboss/logging/log4j/ConsoleAppender.java 2001/10/01
+08:14:32
@@ -10,6 +10,7 @@
import org.apache.log4j.AppenderSkeleton;
import org.apache.log4j.Category;
+import org.apache.log4j.Level;
import org.apache.log4j.Priority;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.Layout;
@@ -61,7 +62,7 @@
protected void append(LoggingEvent event)
{
String msg = this.layout.format(event);
- if( event.priority == Priority.ERROR )
+ if( event.level == Priority.ERROR )
err.print(msg);
else
out.print(msg);
@@ -73,7 +74,7 @@
int len = s.length;
for(int i = 0; i < len; i++)
{
- if( event.priority == Priority.ERROR )
+ if( event.level == Priority.ERROR )
{
err.print(s[i]);
err.print(Layout.LINE_SEP);
