You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2011/09/22 17:10:50 UTC

svn commit: r1174191 [2/3] - in /nutch/branches/branch-1.4: ./ src/java/org/apache/nutch/crawl/ src/java/org/apache/nutch/fetcher/ src/java/org/apache/nutch/indexer/ src/java/org/apache/nutch/indexer/solr/ src/java/org/apache/nutch/net/ src/java/org/ap...

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/DmozParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/DmozParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/DmozParser.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/DmozParser.java Thu Sep 22 15:10:44 2011
@@ -27,8 +27,8 @@ import org.xml.sax.helpers.*;
 import org.apache.xerces.util.XMLChar;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.io.*;
 import org.apache.hadoop.fs.*;
@@ -39,7 +39,7 @@ import org.apache.nutch.util.NutchConfig
 
 /** Utility that converts DMOZ RDF into a flat file of URLs to be injected. */
 public class DmozParser {
-  public static final Log LOG = LogFactory.getLog(DmozParser.class);
+  public static final Logger LOG = LoggerFactory.getLogger(DmozParser.class);
   
     long pages = 0;
 
@@ -237,21 +237,21 @@ public class DmozParser {
      * Emit the exception message
      */
     public void error(SAXParseException spe) {
-      if (LOG.isFatalEnabled()) {
-        LOG.fatal("Error: " + spe.toString() + ": " + spe.getMessage());
-        spe.printStackTrace(LogUtil.getFatalStream(LOG));
+      if (LOG.isErrorEnabled()) {
+        LOG.error("Error: " + spe.toString() + ": " + spe.getMessage());
+        spe.printStackTrace(LogUtil.getErrorStream(LOG));
       }
     }
 
     /**
      * Emit the exception message, with line numbers
      */
-    public void fatalError(SAXParseException spe) {
-      if (LOG.isFatalEnabled()) {
-        LOG.fatal("Fatal err: " + spe.toString() + ": " + spe.getMessage());
-        LOG.fatal("Last known line is " + location.getLineNumber() +
+    public void errorError(SAXParseException spe) {
+      if (LOG.isErrorEnabled()) {
+        LOG.error("Fatal err: " + spe.toString() + ": " + spe.getMessage());
+        LOG.error("Last known line is " + location.getLineNumber() +
                   ", column " + location.getColumnNumber());
-        spe.printStackTrace(LogUtil.getFatalStream(LOG));
+        spe.printStackTrace(LogUtil.getErrorStream(LOG));
       }
     }
         
@@ -299,9 +299,9 @@ public class DmozParser {
       InputSource is = new InputSource(in);
       reader.parse(is);
     } catch (Exception e) {
-      if (LOG.isFatalEnabled()) {
-        LOG.fatal(e.toString());
-        e.printStackTrace(LogUtil.getFatalStream(LOG));
+      if (LOG.isErrorEnabled()) {
+        LOG.error(e.toString());
+        e.printStackTrace(LogUtil.getErrorStream(LOG));
       }
       System.exit(0);
     } finally {
@@ -321,9 +321,9 @@ public class DmozParser {
       }
     } 
     catch (Exception e) {
-      if (LOG.isFatalEnabled()) {
-        LOG.fatal(e.toString());
-        e.printStackTrace(LogUtil.getFatalStream(LOG));
+      if (LOG.isErrorEnabled()) {
+        LOG.error(e.toString());
+        e.printStackTrace(LogUtil.getErrorStream(LOG));
       }
       System.exit(0);
     } finally {

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/FreeGenerator.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/FreeGenerator.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/FreeGenerator.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/FreeGenerator.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.io.Text;
@@ -61,7 +61,7 @@ import org.apache.nutch.util.TimingUtil;
  * @author Andrzej Bialecki
  */
 public class FreeGenerator extends Configured implements Tool {
-  private static final Log LOG = LogFactory.getLog(FreeGenerator.class);
+  private static final Logger LOG = LoggerFactory.getLogger(FreeGenerator.class);
   
   private static final String FILTER_KEY = "free.generator.filter";
   private static final String NORMALIZE_KEY = "free.generator.normalize";
@@ -153,7 +153,7 @@ public class FreeGenerator extends Confi
         } else if (args[i].equals("-normalize")) {
           normalize = true;
         } else {
-          LOG.fatal("Unknown argument: " + args[i] + ", exiting ...");
+          LOG.error("Unknown argument: " + args[i] + ", exiting ...");
           return -1;
         }
       }
@@ -184,7 +184,7 @@ public class FreeGenerator extends Confi
     try {
       JobClient.runJob(job);
     } catch (Exception e) {
-      LOG.fatal("FAILED: " + StringUtils.stringifyException(e));
+      LOG.error("FAILED: " + StringUtils.stringifyException(e));
       return -1;
     }
     long end = System.currentTimeMillis();

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/ResolveUrls.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/ResolveUrls.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/ResolveUrls.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/ResolveUrls.java Thu Sep 22 15:10:44 2011
@@ -33,8 +33,8 @@ import org.apache.commons.cli.HelpFormat
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.nutch.util.URLUtil;
 
@@ -46,7 +46,7 @@ import org.apache.nutch.util.URLUtil;
  */
 public class ResolveUrls {
 
-  public static final Log LOG = LogFactory.getLog(ResolveUrls.class);
+  public static final Logger LOG = LoggerFactory.getLogger(ResolveUrls.class);
 
   private String urlsFile = null;
   private int numThreads = 100;
@@ -193,7 +193,7 @@ public class ResolveUrls {
       resolve.resolveUrls();
     }
     catch (Exception e) {
-      LOG.fatal("ResolveUrls: " + StringUtils.stringifyException(e));
+      LOG.error("ResolveUrls: " + StringUtils.stringifyException(e));
     }
   }
 

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
@@ -50,7 +50,7 @@ import org.apache.hadoop.util.StringUtil
 public class ArcRecordReader
   implements RecordReader<Text, BytesWritable> {
 
-  public static final Log LOG = LogFactory.getLog(ArcRecordReader.class);
+  public static final Logger LOG = LoggerFactory.getLogger(ArcRecordReader.class);
 
   protected Configuration conf;
   protected long splitStart = 0;

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map.Entry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.Path;
@@ -73,7 +73,7 @@ public class ArcSegmentCreator
   extends Configured
   implements Tool, Mapper<Text, BytesWritable, Text, NutchWritable> {
 
-  public static final Log LOG = LogFactory.getLog(ArcSegmentCreator.class);
+  public static final Logger LOG = LoggerFactory.getLogger(ArcSegmentCreator.class);
   public static final String URL_VERSION = "arc.url.version";
   private JobConf jobConf;
   private URLFilters urlFilters;
@@ -233,8 +233,8 @@ public class ArcSegmentCreator
         }
       }
       catch (IOException e) {
-        if (LOG.isFatalEnabled()) {
-          LOG.fatal("ArcSegmentCreator caught:" + StringUtils.stringifyException(e));
+        if (LOG.isErrorEnabled()) {
+          LOG.error("ArcSegmentCreator caught:" + StringUtils.stringifyException(e));
         }
       }
 
@@ -398,7 +398,7 @@ public class ArcSegmentCreator
       return 0;
     }
     catch (Exception e) {
-      LOG.fatal("ArcSegmentCreator: " + StringUtils.stringifyException(e));
+      LOG.error("ArcSegmentCreator: " + StringUtils.stringifyException(e));
       return -1;
     }
   }

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java Thu Sep 22 15:10:44 2011
@@ -26,12 +26,12 @@ import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.mortbay.jetty.Request;
 
 public class LogDebugHandler extends AbstractTestbedHandler implements Filter {
-  private static final Log LOG = LogFactory.getLog(LogDebugHandler.class);
+  private static final Logger LOG = LoggerFactory.getLogger(LogDebugHandler.class);
 
   @Override
   public void handle(Request req, HttpServletResponse res, String target,

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/SegmentHandler.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/SegmentHandler.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/SegmentHandler.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/SegmentHandler.java Thu Sep 22 15:10:44 2011
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileUtil;
@@ -52,7 +52,7 @@ import org.mortbay.jetty.Request;
  * XXX should turn this into a plugin?
  */
 public class SegmentHandler extends AbstractTestbedHandler {
-  private static final Log LOG = LogFactory.getLog(SegmentHandler.class);
+  private static final Logger LOG = LoggerFactory.getLogger(SegmentHandler.class);
   private Segment seg;
   
   private static HashMap<Integer,Integer> protoCodes = new HashMap<Integer,Integer>();

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
@@ -37,7 +37,7 @@ import org.mortbay.jetty.servlet.Servlet
 import org.mortbay.proxy.AsyncProxyServlet;
 
 public class TestbedProxy {
-  private static final Log LOG = LogFactory.getLog(TestbedProxy.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TestbedProxy.class);
 
   /**
    * @param args
@@ -84,7 +84,7 @@ public class TestbedProxy {
       } else if (args[i].equals("-seg")) {
         segs.add(new Path(args[++i]));
       } else {
-        LOG.fatal("Unknown argument: " + args[i]);
+        LOG.error("Unknown argument: " + args[i]);
         System.exit(-1);
       }
     }

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DeflateUtils.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DeflateUtils.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DeflateUtils.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DeflateUtils.java Thu Sep 22 15:10:44 2011
@@ -24,15 +24,15 @@ import java.util.zip.InflaterInputStream
 import java.util.zip.DeflaterOutputStream;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *  A collection of utility methods for working on deflated data.
  */
 public class DeflateUtils {
   
-  private static final Log LOG = LogFactory.getLog(DeflateUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DeflateUtils.class);
   private static final int EXPECTED_COMPRESSION_RATIO = 5;
   private static final int BUF_SIZE = 4096;
 

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DomUtil.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DomUtil.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DomUtil.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DomUtil.java Thu Sep 22 15:10:44 2011
@@ -35,13 +35,13 @@ import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 public class DomUtil {
 
-  private final static Log LOG = LogFactory.getLog(DomUtil.class);
+  private final static Logger LOG = LoggerFactory.getLogger(DomUtil.class);
 
   /**
    * Returns parsed dom tree or null if any error

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/EncodingDetector.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/EncodingDetector.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/EncodingDetector.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/EncodingDetector.java Thu Sep 22 15:10:44 2011
@@ -26,8 +26,8 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.nutch.metadata.Metadata;
 import org.apache.nutch.net.protocols.Response;
@@ -104,7 +104,7 @@ public class EncodingDetector {
     }
   }
 
-  public static final Log LOG = LogFactory.getLog(EncodingDetector.class);
+  public static final Logger LOG = LoggerFactory.getLogger(EncodingDetector.class);
 
   public static final int NO_THRESHOLD = -1;
 

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/GZIPUtils.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/GZIPUtils.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/GZIPUtils.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/GZIPUtils.java Thu Sep 22 15:10:44 2011
@@ -24,15 +24,15 @@ import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *  A collection of utility methods for working on GZIPed data.
  */
 public class GZIPUtils {
   
-  private static final Log LOG = LogFactory.getLog(GZIPUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GZIPUtils.class);
   private static final int EXPECTED_COMPRESSION_RATIO= 5;
   private static final int BUF_SIZE= 4096;
 

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/LogUtil.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/LogUtil.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/LogUtil.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/LogUtil.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.io.PrintStream;
 import java.lang.reflect.Method;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -34,7 +34,7 @@ import org.apache.commons.logging.LogFac
  */
 public class LogUtil {
 
-  private final static Log LOG = LogFactory.getLog(LogUtil.class);
+  private final static Logger LOG = LoggerFactory.getLogger(LogUtil.class);
 
   private static Method TRACE = null;
   private static Method DEBUG = null;
@@ -45,12 +45,12 @@ public class LogUtil {
 
   static {
     try {
-      TRACE = Log.class.getMethod("trace", new Class[] { Object.class });
-      DEBUG = Log.class.getMethod("debug", new Class[] { Object.class });
-      INFO  = Log.class.getMethod("info",  new Class[] { Object.class });
-      WARN  = Log.class.getMethod("warn",  new Class[] { Object.class });
-      ERROR = Log.class.getMethod("error", new Class[] { Object.class });
-      FATAL = Log.class.getMethod("fatal", new Class[] { Object.class });
+      TRACE = Logger.class.getMethod("trace", new Class[] { Object.class });
+      DEBUG = Logger.class.getMethod("debug", new Class[] { Object.class });
+      INFO  = Logger.class.getMethod("info",  new Class[] { Object.class });
+      WARN  = Logger.class.getMethod("warn",  new Class[] { Object.class });
+      ERROR = Logger.class.getMethod("error", new Class[] { Object.class });
+      FATAL = Logger.class.getMethod("error", new Class[] { Object.class });
     } catch(Exception e) {
       if (LOG.isErrorEnabled()) {
         LOG.error("Cannot init log methods", e);
@@ -59,32 +59,32 @@ public class LogUtil {
   }
   
   
-  public static PrintStream getTraceStream(final Log logger) {
+  public static PrintStream getTraceStream(final Logger logger) {
     return getLogStream(logger, TRACE);
   }
 
-  public static PrintStream getDebugStream(final Log logger) {
+  public static PrintStream getDebugStream(final Logger logger) {
     return getLogStream(logger, DEBUG);
   }
 
-  public static PrintStream getInfoStream(final Log logger) {
+  public static PrintStream getInfoStream(final Logger logger) {
     return getLogStream(logger, INFO);
   }
   
-  public static PrintStream getWarnStream(final Log logger) {
+  public static PrintStream getWarnStream(final Logger logger) {
     return getLogStream(logger, WARN);
   }
 
-  public static PrintStream getErrorStream(final Log logger) {
+  public static PrintStream getErrorStream(final Logger logger) {
     return getLogStream(logger, ERROR);
   }
 
-  public static PrintStream getFatalStream(final Log logger) {
+  public static PrintStream getFatalStream(final Logger logger) {
     return getLogStream(logger, FATAL);
   }
   
   /** Returns a stream that, when written to, adds log lines. */
-  private static PrintStream getLogStream(final Log logger, final Method method) {
+  private static PrintStream getLogStream(final Logger logger, final Method method) {
     return new PrintStream(new ByteArrayOutputStream() {
         private int scan = 0;
 
@@ -102,8 +102,8 @@ public class LogUtil {
           try {
             method.invoke(logger, new Object[] { toString().trim() });
           } catch (Exception e) {
-            if (LOG.isFatalEnabled()) {
-              LOG.fatal("Cannot log with method [" + method + "]", e);
+            if (LOG.isErrorEnabled()) {
+              LOG.error("Cannot log with method [" + method + "]", e);
             }
           }
           reset();

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/ObjectCache.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/ObjectCache.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/ObjectCache.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/ObjectCache.java Thu Sep 22 15:10:44 2011
@@ -19,13 +19,13 @@ package org.apache.nutch.util;
 import java.util.HashMap;
 import java.util.WeakHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 
 public class ObjectCache {
   
-  private static final Log LOG = LogFactory.getLog(ObjectCache.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ObjectCache.class);
   
   private static final WeakHashMap<Configuration, ObjectCache> CACHE = 
     new WeakHashMap<Configuration, ObjectCache>();

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainStatistics.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainStatistics.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainStatistics.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainStatistics.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.net.URL;
 import java.text.SimpleDateFormat;
 import java.util.Iterator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
@@ -55,7 +55,7 @@ extends MapReduceBase
 implements Tool, Mapper<Text, CrawlDatum, Text, LongWritable>,
            Reducer<Text, LongWritable, LongWritable, Text> {
 
-  private static final Log LOG = LogFactory.getLog(DomainStatistics.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DomainStatistics.class);
   
   private static final Text FETCHED_TEXT = new Text("FETCHED");
   private static final Text NOT_FETCHED_TEXT = new Text("NOT_FETCHED");

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixes.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixes.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixes.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixes.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ package org.apache.nutch.util.domain;
 import java.io.InputStream;
 import java.util.HashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.util.StringUtils;
 
 /**
@@ -30,7 +30,7 @@ import org.apache.hadoop.util.StringUtil
  * @author Enis Soztutar &lt;enis.soz.nutch@gmail.com&gt;
  */
 public class DomainSuffixes {
-  private static final Log LOG = LogFactory.getLog(DomainSuffixes.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DomainSuffixes.class);
   
   private HashMap<String, DomainSuffix> domains = new HashMap<String, DomainSuffix>(); 
   

Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import javax.xml.parsers.DocumentBuilder
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.util.StringUtils;
 import org.apache.nutch.util.domain.DomainSuffix.Status;
 import org.apache.nutch.util.domain.TopLevelDomain.Type;
@@ -43,7 +43,7 @@ import org.xml.sax.SAXException;
  */
 class DomainSuffixesReader {
 
-  private static final Log LOG = LogFactory.getLog(DomainSuffixesReader.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DomainSuffixesReader.class);
 
   void read(DomainSuffixes tldEntries, InputStream input) throws IOException{
     try {

Modified: nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -32,8 +32,8 @@ import org.apache.nutch.metadata.Metadat
 
 import org.apache.hadoop.conf.Configuration;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.net.URL;
@@ -41,7 +41,7 @@ import java.net.MalformedURLException;
 
 /** Adds basic searchable fields to a document. */
 public class CCIndexingFilter implements IndexingFilter {
-  public static final Log LOG = LogFactory.getLog(CCIndexingFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(CCIndexingFilter.class);
 
   /** The name of the document field we use. */
   public static String FIELD = "cc";

Modified: nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import org.apache.nutch.metadata.Metadat
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.*;
 import java.io.*;
@@ -37,7 +37,7 @@ import org.w3c.dom.*;
 
 /** Adds metadata identifying the Creative Commons license used, if any. */
 public class CCParseFilter implements HtmlParseFilter {
-  public static final Log LOG = LogFactory.getLog(CCParseFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(CCParseFilter.class);
 
 
   /** Walks DOM tree, looking for RDF in comments and licenses in anchors.*/

Modified: nutch/branches/branch-1.4/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java Thu Sep 22 15:10:44 2011
@@ -27,11 +27,12 @@ import java.util.List;
 import java.util.Map.Entry;
 
 // APACHE imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.util.StringUtils;
+// import org.apache.nutch.indexer.anchor.AnchorIndexingFilter; removed as per NUTCH-1078
 import org.apache.nutch.metadata.Feed;
 import org.apache.nutch.metadata.Metadata;
 import org.apache.nutch.net.URLFilters;
@@ -78,8 +79,7 @@ public class FeedParser implements Parse
   public static final String TEXT_PLAIN_CONTENT_TYPE = "text/plain; "
       + CHARSET_UTF8;
 
-  public static final Log LOG = LogFactory
-      .getLog("org.apache.nutch.parse.feed");
+  public static final Logger LOG = LoggerFactory.getLogger(FeedParser.class);
 
   private Configuration conf;
 

Modified: nutch/branches/branch-1.4/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.Iterator;
 import java.util.Map;
 
 // APACHE imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.nutch.crawl.CrawlDatum;
@@ -59,7 +59,7 @@ public class TestFeedParser extends Test
 
   private String[] sampleFiles = { "rsstest.rss" };
 
-  public static final Log LOG = LogFactory.getLog(TestFeedParser.class
+  public static final Logger LOG = LoggerFactory.getLogger(TestFeedParser.class
       .getName());
 
   /**

Modified: nutch/branches/branch-1.4/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -18,8 +18,8 @@ package org.apache.nutch.indexer.anchor;
 
 import java.util.WeakHashMap;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.nutch.crawl.CrawlDatum;
@@ -35,7 +35,7 @@ import org.apache.nutch.parse.Parse;
 public class AnchorIndexingFilter
   implements IndexingFilter {
 
-  public static final Log LOG = LogFactory.getLog(AnchorIndexingFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(AnchorIndexingFilter.class);
   private Configuration conf;
   private boolean deduplicate = false;
 

Modified: nutch/branches/branch-1.4/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
 
 package org.apache.nutch.indexer.basic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.metadata.Nutch;
 import org.apache.nutch.parse.Parse;
@@ -39,7 +39,7 @@ import org.apache.hadoop.conf.Configurat
 
 /** Adds basic searchable fields to a document. */
 public class BasicIndexingFilter implements IndexingFilter {
-  public static final Log LOG = LogFactory.getLog(BasicIndexingFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(BasicIndexingFilter.class);
 
   private int MAX_TITLE_LENGTH;
   private int MAX_CONTENT_LENGTH;

Modified: nutch/branches/branch-1.4/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -25,8 +25,8 @@ import org.apache.oro.text.regex.MatchRe
 import org.apache.oro.text.regex.MalformedPatternException;
 import org.apache.tika.mime.MimeType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.metadata.Metadata;
 
@@ -69,7 +69,7 @@ import org.apache.commons.lang.time.Date
  */
 
 public class MoreIndexingFilter implements IndexingFilter {
-  public static final Log LOG = LogFactory.getLog(MoreIndexingFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(MoreIndexingFilter.class);
 
   /** A flag that tells if magic resolution must be performed */
   private boolean MAGIC;

Modified: nutch/branches/branch-1.4/src/plugin/index-static/src/java/org/apache/nutch/indexer/staticfield/StaticFieldIndexer.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/index-static/src/java/org/apache/nutch/indexer/staticfield/StaticFieldIndexer.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/index-static/src/java/org/apache/nutch/indexer/staticfield/StaticFieldIndexer.java (original)
+++ nutch/branches/branch-1.4/src/plugin/index-static/src/java/org/apache/nutch/indexer/staticfield/StaticFieldIndexer.java Thu Sep 22 15:10:44 2011
@@ -20,6 +20,8 @@ package org.apache.nutch.indexer.staticf
 import java.util.HashMap;
 import java.util.Map.Entry;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.nutch.crawl.CrawlDatum;
 import org.apache.nutch.crawl.Inlinks;
 import org.apache.nutch.indexer.IndexingFilter;

Modified: nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java (original)
+++ nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.net.URL;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Nutch imports
 import org.apache.nutch.crawl.CrawlDatum;
@@ -78,10 +78,10 @@ public abstract class HttpBase implement
   protected String acceptLanguage = "en-us,en-gb,en;q=0.7,*;q=0.3";
     
   /** The default logger */
-  private final static Log LOGGER = LogFactory.getLog(HttpBase.class);
+  private final static Logger LOGGER = LoggerFactory.getLogger(HttpBase.class);
 
   /** The specified logger */
-  private Log logger = LOGGER;
+  private Logger logger = LOGGER;
  
   /** The nutch configuration */
   private Configuration conf = null;
@@ -98,7 +98,7 @@ public abstract class HttpBase implement
   }
   
   /** Creates a new instance of HttpBase */
-  public HttpBase(Log logger) {
+  public HttpBase(Logger logger) {
     if (logger != null) {
       this.logger = logger;
     }
@@ -247,8 +247,8 @@ public abstract class HttpBase implement
     
     if ( (agentName == null) || (agentName.trim().length() == 0) ) {
       // TODO : NUTCH-258
-      if (LOGGER.isFatalEnabled()) {
-        LOGGER.fatal("No User-Agent string set (http.agent.name)!");
+      if (LOGGER.isErrorEnabled()) {
+        LOGGER.error("No User-Agent string set (http.agent.name)!");
       }
     }
     

Modified: nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java Thu Sep 22 15:10:44 2011
@@ -29,8 +29,8 @@ import java.util.Hashtable;
 import java.util.StringTokenizer;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 // Nutch imports
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configurable;
@@ -52,7 +52,7 @@ import org.apache.nutch.protocol.RobotRu
  */
 public class RobotRulesParser implements Configurable {
   
-  public static final Log LOG = LogFactory.getLog(RobotRulesParser.class);
+  public static final Logger LOG = LoggerFactory.getLogger(RobotRulesParser.class);
 
   private boolean allowForbidden = false;
 

Modified: nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java (original)
+++ nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.ArrayList;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Hadoop imports
 import org.apache.hadoop.conf.Configuration;
@@ -58,7 +58,7 @@ import org.apache.nutch.net.*;
 public abstract class RegexURLFilterBase implements URLFilter {
 
   /** My logger */
-  private final static Log LOG = LogFactory.getLog(RegexURLFilterBase.class);
+  private final static Logger LOG = LoggerFactory.getLogger(RegexURLFilterBase.class);
 
   /** An array of applicable rules */
   private RegexRule[] rules;

Modified: nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java (original)
+++ nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,8 @@ import java.util.List;
 import junit.framework.TestCase;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Nutch imports
 import org.apache.nutch.net.URLFilter;
@@ -43,7 +43,7 @@ import org.apache.nutch.net.URLFilter;
 public abstract class RegexURLFilterBaseTest extends TestCase {
   
   /** My logger */
-  protected static final Log LOG = LogFactory.getLog(RegexURLFilterBaseTest.class);  
+  protected static final Logger LOG = LoggerFactory.getLogger(RegexURLFilterBaseTest.class);  
 
   private final static String SEPARATOR = System.getProperty("file.separator");  
   private final static String SAMPLES = System.getProperty("test.data", ".");

Modified: nutch/branches/branch-1.4/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,8 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Nutch imports
 import org.apache.nutch.metadata.Metadata;
@@ -54,7 +54,7 @@ import org.apache.hadoop.io.Text;
  */
 public class RelTagParser implements HtmlParseFilter {
   
-  public final static Log LOG = LogFactory.getLog(RelTagParser.class);
+  public final static Logger LOG = LoggerFactory.getLogger(RelTagParser.class);
 
   public final static String REL_TAG = "Rel-Tag";
   

Modified: nutch/branches/branch-1.4/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java Thu Sep 22 15:10:44 2011
@@ -35,8 +35,8 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.nutch.plugin.Extension;
 import org.apache.nutch.plugin.PluginRepository;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.Hashtable;
 
@@ -52,7 +52,7 @@ import java.nio.charset.Charset;
 
 public class ExtParser implements Parser {
 
-  public static final Log LOG = LogFactory.getLog("org.apache.nutch.parse.ext");
+  public static final Logger LOG = LoggerFactory.getLogger("org.apache.nutch.parse.ext");
 
   static final int BUFFER_SIZE = 4096;
 

Modified: nutch/branches/branch-1.4/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java Thu Sep 22 15:10:44 2011
@@ -31,8 +31,8 @@ import org.xml.sax.SAXException;
 import org.w3c.dom.*;
 import org.apache.html.dom.*;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.metadata.Metadata;
 import org.apache.nutch.metadata.Nutch;
@@ -42,7 +42,7 @@ import org.apache.nutch.parse.*;
 import org.apache.nutch.util.*;
 
 public class HtmlParser implements Parser {
-  public static final Log LOG = LogFactory.getLog("org.apache.nutch.parse.html");
+  public static final Logger LOG = LoggerFactory.getLogger("org.apache.nutch.parse.html");
 
   // I used 1000 bytes at first, but  found that some documents have 
   // meta tag well past the first 1000 bytes. 

Modified: nutch/branches/branch-1.4/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java Thu Sep 22 15:10:44 2011
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.parse.HTMLMetaTags;
 import org.apache.nutch.parse.HtmlParseFilter;
@@ -65,7 +65,7 @@ import org.w3c.dom.NodeList;
  * @author Andrzej Bialecki &lt;ab@getopt.org&gt;
  */
 public class JSParseFilter implements HtmlParseFilter, Parser {
-  public static final Log LOG = LogFactory.getLog(JSParseFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(JSParseFilter.class);
 
   private static final int MAX_TITLE_LEN = 80;
 

Modified: nutch/branches/branch-1.4/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.*;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.metadata.Metadata;
 import org.apache.nutch.net.protocols.Response;
@@ -47,7 +47,7 @@ import com.anotherbigidea.io.InStream;
  * @author Andrzej Bialecki
  */
 public class SWFParser implements Parser {
-  public static final Log LOG = LogFactory.getLog("org.apache.nutch.parse.swf");
+  public static final Logger LOG = LoggerFactory.getLogger("org.apache.nutch.parse.swf");
 
   private Configuration conf = null;
 

Modified: nutch/branches/branch-1.4/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.html.dom.HTMLDocumentImpl;
 import org.apache.nutch.metadata.Nutch;
@@ -50,7 +50,7 @@ import org.w3c.dom.DocumentFragment;
 
 public class TikaParser implements org.apache.nutch.parse.Parser {
 
-	public static final Log LOG = LogFactory.getLog(TikaParser.class);
+	public static final Logger LOG = LoggerFactory.getLogger(TikaParser.class);
 
 	private Configuration conf;
 	private TikaConfig tikaConfig = null;

Modified: nutch/branches/branch-1.4/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java Thu Sep 22 15:10:44 2011
@@ -19,8 +19,8 @@ package org.apache.nutch.tika;
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.nutch.crawl.CrawlDatum;
@@ -52,7 +52,7 @@ public class TestFeedParser extends Test
 
 	private String[] sampleFiles = { "rsstest.rss" };
 
-	public static final Log LOG = LogFactory.getLog(TestFeedParser.class
+	public static final Logger LOG = LoggerFactory.getLogger(TestFeedParser.class
 			.getName());
 
 	/**

Modified: nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.util.Properties;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.metadata.Metadata;
 import org.apache.nutch.net.protocols.Response;
@@ -45,7 +45,7 @@ import org.apache.hadoop.conf.Configurat
  */
 public class ZipParser implements Parser {
 
-  private static final Log LOG = LogFactory.getLog(ZipParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ZipParser.class);
   private Configuration conf;
 
   /** Creates a new instance of ZipParser */

Modified: nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java (original)
+++ nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java Thu Sep 22 15:10:44 2011
@@ -26,8 +26,8 @@ import java.util.zip.ZipInputStream;
 import java.net.URL;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Hadoop imports
 import org.apache.hadoop.conf.Configuration;
@@ -55,7 +55,7 @@ public class ZipTextExtractor {
   /** Get the MimeTypes resolver instance. */
   private MimeUtil MIME;
   
-  public static final Log LOG = LogFactory.getLog(ZipTextExtractor.class);
+  public static final Logger LOG = LoggerFactory.getLogger(ZipTextExtractor.class);
 
   private Configuration conf;
   

Modified: nutch/branches/branch-1.4/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
 
 package org.apache.nutch.protocol.file;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.crawl.CrawlDatum;
 import org.apache.hadoop.io.Text;
@@ -48,7 +48,7 @@ import java.net.URL;
  ***********************************/
 public class File implements Protocol {
 
-  public static final Log LOG = LogFactory.getLog(File.class);
+  public static final Logger LOG = LoggerFactory.getLogger(File.class);
 
   static final int MAX_REDIRECTS = 5;
 

Modified: nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
 
 package org.apache.nutch.protocol.ftp;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.commons.net.ftp.FTPFileEntryParser;
 
@@ -50,7 +50,7 @@ import java.io.IOException;
  ***********************************/
 public class Ftp implements Protocol {
 
-  public static final Log LOG = LogFactory.getLog(Ftp.class);
+  public static final Logger LOG = LoggerFactory.getLogger(Ftp.class);
 
   static final int BUFFER_SIZE = 16384; // 16*1024 = 16384
 

Modified: nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java Thu Sep 22 15:10:44 2011
@@ -21,7 +21,7 @@ import java.io.BufferedReader;
 import java.io.StringReader;
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 import org.apache.commons.net.ProtocolCommandEvent;
 import org.apache.commons.net.ProtocolCommandListener;
@@ -33,9 +33,9 @@ import org.apache.commons.net.ProtocolCo
  ***/
 public class PrintCommandListener implements ProtocolCommandListener
 {
-    private Log __logger;
+    private Logger __logger;
 
-    public PrintCommandListener(Log logger)
+    public PrintCommandListener(Logger logger)
     {
         __logger = logger;
     }

Modified: nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.io.IOException;
 import java.net.URL;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Hadoop imports
 import org.apache.hadoop.conf.Configuration;
@@ -37,7 +37,7 @@ import org.apache.nutch.util.NutchConfig
 
 public class Http extends HttpBase {
 
-  public static final Log LOG = LogFactory.getLog(Http.class);
+  public static final Logger LOG = LoggerFactory.getLogger(Http.class);
 
 
   public Http() {

Modified: nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java Thu Sep 22 15:10:44 2011
@@ -117,7 +117,7 @@ public class HttpResponse implements Res
 
       String userAgent = http.getUserAgent();
       if ((userAgent == null) || (userAgent.length() == 0)) {
-        if (Http.LOG.isFatalEnabled()) { Http.LOG.fatal("User-agent is not set!"); }
+        if (Http.LOG.isErrorEnabled()) { Http.LOG.error("User-agent is not set!"); }
       } else {
         reqStr.append("User-Agent: ");
         reqStr.append(userAgent);

Modified: nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java Thu Sep 22 15:10:44 2011
@@ -35,16 +35,16 @@ import org.apache.commons.httpclient.Htt
 import org.apache.commons.httpclient.params.HttpConnectionParams;
 import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
 import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 
 public class DummySSLProtocolSocketFactory implements SecureProtocolSocketFactory {
 
-  /** Log object for this class. */
-  private static final Log LOG = LogFactory.getLog(DummySSLProtocolSocketFactory.class);
+  /** Logger object for this class. */
+  private static final Logger LOG = LoggerFactory.getLogger(DummySSLProtocolSocketFactory.class);
 
   private SSLContext sslcontext = null;
 

Modified: nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java Thu Sep 22 15:10:44 2011
@@ -29,15 +29,15 @@ import java.security.cert.X509Certificat
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-import org.apache.commons.logging.Log; 
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger; 
+import org.slf4j.LoggerFactory;
 
 public class DummyX509TrustManager implements X509TrustManager
 {
     private X509TrustManager standardTrustManager = null;
 
-    /** Log object for this class. */
-    private static final Log LOG = LogFactory.getLog(DummyX509TrustManager.class);
+    /** Logger object for this class. */
+    private static final Logger LOG = LoggerFactory.getLogger(DummyX509TrustManager.class);
 
     /**
      * Constructor for DummyX509TrustManager.

Modified: nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java Thu Sep 22 15:10:44 2011
@@ -30,8 +30,8 @@ import org.w3c.dom.NodeList;
 import org.w3c.dom.Node;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // HTTP Client imports
 import org.apache.commons.httpclient.Header;
@@ -62,7 +62,7 @@ import org.apache.nutch.util.NutchConfig
  */
 public class Http extends HttpBase {
 
-  public static final Log LOG = LogFactory.getLog(Http.class);
+  public static final Logger LOG = LoggerFactory.getLogger(Http.class);
 
   private static MultiThreadedHttpConnectionManager connectionManager =
           new MultiThreadedHttpConnectionManager();
@@ -121,8 +121,8 @@ public class Http extends HttpBase {
     try {
       setCredentials();
     } catch (Exception ex) {
-      if (LOG.isFatalEnabled()) {
-        LOG.fatal("Could not read " + authFile + " : " + ex.getMessage());
+      if (LOG.isErrorEnabled()) {
+        LOG.error("Could not read " + authFile + " : " + ex.getMessage());
         ex.printStackTrace(LogUtil.getErrorStream(LOG));
       }
     }

Modified: nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.TreeMap;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Hadoop imports
 import org.apache.hadoop.conf.Configuration;
@@ -56,7 +56,7 @@ public class HttpAuthenticationFactory i
      */
     public static final String WWW_AUTHENTICATE = "WWW-Authenticate";
 	
-    public static final Log LOG = LogFactory.getLog(HttpAuthenticationFactory.class);
+    public static final Logger LOG = LoggerFactory.getLogger(HttpAuthenticationFactory.class);
 
     private static Map auths = new TreeMap(); 
 

Modified: nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,8 @@ import java.util.regex.Pattern;
 import org.apache.commons.codec.binary.Base64;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Hadoop imports
 import org.apache.hadoop.conf.Configuration;
@@ -46,7 +46,7 @@ import org.apache.hadoop.conf.Configurab
  */
 public class HttpBasicAuthentication implements HttpAuthentication, Configurable {
 
-    public static final Log LOG = LogFactory.getLog(HttpBasicAuthentication.class);
+    public static final Logger LOG = LoggerFactory.getLogger(HttpBasicAuthentication.class);
 
     private static Pattern basic = Pattern.compile("[bB][aA][sS][iI][cC] [rR][eE][aA][lL][mM]=\"(\\w*)\"");
 	

Modified: nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java (original)
+++ nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java Thu Sep 22 15:10:44 2011
@@ -170,9 +170,9 @@ public class HttpResponse implements Res
         }
       }
 
-      // Log trace message
+      // Logger trace message
       if (Http.LOG.isTraceEnabled()) {
-        Http.LOG.trace(fetchTrace);
+        Http.LOG.trace(fetchTrace.toString());
       }
     } finally {
       get.releaseConnection();

Modified: nutch/branches/branch-1.4/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import java.util.List;
 import java.util.Map.Entry;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
@@ -52,7 +52,7 @@ import org.apache.nutch.util.LogUtil;
  */
 public class OPICScoringFilter implements ScoringFilter {
 
-  private final static Log LOG = LogFactory.getLog(OPICScoringFilter.class);
+  private final static Logger LOG = LoggerFactory.getLogger(OPICScoringFilter.class);
 
   private Configuration conf;
   private float scoreInjected;

Modified: nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java (original)
+++ nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java Thu Sep 22 15:10:44 2011
@@ -30,8 +30,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
@@ -48,7 +48,7 @@ public class CollectionManager extends C
 
   public static final String DEFAULT_FILE_NAME = "subcollections.xml";
 
-  static final Log LOG = LogFactory.getLog(CollectionManager.class);
+  static final Logger LOG = LoggerFactory.getLogger(CollectionManager.class);
 
   transient Map collectionMap = new HashMap();
 

Modified: nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.io.Text;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.nutch.parse.Parse;
 import org.apache.nutch.util.NutchConfiguration;
@@ -53,7 +53,7 @@ public class SubcollectionIndexingFilter
   /**
    * Logger
    */
-  public static final Log LOG = LogFactory.getLog(SubcollectionIndexingFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(SubcollectionIndexingFilter.class);
 
   /**
    * "Mark" document to be a part of subcollection

Modified: nutch/branches/branch-1.4/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -19,8 +19,8 @@ package org.apache.nutch.indexer.tld;
 
 import java.net.URL;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.nutch.crawl.CrawlDatum;
@@ -37,7 +37,7 @@ import org.apache.nutch.util.domain.Doma
  * @author Enis Soztutar &lt;enis.soz.nutch@gmail.com&gt;
  */
 public class TLDIndexingFilter implements IndexingFilter {
-  public static final Log LOG = LogFactory.getLog(TLDIndexingFilter.class);
+  public static final Logger LOG = LoggerFactory.getLogger(TLDIndexingFilter.class);
 
   private Configuration conf;
 
@@ -51,7 +51,7 @@ public class TLDIndexingFilter implement
       doc.add("tld", d.getDomain());
       
     }catch (Exception ex) {
-      LOG.warn(ex);
+      LOG.warn(ex.toString());
     }
 
     return doc;

Modified: nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java Thu Sep 22 15:10:44 2011
@@ -25,8 +25,8 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.nutch.net.URLFilter;
 import org.apache.nutch.plugin.Extension;
@@ -63,7 +63,7 @@ import org.apache.nutch.util.domain.Doma
 public class DomainURLFilter
   implements URLFilter {
 
-  private static final Log LOG = LogFactory.getLog(DomainURLFilter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DomainURLFilter.class);
 
   // read in attribute "file" of this plugin.
   private static String attributeFile = null;

Modified: nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java Thu Sep 22 15:10:44 2011
@@ -18,15 +18,15 @@ package org.apache.nutch.urlfilter.domai
 
 import junit.framework.TestCase;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.nutch.util.NutchConfiguration;
 
 public class TestDomainURLFilter
   extends TestCase {
 
-  protected static final Log LOG = LogFactory.getLog(TestDomainURLFilter.class);
+  protected static final Logger LOG = LoggerFactory.getLogger(TestDomainURLFilter.class);
 
   private final static String SEPARATOR = System.getProperty("file.separator");
   private final static String SAMPLES = System.getProperty("test.data", ".");

Modified: nutch/branches/branch-1.4/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java Thu Sep 22 15:10:44 2011
@@ -19,8 +19,8 @@
 
 package org.apache.nutch.urlfilter.prefix;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.nutch.net.*;
@@ -51,7 +51,7 @@ import java.util.ArrayList;
  */
 public class PrefixURLFilter implements URLFilter {
 
-  private static final Log LOG = LogFactory.getLog(PrefixURLFilter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(PrefixURLFilter.class);
 
   // read in attribute "file" of this plugin.
   private static String attributeFile = null;
@@ -162,7 +162,7 @@ public class PrefixURLFilter implements 
       try {
         trie = readConfiguration(reader);
       } catch (IOException e) {
-        if (LOG.isFatalEnabled()) { LOG.fatal(e.getMessage()); }
+        if (LOG.isErrorEnabled()) { LOG.error(e.getMessage()); }
         // TODO mb@media-style.com: throw Exception? Because broken api.
         throw new RuntimeException(e.getMessage(), e);
       }

Modified: nutch/branches/branch-1.4/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java Thu Sep 22 15:10:44 2011
@@ -26,8 +26,8 @@ import org.apache.nutch.util.SuffixStrin
 import org.apache.nutch.plugin.Extension;
 import org.apache.nutch.plugin.PluginRepository;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.Reader;
 import java.io.FileReader;
@@ -123,7 +123,7 @@ import java.net.MalformedURLException;
  */
 public class SuffixURLFilter implements URLFilter {
 
-  private static final Log LOG = LogFactory.getLog(SuffixURLFilter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(SuffixURLFilter.class);
 
   // read in attribute "file" of this plugin.
   private String attributeFile = null;
@@ -283,7 +283,7 @@ public class SuffixURLFilter implements 
     try {
       readConfiguration(reader);
     } catch (IOException e) {
-      if (LOG.isFatalEnabled()) { LOG.fatal(e.getMessage()); }
+      if (LOG.isErrorEnabled()) { LOG.error(e.getMessage()); }
       throw new RuntimeException(e.getMessage(), e);
     }
   }

Modified: nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
 
 package org.apache.nutch.indexer.urlmeta;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.Text;
 import org.apache.nutch.crawl.CrawlDatum;
@@ -67,8 +67,8 @@ import org.apache.nutch.parse.Parse;
  */
 public class URLMetaIndexingFilter implements IndexingFilter {
 
-	private static final Log LOG = LogFactory
-			.getLog(URLMetaIndexingFilter.class);
+	private static final Logger LOG = LoggerFactory
+			.getLogger(URLMetaIndexingFilter.class);
 	private static final String CONF_PROPERTY = "urlmeta.tags";
 	private static String[] urlMetaTags;
 	private Configuration conf;
@@ -115,4 +115,4 @@ public class URLMetaIndexingFilter imple
 
 		urlMetaTags = conf.getStrings(CONF_PROPERTY);
 	}
-}
\ No newline at end of file
+}

Modified: nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.Map.Entry;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.io.Text;
@@ -43,7 +43,7 @@ import org.apache.nutch.scoring.ScoringF
  */
 public class URLMetaScoringFilter extends Configured implements ScoringFilter {
 
-  private static final Log LOG = LogFactory.getLog(URLMetaScoringFilter.class);
+  private static final Logger LOG = LoggerFactory.getLogger(URLMetaScoringFilter.class);
   private static final String CONF_PROPERTY = "urlmeta.tags";
   private static String[] urlMetaTags;
   private Configuration conf;

Modified: nutch/branches/branch-1.4/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java (original)
+++ nutch/branches/branch-1.4/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.net.URL;
 import java.net.MalformedURLException;
 
 // Commons Logging imports
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // Nutch imports
 import org.apache.nutch.net.URLNormalizer;
@@ -33,7 +33,7 @@ import org.apache.oro.text.regex.*;
 
 /** Converts URLs to a normal form . */
 public class BasicURLNormalizer implements URLNormalizer {
-    public static final Log LOG = LogFactory.getLog(BasicURLNormalizer.class);
+    public static final Logger LOG = LoggerFactory.getLogger(BasicURLNormalizer.class);
 
     private Perl5Compiler compiler = new Perl5Compiler();
     private ThreadLocal matchers = new ThreadLocal() {