mx4j/src/core/mx4j/log Log4JLogger.java,1.4,1.5

Update of /cvsroot/mx4j/mx4j/src/core/mx4j/log
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6012/src/core/mx4j/log

Modified Files:
	Log4JLogger.java 
Log Message:
Update all log4j code to change references from Priority to Level 
and Category to Logger.


Index: Log4JLogger.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/core/mx4j/log/Log4JLogger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Log4JLogger.java	29 Aug 2003 13:07:00 -0000	1.4
--- Log4JLogger.java	27 May 2004 01:12:10 -0000	1.5
***************
*** 10,26 ****
  
  
! import org.apache.log4j.Category;
! import org.apache.log4j.Priority;
  
  /**
!  * Log that redirects log calls to a Log4J Category. <p>
   *
!  * @see org.apache.log4j.Category at <a href="http://jakarta.apache.org/log4j">Apache's Log4J</a>
   * @author <a href="mailto:[email protected]">Simone Bordet</a>
   * @version $Revision$
   */
! public class Log4JLogger extends Logger
  {
! 	private Category m_category;
  
  	/**
--- 10,27 ----
  
  
! import org.apache.log4j.Level;
! import org.apache.log4j.Logger;
  
  /**
!  * Log that redirects log calls to a Log4J Logger. <p>
   *
!  * @see org.apache.log4j.Logger at <a href="http://jakarta.apache.org/log4j">Apache's Log4J</a>
   * @author <a href="mailto:[email protected]">Simone Bordet</a>
+  * @author <a href="mailto:[email protected]">Brian Scully</a>
   * @version $Revision$
   */
! public class Log4JLogger extends mx4j.log.Logger
  {
! 	private Logger m_logger;
  
  	/**
***************
*** 32,36 ****
  	{
  		super.setCategory(category);
! 		m_category = Category.getInstance(getCategory());
  	}
  
--- 33,37 ----
  	{
  		super.setCategory(category);
! 		m_logger = Logger.getLogger(getCategory());
  	}
  
***************
*** 38,43 ****
  	{
  		// Convert MX4J priority to log4j priority
! 		Priority p = convertPriority(priority);
! 		m_category.log(p, message, t);
  	}
  
--- 39,44 ----
  	{
  		// Convert MX4J priority to log4j priority
! 		Level l = convertPriority(priority);
! 		m_logger.log(l, message, t);
  	}
  
***************
*** 45,60 ****
  	 * Converts MX4J priority to Log4J priority
  	 */
! 	protected Priority convertPriority(int mx4jPriority)
  	{
! 		Priority log4jPriority = Priority.DEBUG;
  		switch (mx4jPriority)
  		{
! 			case Logger.FATAL: log4jPriority = Priority.FATAL; break;
! 			case Logger.ERROR: log4jPriority = Priority.ERROR; break;
! 			case Logger.WARN: log4jPriority = Priority.WARN; break;
! 			case Logger.INFO: log4jPriority = Priority.INFO; break;
! 			case Logger.DEBUG: log4jPriority = Priority.DEBUG; break;
! 			case Logger.TRACE: log4jPriority = Priority.DEBUG; break;
! 			default: log4jPriority = Priority.INFO; break;
  		}
  		return log4jPriority;
--- 46,61 ----
  	 * Converts MX4J priority to Log4J priority
  	 */
! 	protected Level convertPriority(int mx4jPriority)
  	{
! 		Level log4jPriority = Level.DEBUG;
  		switch (mx4jPriority)
  		{
! 			case mx4j.log.Logger.FATAL: log4jPriority = Level.FATAL; break;
! 			case mx4j.log.Logger.ERROR: log4jPriority = Level.ERROR; break;
! 			case mx4j.log.Logger.WARN: log4jPriority = Level.WARN; break;
! 			case mx4j.log.Logger.INFO: log4jPriority = Level.INFO; break;
! 			case mx4j.log.Logger.DEBUG: log4jPriority = Level.DEBUG; break;
! 			case mx4j.log.Logger.TRACE: log4jPriority = Level.DEBUG; break;
! 			default: log4jPriority = Level.INFO; break;
  		}
  		return log4jPriority;



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click