Modified: nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java (original) +++ nutch/trunk/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java Tue Aug 10 08:45:52 2010 @@ -28,8 +28,8 @@ import java.util.HashMap; import java.util.Hashtable; import java.util.StringTokenizer; -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.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.net.protocols.Response; @@ -49,7 +49,7 @@ import org.apache.nutch.storage.WebPage; */ 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; @@ -238,13 +238,13 @@ public class RobotRulesParser implements // if (agents.size() == 0) { agents.add(agentName); - if (LOG.isFatalEnabled()) { - LOG.fatal("No agents listed in 'http.robots.agents' property!"); + if (LOG.isErrorEnabled()) { + LOG.error("No agents listed in 'http.robots.agents' property!"); } } else if (!(agents.get(0)).equalsIgnoreCase(agentName)) { agents.add(0, agentName); - if (LOG.isFatalEnabled()) { - LOG.fatal("Agent we advertise (" + agentName + if (LOG.isErrorEnabled()) { + LOG.error("Agent we advertise (" + agentName + ") not listed first in 'http.robots.agents' property!"); } }
Modified: nutch/trunk/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java (original) +++ nutch/trunk/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java Tue Aug 10 08:45:52 2010 @@ -26,8 +26,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; @@ -56,7 +56,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; @@ -135,12 +135,12 @@ public abstract class RegexURLFilterBase String file = getRulesFile(conf); Reader reader = conf.getConfResourceAsReader(file); if (reader == null) { - if (LOG.isFatalEnabled()) { LOG.fatal("Can't find resource: " + file); } + if (LOG.isErrorEnabled()) { LOG.error("Can't find resource: " + file); } } else { try { rules = readRulesFile(reader); } catch (IOException e) { - if (LOG.isFatalEnabled()) { LOG.fatal(e.getMessage()); } + if (LOG.isErrorEnabled()) { LOG.error(e.getMessage()); } //TODO [email protected]: throw Exception? Because broken api. throw new RuntimeException(e.getMessage(), e); } Modified: nutch/trunk/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java (original) +++ nutch/trunk/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java (original) +++ nutch/trunk/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java Tue Aug 10 08:45:52 2010 @@ -27,8 +27,8 @@ import java.util.Set; import java.util.TreeSet; import org.apache.avro.util.Utf8; -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.parse.HTMLMetaTags; import org.apache.nutch.parse.HtmlParseFilter; @@ -50,7 +50,7 @@ import org.w3c.dom.NodeList; */ 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/trunk/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java (original) +++ nutch/trunk/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java (original) +++ nutch/trunk/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java Tue Aug 10 08:45:52 2010 @@ -35,8 +35,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.avro.util.Utf8; -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.Metadata; @@ -62,7 +62,7 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; 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/trunk/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java (original) +++ nutch/trunk/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java Tue Aug 10 08:45:52 2010 @@ -27,8 +27,8 @@ import java.util.Arrays; import java.util.Collection; 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.parse.HTMLMetaTags; import org.apache.nutch.parse.HtmlParseFilter; @@ -63,7 +63,7 @@ import org.w3c.dom.NodeList; * @author Andrzej Bialecki <[email protected]> */ 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/trunk/src/plugin/parse-rss/src/java/org/apache/nutch/parse/rss/RSSParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-rss/src/java/org/apache/nutch/parse/rss/RSSParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-rss/src/java/org/apache/nutch/parse/rss/RSSParser.java (original) +++ nutch/trunk/src/plugin/parse-rss/src/java/org/apache/nutch/parse/rss/RSSParser.java Tue Aug 10 08:45:52 2010 @@ -29,8 +29,8 @@ import java.util.Vector; import org.apache.commons.feedparser.FeedParser; import org.apache.commons.feedparser.FeedParserFactory; import org.apache.commons.feedparser.FeedParserListener; -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.parse.Outlink; import org.apache.nutch.parse.Parse; @@ -55,7 +55,7 @@ import org.apache.nutch.util.NutchConfig * </p> */ public class RSSParser implements Parser { - public static final Log LOG = LogFactory.getLog("org.apache.nutch.parse.rss"); + public static final Logger LOG = LoggerFactory.getLogger("org.apache.nutch.parse.rss"); private Configuration conf; private static Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>(); Modified: nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java (original) +++ nutch/trunk/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java (original) +++ nutch/trunk/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java Tue Aug 10 08:45:52 2010 @@ -29,8 +29,8 @@ import java.util.Collection; import java.util.HashSet; import org.apache.avro.util.Utf8; -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.Bytes; import org.apache.html.dom.HTMLDocumentImpl; @@ -63,7 +63,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 static Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>(); Modified: nutch/trunk/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java (original) +++ nutch/trunk/src/plugin/parse-tika/src/test/org/apache/nutch/parse/tika/DOMContentUtilsTest.java Tue Aug 10 08:45:52 2010 @@ -29,10 +29,10 @@ import org.apache.nutch.util.NutchConfig import org.apache.tika.metadata.Metadata; import org.apache.tika.parser.ParseContext; import org.apache.tika.parser.Parser; -import org.apache.tika.parser.html.HtmlMapper; -// import org.apache.tika.parser.html.IdentityHtmlMapper; import org.apache.xml.serialize.DOMSerializerImpl; -import org.mortbay.log.Log; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.w3c.dom.DocumentFragment; import java.io.ByteArrayInputStream; @@ -196,6 +196,8 @@ public class DOMContentUtilsTest extends private static Configuration conf; private static DOMContentUtils utils = null; + + public static final Logger Logger = LoggerFactory.getLogger(DOMContentUtilsTest.class); public DOMContentUtilsTest(String name) { super(name); @@ -298,13 +300,13 @@ public class DOMContentUtilsTest extends while (st1.hasMoreTokens()) { if (!st2.hasMoreTokens()) { - Log.info("st1+ '" + st1.nextToken() + "'"); + Logger.info("st1+ '" + st1.nextToken() + "'"); return false; } String st1Token = st1.nextToken(); String st2Token = st2.nextToken(); if (!st1Token.equals(st2Token)) { - Log.info("st1:'" + st1Token + "' != st2:'" + st2Token + "'"); + Logger.info("st1:'" + st1Token + "' != st2:'" + st2Token + "'"); return false; } } Modified: nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java (original) +++ nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java (original) +++ nutch/trunk/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java (original) +++ nutch/trunk/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java Tue Aug 10 08:45:52 2010 @@ -21,8 +21,8 @@ import java.net.URL; import java.util.Collection; import java.util.HashSet; -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.protocols.Response; import org.apache.nutch.protocol.Content; @@ -47,7 +47,7 @@ import org.apache.nutch.util.NutchConfig ***********************************/ public class File implements Protocol { - public static final Log LOG = LogFactory.getLog(File.class); + public static final Logger LOG = LoggerFactory.getLogger(File.class); private static final Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>(); Modified: nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java (original) +++ nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java Tue Aug 10 08:45:52 2010 @@ -22,8 +22,8 @@ import java.net.URL; import java.util.Collection; import java.util.HashSet; -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; import org.apache.hadoop.conf.Configuration; import org.apache.nutch.net.protocols.Response; @@ -47,7 +47,7 @@ import org.apache.nutch.storage.WebPage; ***********************************/ public class Ftp implements Protocol { - public static final Log LOG = LogFactory.getLog(Ftp.class); + public static final Logger LOG = LoggerFactory.getLogger(Ftp.class); private static final Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>(); Modified: nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java (original) +++ nutch/trunk/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java (original) +++ nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java Tue Aug 10 08:45:52 2010 @@ -22,8 +22,8 @@ import java.net.URL; import java.util.Collection; import java.util.HashSet; -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.protocols.Response; import org.apache.nutch.protocol.ProtocolException; @@ -33,7 +33,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 final Collection<WebPage.Field> FIELDS = new HashSet<WebPage.Field>(); Modified: nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java (original) +++ nutch/trunk/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java Tue Aug 10 08:45:52 2010 @@ -112,7 +112,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/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java (original) +++ nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java (original) +++ nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java (original) +++ nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java Tue Aug 10 08:45:52 2010 @@ -33,8 +33,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; @@ -66,7 +66,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(); @@ -136,8 +136,8 @@ public class Http extends HttpBase { try { setCredentials(); } catch (Exception ex) { - if (LOG.isFatalEnabled()) { - LOG.fatal("Could not read " + authFile + " : " + if (LOG.isErrorEnabled()) { + LOG.error("Could not read " + authFile + " : " + ex.getMessage()); ex.printStackTrace(LogUtil.getErrorStream(LOG)); } Modified: nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java (original) +++ nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java (original) +++ nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java (original) +++ nutch/trunk/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java Tue Aug 10 08:45:52 2010 @@ -168,9 +168,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/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java (original) +++ nutch/trunk/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java Tue Aug 10 08:45:52 2010 @@ -26,8 +26,8 @@ import java.util.List; import java.util.Set; import org.apache.avro.util.Utf8; -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.indexer.NutchDocument; import org.apache.nutch.scoring.ScoreDatum; @@ -49,7 +49,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 final static Utf8 CASH_KEY = new Utf8("_csh_"); Modified: nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java (original) +++ nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java Tue Aug 10 08:45:52 2010 @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.Iterator; 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; @@ -45,7 +45,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/trunk/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java (original) +++ nutch/trunk/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java Tue Aug 10 08:45:52 2010 @@ -19,8 +19,8 @@ package org.apache.nutch.indexer.subcoll import java.util.ArrayList; import java.util.Collection; -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.nutch.collection.CollectionManager; @@ -50,8 +50,8 @@ 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/trunk/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java (original) +++ nutch/trunk/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java Tue Aug 10 08:45:52 2010 @@ -21,8 +21,8 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; -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.indexer.IndexingException; import org.apache.nutch.indexer.IndexingFilter; @@ -38,7 +38,7 @@ import org.apache.nutch.util.domain.Doma * @author Enis Soztutar <[email protected]> */ 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; @@ -52,7 +52,7 @@ public class TLDIndexingFilter implement DomainSuffix d = URLUtil.getDomainSuffix(_url); doc.add("tld", d.getDomain()); } catch (Exception ex) { - LOG.warn(ex); + LOG.warn("Exception in TLDIndexingFilter",ex); } return doc; Modified: nutch/trunk/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java (original) +++ nutch/trunk/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java Tue Aug 10 08:45:52 2010 @@ -24,8 +24,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; @@ -61,7 +61,7 @@ import org.apache.nutch.util.URLUtil; 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/trunk/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java (original) +++ nutch/trunk/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java Tue Aug 10 08:45:52 2010 @@ -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/trunk/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java (original) +++ nutch/trunk/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java Tue Aug 10 08:45:52 2010 @@ -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.*; @@ -50,7 +50,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; @@ -155,7 +155,7 @@ public class PrefixURLFilter implements try { trie = readConfigurationFile(reader); } catch (IOException e) { - if (LOG.isFatalEnabled()) { LOG.fatal(e.getMessage()); } + if (LOG.isErrorEnabled()) { LOG.error(e.getMessage()); } // TODO [email protected]: throw Exception? Because broken api. throw new RuntimeException(e.getMessage(), e); } Modified: nutch/trunk/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java (original) +++ nutch/trunk/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java Tue Aug 10 08:45:52 2010 @@ -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; @@ -122,7 +122,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; @@ -276,7 +276,7 @@ public class SuffixURLFilter implements try { readConfigurationFile(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/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java (original) +++ nutch/trunk/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java Tue Aug 10 08:45:52 2010 @@ -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() { Modified: nutch/trunk/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java (original) +++ nutch/trunk/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java Tue Aug 10 08:45:52 2010 @@ -29,8 +29,8 @@ import java.util.List; import java.util.ArrayList; 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.conf.Configured; @@ -58,7 +58,7 @@ import org.apache.oro.text.regex.*; */ public class RegexURLNormalizer extends Configured implements URLNormalizer { - private static final Log LOG = LogFactory.getLog(RegexURLNormalizer.class); + private static final Logger LOG = LoggerFactory.getLogger(RegexURLNormalizer.class); /** * Class which holds a compiled pattern and its corresponding substition @@ -188,7 +188,7 @@ public class RegexURLNormalizer extends FileInputStream fis = new FileInputStream(filename); return readConfiguration(fis); } catch (Exception e) { - LOG.fatal("Error loading rules from '" + filename + "': " + e); + LOG.error("Error loading rules from '" + filename + "': " + e); return EMPTY_RULES; } } @@ -203,8 +203,8 @@ public class RegexURLNormalizer extends .parse(is); Element root = doc.getDocumentElement(); if ((!"regex-normalize".equals(root.getTagName())) - && (LOG.isFatalEnabled())) { - LOG.fatal("bad conf file: top-level element not <regex-normalize>"); + && (LOG.isErrorEnabled())) { + LOG.error("bad conf file: top-level element not <regex-normalize>"); } NodeList regexes = root.getChildNodes(); for (int i = 0; i < regexes.getLength(); i++) { @@ -239,8 +239,8 @@ public class RegexURLNormalizer extends } } } catch (Exception e) { - if (LOG.isFatalEnabled()) { - LOG.fatal("error parsing conf file: " + e); + if (LOG.isErrorEnabled()) { + LOG.error("error parsing conf file: " + e); } return EMPTY_RULES; } Modified: nutch/trunk/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java (original) +++ nutch/trunk/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java Tue Aug 10 08:45:52 2010 @@ -29,8 +29,8 @@ import java.util.HashMap; 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.nutch.net.URLNormalizers; import org.apache.nutch.util.NutchConfiguration; @@ -39,7 +39,7 @@ import junit.framework.TestCase; /** Unit tests for RegexUrlNormalizer. */ public class TestRegexURLNormalizer extends TestCase { - private static final Log LOG = LogFactory.getLog(TestRegexURLNormalizer.class); + private static final Logger LOG = LoggerFactory.getLogger(TestRegexURLNormalizer.class); private RegexURLNormalizer normalizer; private Configuration conf; Modified: nutch/trunk/src/test/org/apache/nutch/crawl/TestGenerator.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/test/org/apache/nutch/crawl/TestGenerator.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/test/org/apache/nutch/crawl/TestGenerator.java (original) +++ nutch/trunk/src/test/org/apache/nutch/crawl/TestGenerator.java Tue Aug 10 08:45:52 2010 @@ -20,8 +20,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -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.storage.Mark; import org.apache.nutch.storage.WebPage; @@ -40,7 +40,7 @@ import org.apache.nutch.util.TableUtil; */ public class TestGenerator extends AbstractNutchTest { - public static final Log LOG = LogFactory.getLog(TestGenerator.class); + public static final Logger LOG = LoggerFactory.getLogger(TestGenerator.class); private static String[] FIELDS = new String[] { WebPage.Field.MARKERS.getName(), Modified: nutch/trunk/src/test/org/apache/nutch/util/CrawlTestUtil.java URL: http://svn.apache.org/viewvc/nutch/trunk/src/test/org/apache/nutch/util/CrawlTestUtil.java?rev=983885&r1=983884&r2=983885&view=diff ============================================================================== --- nutch/trunk/src/test/org/apache/nutch/util/CrawlTestUtil.java (original) +++ nutch/trunk/src/test/org/apache/nutch/util/CrawlTestUtil.java Tue Aug 10 08:45:52 2010 @@ -22,8 +22,8 @@ import java.util.ArrayList; 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.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; @@ -45,7 +45,7 @@ import com.sun.net.httpserver.HttpContex public class CrawlTestUtil { - private static final Log LOG = LogFactory.getLog(CrawlTestUtil.class); + private static final Logger LOG = LoggerFactory.getLogger(CrawlTestUtil.class); /** * For now we need to manually construct our Configuration, because we need to
