svn commit: r534007 - in /ofbiz/trunk/framework: base/lib/log4j-1.2.14.jar base/lib/log4j.jar base/src/base/org/ofbiz/base/util/Debug.java base/src/base/org/ofbiz/base/util/Log4jLoggerWriter.java jetty/src/org/ofbiz/jetty/container/JettyContainer.java

[jacopoc]

Author: jacopoc
Date: Tue May  1 04:06:19 2007
New Revision: 534007

URL: http://svn.apache.org/viewvc?view=rev&rev=534007
Log:
Upgrade to log4j 1.2.14 (latest stable release).

Added:
    ofbiz/trunk/framework/base/lib/log4j-1.2.14.jar   (with props)
Removed:
    ofbiz/trunk/framework/base/lib/log4j.jar
Modified:
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Debug.java
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Log4jLoggerWriter.java
    ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java

Added: ofbiz/trunk/framework/base/lib/log4j-1.2.14.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/log4j-1.2.14.jar?view=auto&rev=534007
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/log4j-1.2.14.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Debug.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Debug.java?view=diff&rev=534007&r1=534006&r2=534007
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Debug.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Debug.java Tue May  1 04:06:19 2007
@@ -33,7 +33,6 @@
 import org.apache.log4j.PropertyConfigurator;
 import org.apache.log4j.RollingFileAppender;
 import org.apache.log4j.Appender;
-import org.apache.log4j.Priority;
 import org.apache.log4j.spi.LoggerRepository;
 
 import org.ofbiz.base.util.collections.FlexibleProperties;
@@ -358,7 +357,7 @@
             if (maxSize > 0) {
                 newAppender.setMaximumFileSize(maxSize);
             }
-            newAppender.setThreshold(Priority.DEBUG);
+            newAppender.setThreshold(Level.DEBUG);
             newAppender.activateOptions();
             newAppender.setName(name);            
         }

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Log4jLoggerWriter.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Log4jLoggerWriter.java?view=diff&rev=534007&r1=534006&r2=534007
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Log4jLoggerWriter.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/Log4jLoggerWriter.java Tue May  1 04:06:19 2007
@@ -23,6 +23,7 @@
 import java.io.Writer;
 
 import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
 import org.apache.log4j.Priority;
 
 /**
@@ -32,7 +33,7 @@
 public class Log4jLoggerWriter extends PrintWriter {
 
     public Log4jLoggerWriter(Logger logger) {
-        this(logger, Priority.INFO);
+        this(logger, Level.INFO);
     }
 
     public Log4jLoggerWriter(Logger logger, Priority priority) {

Modified: ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java?view=diff&rev=534007&r1=534006&r2=534007
==============================================================================
--- ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java (original)
+++ ofbiz/trunk/framework/jetty/src/org/ofbiz/jetty/container/JettyContainer.java Tue May  1 04:06:19 2007
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 import org.mortbay.http.NCSARequestLog;
@@ -468,14 +469,14 @@
 
         Logger log = Logger.getLogger(class_name);
 
-        Priority priority = Priority.INFO;
+        Priority priority = Level.INFO;
 
         if (Log.DEBUG.equals(tag)) {
-            priority = Priority.DEBUG;
+            priority = Level.DEBUG;
         } else if (Log.WARN.equals(tag) || Log.ASSERT.equals(tag)) {
-            priority = Priority.ERROR;
+            priority = Level.ERROR;
         } else if (Log.FAIL.equals(tag)) {
-            priority = Priority.FATAL;
+            priority = Level.FATAL;
         }
 
         if (!log.isEnabledFor(priority)) {
@@ -486,6 +487,6 @@
     }
 
     public synchronized void log(String s) {
-        Logger.getRootLogger().log("jetty.log4jSink", Priority.INFO, s, null);
+        Logger.getRootLogger().log("jetty.log4jSink", Level.INFO, s, null);
     }
 }