[cvs] expresso commit by mtraum: org.apache.log4j.Category is being

[JCorporate Ltd]

Log Message:
-----------
org.apache.log4j.Category is being deprecated in log4j

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test:
        ExpressoTestCase.java
        ControllerTestCase.java
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters:
        FilterTreeNode.java

Revision Data
-------------
Index: ExpressoTestCase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ExpressoTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ExpressoTestCase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ExpressoTestCase.java -u -r1.8 -r1.9
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ExpressoTestCase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ExpressoTestCase.java
@@ -65,7 +65,6 @@
 package com.jcorporate.expresso.services.test;
 
 import junit.framework.TestCase;
-import org.apache.log4j.Category;
 import org.apache.log4j.Logger;
 
 
@@ -92,7 +91,7 @@
     /**
      * Utilize this function for quick and easy logging for test cases
      */
-    protected Category getLog() {
+    protected Logger getLog() {
         return log;
     }
 
Index: ControllerTestCase.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java -u -r1.18 -r1.19
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/services/test/ControllerTestCase.java
@@ -75,7 +75,6 @@
 import org.apache.cactus.ServletTestCase;
 import org.apache.cactus.WebRequest;
 import org.apache.cactus.WebResponse;
-import org.apache.log4j.Category;
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
@@ -141,12 +140,12 @@
     }
 
     /**
-     * returns a controller test case Log4j Category for your own easy logging
+     * returns a controller test case Log4j Logger for your own easy logging
      * without having to do special initialization etc.
      *
      * @return a log4j category that you can log to.
      */
-    protected Category getLog() {
+    protected Logger getLog() {
         return log;
     }
 
Index: FilterTreeNode.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/FilterTreeNode.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/FilterTreeNode.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/FilterTreeNode.java -u -r1.10 -r1.11
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/FilterTreeNode.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/security/filters/FilterTreeNode.java
@@ -67,6 +67,7 @@
 import com.jcorporate.expresso.core.misc.ReusableChar;
 import com.jcorporate.expresso.kernel.util.FastStringBuffer;
 import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -167,8 +168,28 @@
      * subnodes.
      *
      * @param Category - The log4j Category to dump to.
+     * @deprecated since 1/17/2004, Category is being deprecated in log4j - use dumpNode(Logger)
      */
     public void dumpNode(Category log) {
+        if (log.isDebugEnabled()) {
+            FastStringBuffer fsb = FastStringBuffer.getInstance();
+            try {
+                dumpNode(fsb, 0);
+                log.debug(fsb.toString());
+            } finally {
+                fsb.release();
+                fsb = null;
+            }
+        }
+    }
+    
+    /**
+     * Dumps the contents of the tree to the log. (ie dumps this node and all
+     * subnodes.
+     *
+     * @param Category - The log4j Category to dump to.
+     */
+    public void dumpNode(Logger log) {
         if (log.isDebugEnabled()) {
             FastStringBuffer fsb = FastStringBuffer.getInstance();
             try {