dlr 2003/10/21 18:38:11
Modified: . TODO.txt
src/java/org/apache/velocity/runtime/log Log4JLogSystem.java
SimpleLog4JLogSystem.java
Added: build/lib log4j-1.2.8.jar
Removed: build/lib log4j-1.1.3.jar log4j-core-1.1.3.jar
Log:
Replaced Log4J's deprecated Category class with Logger.
* TODO.txt
Removed the "Drop use of Log4J Category class" item.
* build/lib/log4j-1.1.3.jar
* build/lib/log4j-core-1.1.3.jar
Removed by upgrade from Log4J 1.1.3 to Log4J 1.2.8.
* build/lib/log4j-1.2.8.jar
Added for update from Log4J 1.1.3 to Log4J 1.2.8.
* src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java
* src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
Update from the deprecated Log4J Category class to the Logger class.
Removal of Category from Log4J is pending.
Sub-classes will have to replace their references with Category
with Logger, and Category.getInstance() with Logger.getLogger().
Issue: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=19133
Compared against patches by: Jens Elkner
Revision Changes Path
1.4 +0 -8 jakarta-velocity/TODO.txt
Index: TODO.txt
===================================================================
RCS file: /home/cvs/jakarta-velocity/TODO.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- TODO.txt 21 Oct 2003 23:57:35 -0000 1.3
+++ TODO.txt 22 Oct 2003 01:38:10 -0000 1.4
@@ -5,14 +5,6 @@
+------------- Not Critical For Release -------------+
-o Drop use of Log4J Category class
-
- PLAN: Replace with org.apache.log4j.Logger.
-
- STATUS:
- [DLR] I will implement this for 1.5 (has open Bugzilla issue).
-
-
o Control Caching Resource Usage
Change resource caching to limit cache size and expire
1.8 +6 -7
jakarta-velocity/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java
Index: Log4JLogSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/Log4JLogSystem.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- Log4JLogSystem.java 4 May 2003 17:18:38 -0000 1.7
+++ Log4JLogSystem.java 22 Oct 2003 01:38:10 -0000 1.8
@@ -63,20 +63,19 @@
import org.apache.velocity.runtime.RuntimeServices;
/**
- * Implementation of a Log4J logger.
+ * <em>Deprecated</em> implementation of a Log4J logger.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @version $Id$
*
- * @deprecated As of v1.3. Use
- * [EMAIL PROTECTED] SimpleLog4jLogSystem}
+ * @deprecated As of v1.3. Use [EMAIL PROTECTED] SimpleLog4jLogSystem}.
*/
public class Log4JLogSystem implements LogSystem
{
private RuntimeServices rsvc = null;
/** log4java logging interface */
- protected Category logger = null;
+ protected Logger logger = null;
/** logging layout */
protected Layout layout = null;
@@ -127,14 +126,14 @@
private void internalInit()
throws Exception
{
- logger = Category.getInstance("");
+ logger = Logger.getLogger("");
logger.setAdditivity(false);
/*
* Priority is set for DEBUG becouse this implementation checks
* log level.
*/
- logger.setPriority(Priority.DEBUG);
+ logger.setLevel(Level.DEBUG);
String pattern = rsvc.getString( RuntimeConstants.LOGSYSTEM_LOG4J_PATTERN );
1.4 +24 -15
jakarta-velocity/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
Index: SimpleLog4JLogSystem.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- SimpleLog4JLogSystem.java 22 Oct 2003 01:10:31 -0000 1.3
+++ SimpleLog4JLogSystem.java 22 Oct 2003 01:38:10 -0000 1.4
@@ -56,31 +56,38 @@
import java.util.Enumeration;
-import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
import org.apache.log4j.RollingFileAppender;
import org.apache.log4j.PatternLayout;
-import org.apache.log4j.Priority;
+import org.apache.log4j.Level;
import org.apache.log4j.Appender;
import org.apache.velocity.runtime.RuntimeConstants;
import org.apache.velocity.runtime.RuntimeServices;
/**
- * Implementation of a simple log4j system that will either
- * latch onto an existing category, or just do a simple
- * rolling file log. Derived from Jon's 'complicated'
- * version :)
+ * Implementation of a simple log4j system that will either latch onto
+ * an existing category, or just do a simple rolling file log.
*
* @author <a href="mailto:[EMAIL PROTECTED]>Geir Magnusson Jr.</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]>Jon Scott Stevens</a>
* @version $Id$
+ * @since Velocity 1.3
*/
public class SimpleLog4JLogSystem implements LogSystem
{
private RuntimeServices rsvc = null;
- /** log4java logging interface */
- protected Category logger = null;
+ /**
+ * <a href="http://jakarta.apache.org/log4j/";>Log4J</a>
+ * logging API.
+ */
+ protected Logger logger = null;
+ /**
+ * <a href="http://jakarta.apache.org/log4j/";>Log4J</a>
+ * logging API.
+ */
public SimpleLog4JLogSystem()
{
}
@@ -94,14 +101,16 @@
* the application to make us use an existing logger
*/
- String categoryname = (String)
rsvc.getProperty("runtime.log.logsystem.log4j.category");
+ String loggerName =
+ (String) rsvc.getProperty("runtime.log.logsystem.log4j.category");
- if ( categoryname != null )
+ if (loggerName != null)
{
- logger = Category.getInstance( categoryname );
+ logger = Logger.getLogger(loggerName);
- logVelocityMessage( 0,
- "SimpleLog4JLogSystem using category '" +
categoryname + "'");
+ logVelocityMessage(0,
+ "SimpleLog4JLogSystem using category '"
+ + loggerName + '\'');
return;
}
@@ -140,14 +149,14 @@
* that might be used...
*/
- logger = Category.getInstance(this.getClass().getName());
+ logger = Logger.getLogger(this.getClass().getName());
logger.setAdditivity(false);
/*
* Priority is set for DEBUG becouse this implementation checks
* log level.
*/
- logger.setPriority(Priority.DEBUG);
+ logger.setLevel(Level.DEBUG);
RollingFileAppender appender = new RollingFileAppender( new PatternLayout(
"%d - %m%n"), logfile, true);
1.1 jakarta-velocity/build/lib/log4j-1.2.8.jar
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
