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 [1/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...
Author: lewismc
Date: Thu Sep 22 15:10:44 2011
New Revision: 1174191
URL: http://svn.apache.org/viewvc?rev=1174191&view=rev
Log:
commit to address NUTCH-1078 and update of changes.txt
Modified:
nutch/branches/branch-1.4/CHANGES.txt
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Crawl.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDb.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbFilter.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbMerger.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReader.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReducer.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Generator.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Injector.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDb.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbFilter.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbMerger.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbReader.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/MapWritable.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/SignatureFactory.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/URLPartitioner.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/Fetcher.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/OldFetcher.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexerMapReduce.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFilters.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrClean.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrIndexer.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrUtils.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrWriter.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/net/URLNormalizers.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/OutlinkExtractor.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseOutputFormat.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParsePluginsReader.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseResult.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseSegment.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseUtil.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserChecker.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserFactory.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginDescriptor.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginManifestParser.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginRepository.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/protocol/ProtocolFactory.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/Loops.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMergeFilters.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMerger.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentReader.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/CrawlDBScanner.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/DmozParser.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/FreeGenerator.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/ResolveUrls.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/arc/ArcSegmentCreator.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/LogDebugHandler.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/SegmentHandler.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/proxy/TestbedProxy.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DeflateUtils.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/DomUtil.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/EncodingDetector.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/GZIPUtils.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/LogUtil.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/ObjectCache.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainStatistics.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixes.java
nutch/branches/branch-1.4/src/java/org/apache/nutch/util/domain/DomainSuffixesReader.java
nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/creativecommons/src/java/org/creativecommons/nutch/CCParseFilter.java
nutch/branches/branch-1.4/src/plugin/feed/src/java/org/apache/nutch/parse/feed/FeedParser.java
nutch/branches/branch-1.4/src/plugin/feed/src/test/org/apache/nutch/parse/feed/TestFeedParser.java
nutch/branches/branch-1.4/src/plugin/index-anchor/src/java/org/apache/nutch/indexer/anchor/AnchorIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/index-basic/src/java/org/apache/nutch/indexer/basic/BasicIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/index-more/src/java/org/apache/nutch/indexer/more/MoreIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/index-static/src/java/org/apache/nutch/indexer/staticfield/StaticFieldIndexer.java
nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/HttpBase.java
nutch/branches/branch-1.4/src/plugin/lib-http/src/java/org/apache/nutch/protocol/http/api/RobotRulesParser.java
nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/java/org/apache/nutch/urlfilter/api/RegexURLFilterBase.java
nutch/branches/branch-1.4/src/plugin/lib-regex-filter/src/test/org/apache/nutch/urlfilter/api/RegexURLFilterBaseTest.java
nutch/branches/branch-1.4/src/plugin/microformats-reltag/src/java/org/apache/nutch/microformats/reltag/RelTagParser.java
nutch/branches/branch-1.4/src/plugin/parse-ext/src/java/org/apache/nutch/parse/ext/ExtParser.java
nutch/branches/branch-1.4/src/plugin/parse-html/src/java/org/apache/nutch/parse/html/HtmlParser.java
nutch/branches/branch-1.4/src/plugin/parse-js/src/java/org/apache/nutch/parse/js/JSParseFilter.java
nutch/branches/branch-1.4/src/plugin/parse-swf/src/java/org/apache/nutch/parse/swf/SWFParser.java
nutch/branches/branch-1.4/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/TikaParser.java
nutch/branches/branch-1.4/src/plugin/parse-tika/src/test/org/apache/nutch/tika/TestFeedParser.java
nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipParser.java
nutch/branches/branch-1.4/src/plugin/parse-zip/src/java/org/apache/nutch/parse/zip/ZipTextExtractor.java
nutch/branches/branch-1.4/src/plugin/protocol-file/src/java/org/apache/nutch/protocol/file/File.java
nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/Ftp.java
nutch/branches/branch-1.4/src/plugin/protocol-ftp/src/java/org/apache/nutch/protocol/ftp/PrintCommandListener.java
nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/Http.java
nutch/branches/branch-1.4/src/plugin/protocol-http/src/java/org/apache/nutch/protocol/http/HttpResponse.java
nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummySSLProtocolSocketFactory.java
nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/DummyX509TrustManager.java
nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/Http.java
nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpAuthenticationFactory.java
nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpBasicAuthentication.java
nutch/branches/branch-1.4/src/plugin/protocol-httpclient/src/java/org/apache/nutch/protocol/httpclient/HttpResponse.java
nutch/branches/branch-1.4/src/plugin/scoring-opic/src/java/org/apache/nutch/scoring/opic/OPICScoringFilter.java
nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java
nutch/branches/branch-1.4/src/plugin/subcollection/src/java/org/apache/nutch/indexer/subcollection/SubcollectionIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/tld/src/java/org/apache/nutch/indexer/tld/TLDIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/java/org/apache/nutch/urlfilter/domain/DomainURLFilter.java
nutch/branches/branch-1.4/src/plugin/urlfilter-domain/src/test/org/apache/nutch/urlfilter/domain/TestDomainURLFilter.java
nutch/branches/branch-1.4/src/plugin/urlfilter-prefix/src/java/org/apache/nutch/urlfilter/prefix/PrefixURLFilter.java
nutch/branches/branch-1.4/src/plugin/urlfilter-suffix/src/java/org/apache/nutch/urlfilter/suffix/SuffixURLFilter.java
nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/indexer/urlmeta/URLMetaIndexingFilter.java
nutch/branches/branch-1.4/src/plugin/urlmeta/src/java/org/apache/nutch/scoring/urlmeta/URLMetaScoringFilter.java
nutch/branches/branch-1.4/src/plugin/urlnormalizer-basic/src/java/org/apache/nutch/net/urlnormalizer/basic/BasicURLNormalizer.java
nutch/branches/branch-1.4/src/plugin/urlnormalizer-regex/src/java/org/apache/nutch/net/urlnormalizer/regex/RegexURLNormalizer.java
nutch/branches/branch-1.4/src/plugin/urlnormalizer-regex/src/test/org/apache/nutch/net/urlnormalizer/regex/TestRegexURLNormalizer.java
nutch/branches/branch-1.4/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
Modified: nutch/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/CHANGES.txt?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/CHANGES.txt (original)
+++ nutch/branches/branch-1.4/CHANGES.txt Thu Sep 22 15:10:44 2011
@@ -2,6 +2,8 @@ Nutch Change Log
Release 1.4 - Current development
+* NUTCH-1078 Upgrade all instances of commons logging to slf4j (with log4j backend) (lewismc)
+
* NUTCH-1114 Attr file missing in domain filter (markus)
* NUTCH-1067 Configure minimum throughput for fetcher (markus)
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/AbstractFetchSchedule.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
package org.apache.nutch.crawl;
-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;
@@ -31,7 +31,7 @@ import org.apache.nutch.crawl.CrawlDatum
* @author Andrzej Bialecki
*/
public abstract class AbstractFetchSchedule extends Configured implements FetchSchedule {
- private static final Log LOG = LogFactory.getLog(AbstractFetchSchedule.class);
+ private static final Logger LOG = LoggerFactory.getLogger(AbstractFetchSchedule.class);
protected int defaultInterval;
protected int maxInterval;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Crawl.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Crawl.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Crawl.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Crawl.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.text.*;
// Commons Logging imports
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.fs.*;
import org.apache.hadoop.conf.*;
@@ -40,7 +40,7 @@ import org.apache.nutch.util.NutchJob;
import org.apache.nutch.fetcher.Fetcher;
public class Crawl extends Configured implements Tool {
- public static final Log LOG = LogFactory.getLog(Crawl.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Crawl.class);
private static String getDate() {
return new SimpleDateFormat("yyyyMMddHHmmss").format
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDb.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDb.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDb.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDb.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.text.SimpleDateFormat;
import java.util.*;
// 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.*;
@@ -42,7 +42,7 @@ import org.apache.nutch.util.TimingUtil;
* crawldb accordingly.
*/
public class CrawlDb extends Configured implements Tool {
- public static final Log LOG = LogFactory.getLog(CrawlDb.class);
+ public static final Logger LOG = LoggerFactory.getLogger(CrawlDb.class);
public static final String CRAWLDB_ADDITIONS_ALLOWED = "db.update.additions.allowed";
@@ -206,7 +206,7 @@ public class CrawlDb extends Configured
update(new Path(args[0]), dirs.toArray(new Path[dirs.size()]), normalize, filter, additionsAllowed, force);
return 0;
} catch (Exception e) {
- LOG.fatal("CrawlDb update: " + StringUtils.stringifyException(e));
+ LOG.error("CrawlDb update: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbFilter.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbFilter.java Thu Sep 22 15:10:44 2011
@@ -19,8 +19,8 @@ package org.apache.nutch.crawl;
import java.io.IOException;
-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.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Mapper;
@@ -54,7 +54,7 @@ public class CrawlDbFilter implements Ma
private String scope;
- public static final Log LOG = LogFactory.getLog(CrawlDbFilter.class);
+ public static final Logger LOG = LoggerFactory.getLogger(CrawlDbFilter.class);
public void configure(JobConf job) {
urlFiltering = job.getBoolean(URL_FILTERING, false);
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbMerger.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbMerger.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbMerger.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbMerger.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.util.*;
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.fs.FileSystem;
@@ -54,7 +54,7 @@ import org.apache.nutch.util.TimingUtil;
* @author Andrzej Bialecki
*/
public class CrawlDbMerger extends Configured implements Tool {
- private static final Log LOG = LogFactory.getLog(CrawlDbMerger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CrawlDbMerger.class);
public static class Merger extends MapReduceBase implements Reducer<Text, CrawlDatum, Text, CrawlDatum> {
private org.apache.hadoop.io.MapWritable meta;
@@ -190,7 +190,7 @@ public class CrawlDbMerger extends Confi
merge(output, dbs.toArray(new Path[dbs.size()]), normalize, filter);
return 0;
} catch (Exception e) {
- LOG.fatal("CrawlDb merge: " + StringUtils.stringifyException(e));
+ LOG.error("CrawlDb merge: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReader.java Thu Sep 22 15:10:44 2011
@@ -27,8 +27,8 @@ import java.util.Random;
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;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -68,7 +68,7 @@ import org.apache.nutch.util.StringUtil;
*/
public class CrawlDbReader implements Closeable {
- public static final Log LOG = LogFactory.getLog(CrawlDbReader.class);
+ public static final Logger LOG = LoggerFactory.getLogger(CrawlDbReader.class);
public static final int STD_FORMAT = 0;
public static final int CSV_FORMAT = 1;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReducer.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReducer.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReducer.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/CrawlDbReducer.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import java.util.Map.Entry;
import java.io.IOException;
// 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.mapred.*;
@@ -36,7 +36,7 @@ import org.apache.nutch.scoring.ScoringF
/** Merge new page entries with existing entries. */
public class CrawlDbReducer implements Reducer<Text, CrawlDatum, Text, CrawlDatum> {
- public static final Log LOG = LogFactory.getLog(CrawlDbReducer.class);
+ public static final Logger LOG = LoggerFactory.getLogger(CrawlDbReducer.class);
private int retryMax;
private CrawlDatum result = new CrawlDatum();
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/FetchScheduleFactory.java Thu Sep 22 15:10:44 2011
@@ -17,15 +17,15 @@
package org.apache.nutch.crawl;
-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.ObjectCache;
/** Creates and caches a {@link FetchSchedule} implementation. */
public class FetchScheduleFactory {
- public static final Log LOG = LogFactory.getLog(FetchScheduleFactory.class);
+ public static final Logger LOG = LoggerFactory.getLogger(FetchScheduleFactory.class);
private FetchScheduleFactory() {} // no public ctor
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Generator.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Generator.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Generator.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Generator.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.util.*;
import java.text.*;
// 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.conf.*;
@@ -57,7 +57,7 @@ import org.apache.nutch.util.URLUtil;
**/
public class Generator extends Configured implements Tool {
- public static final Log LOG = LogFactory.getLog(Generator.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Generator.class);
public static final String GENERATE_UPDATE_CRAWLDB = "generate.update.crawldb";
public static final String GENERATOR_MIN_SCORE = "generate.min.score";
@@ -693,7 +693,7 @@ public class Generator extends Configure
norm, force, maxNumSegments);
if (segs == null) return -1;
} catch (Exception e) {
- LOG.fatal("Generator: " + StringUtils.stringifyException(e));
+ LOG.error("Generator: " + StringUtils.stringifyException(e));
return -1;
}
return 0;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Injector.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Injector.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Injector.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/Injector.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.text.SimpleDateFormat;
import java.util.*;
// 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.*;
@@ -48,7 +48,7 @@ import org.apache.nutch.util.TimingUtil;
* e.g. http://www.nutch.org/ \t nutch.score=10 \t nutch.fetchInterval=2592000 \t userType=open_source
**/
public class Injector extends Configured implements Tool {
- public static final Log LOG = LogFactory.getLog(Injector.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Injector.class);
/** metadata key reserved for setting a custom score for a specific URL */
public static String nutchScoreMDName = "nutch.score";
@@ -248,7 +248,7 @@ public class Injector extends Configured
inject(new Path(args[0]), new Path(args[1]));
return 0;
} catch (Exception e) {
- LOG.fatal("Injector: " + StringUtils.stringifyException(e));
+ LOG.error("Injector: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDb.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDb.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDb.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDb.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.util.*;
import java.net.*;
// 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.*;
@@ -45,7 +45,7 @@ import org.apache.nutch.util.TimingUtil;
/** Maintains an inverted link map, listing incoming links for each url. */
public class LinkDb extends Configured implements Tool, Mapper<Text, ParseData, Text, Inlinks> {
- public static final Log LOG = LogFactory.getLog(LinkDb.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LinkDb.class);
public static final String CURRENT_NAME = "current";
public static final String LOCK_NAME = ".locked";
@@ -292,7 +292,7 @@ public class LinkDb extends Configured i
invert(db, segs.toArray(new Path[segs.size()]), normalize, filter, force);
return 0;
} catch (Exception e) {
- LOG.fatal("LinkDb: " + StringUtils.stringifyException(e));
+ LOG.error("LinkDb: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbFilter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbFilter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbFilter.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbFilter.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ package org.apache.nutch.crawl;
import java.io.IOException;
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.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Mapper;
@@ -53,7 +53,7 @@ public class LinkDbFilter implements Map
private String scope;
- public static final Log LOG = LogFactory.getLog(LinkDbFilter.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LinkDbFilter.class);
private Text newKey = new Text();
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbMerger.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbMerger.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbMerger.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbMerger.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Random;
-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.FileSystem;
@@ -64,7 +64,7 @@ import org.apache.nutch.util.TimingUtil;
* @author Andrzej Bialecki
*/
public class LinkDbMerger extends Configured implements Tool, Reducer<Text, Inlinks, Text, Inlinks> {
- private static final Log LOG = LogFactory.getLog(LinkDbMerger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(LinkDbMerger.class);
private int maxInlinks;
@@ -178,7 +178,7 @@ public class LinkDbMerger extends Config
merge(output, dbs.toArray(new Path[dbs.size()]), normalize, filter);
return 0;
} catch (Exception e) {
- LOG.fatal("LinkDbMerger: " + StringUtils.stringifyException(e));
+ LOG.error("LinkDbMerger: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/LinkDbReader.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ package org.apache.nutch.crawl;
import java.io.IOException;
// 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.Configured;
import org.apache.hadoop.io.*;
@@ -40,7 +40,7 @@ import java.util.Iterator;
/** . */
public class LinkDbReader extends Configured implements Tool, Closeable {
- public static final Log LOG = LogFactory.getLog(LinkDbReader.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LinkDbReader.class);
private static final Partitioner<WritableComparable, Writable> PARTITIONER = new HashPartitioner<WritableComparable, Writable>();
@@ -149,7 +149,7 @@ public class LinkDbReader extends Config
return -1;
}
} catch (Exception e) {
- LOG.fatal("LinkDbReader: " + StringUtils.stringifyException(e));
+ LOG.error("LinkDbReader: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/MapWritable.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/MapWritable.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/MapWritable.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/MapWritable.java Thu Sep 22 15:10:44 2011
@@ -29,8 +29,8 @@ import java.util.Map;
import java.util.Set;
// 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.BytesWritable;
import org.apache.hadoop.io.DataInputBuffer;
@@ -61,7 +61,7 @@ import org.apache.nutch.protocol.Protoco
*/
public class MapWritable implements Writable {
- public static final Log LOG = LogFactory.getLog(MapWritable.class);
+ public static final Logger LOG = LoggerFactory.getLogger(MapWritable.class);
private KeyValueEntry fFirst;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/SignatureFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/SignatureFactory.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/SignatureFactory.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/SignatureFactory.java Thu Sep 22 15:10:44 2011
@@ -18,8 +18,8 @@
package org.apache.nutch.crawl;
// 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;
@@ -33,7 +33,7 @@ import org.apache.nutch.util.ObjectCache
* @author Andrzej Bialecki <ab@getopt.org>
*/
public class SignatureFactory {
- private static final Log LOG = LogFactory.getLog(SignatureFactory.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SignatureFactory.class);
private SignatureFactory() {} // no public ctor
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/URLPartitioner.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/URLPartitioner.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/URLPartitioner.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/crawl/URLPartitioner.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.net.URL;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
-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.mapred.*;
import org.apache.nutch.net.URLNormalizers;
@@ -34,7 +34,7 @@ import org.apache.nutch.util.URLUtil;
* parameter 'partition.url.mode' which can be 'byHost', 'byDomain' or 'byIP'
*/
public class URLPartitioner implements Partitioner<Text,Writable> {
- private static final Log LOG = LogFactory.getLog(URLPartitioner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(URLPartitioner.class);
public static final String PARTITION_MODE_KEY = "partition.url.mode";
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/Fetcher.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/Fetcher.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/Fetcher.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/Fetcher.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
// 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.*;
@@ -96,7 +96,7 @@ public class Fetcher extends Configured
public static final String PROTOCOL_REDIR = "protocol";
- public static final Log LOG = LogFactory.getLog(Fetcher.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Fetcher.class);
public static class InputFormat extends SequenceFileInputFormat<Text, CrawlDatum> {
/** Don't split inputs, to keep things polite. */
@@ -518,7 +518,7 @@ public class Fetcher extends Configured
hasMore = reader.next(url, datum);
timelimitcount++;
} catch (IOException e) {
- LOG.fatal("QueueFeeder error reading input, record " + cnt, e);
+ LOG.error("QueueFeeder error reading input, record " + cnt, e);
return;
}
continue;
@@ -543,7 +543,7 @@ public class Fetcher extends Configured
feed--;
}
} catch (IOException e) {
- LOG.fatal("QueueFeeder error reading input, record " + cnt, e);
+ LOG.error("QueueFeeder error reading input, record " + cnt, e);
return;
}
}
@@ -807,9 +807,9 @@ public class Fetcher extends Configured
}
} catch (Throwable e) {
- if (LOG.isFatalEnabled()) {
- e.printStackTrace(LogUtil.getFatalStream(LOG));
- LOG.fatal("fetcher caught:"+e.toString());
+ if (LOG.isErrorEnabled()) {
+ e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("fetcher caught:"+e.toString());
}
} finally {
if (fit != null) fetchQueues.finishFetchItem(fit);
@@ -975,9 +975,9 @@ public class Fetcher extends Configured
}
}
} catch (IOException e) {
- if (LOG.isFatalEnabled()) {
- e.printStackTrace(LogUtil.getFatalStream(LOG));
- LOG.fatal("fetcher caught:"+e.toString());
+ if (LOG.isErrorEnabled()) {
+ e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("fetcher caught:"+e.toString());
}
}
@@ -1238,7 +1238,7 @@ public class Fetcher extends Configured
fetch(segment, threads);
return 0;
} catch (Exception e) {
- LOG.fatal("Fetcher: " + StringUtils.stringifyException(e));
+ LOG.error("Fetcher: " + StringUtils.stringifyException(e));
return -1;
}
@@ -1253,8 +1253,8 @@ public class Fetcher extends Configured
if (agentName == null || agentName.trim().length() == 0) {
String message = "Fetcher: No agents listed in 'http.agent.name'"
+ " property.";
- if (LOG.isFatalEnabled()) {
- LOG.fatal(message);
+ if (LOG.isErrorEnabled()) {
+ LOG.error(message);
}
throw new IllegalArgumentException(message);
} else {
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/OldFetcher.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/OldFetcher.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/OldFetcher.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/fetcher/OldFetcher.java Thu Sep 22 15:10:44 2011
@@ -23,8 +23,8 @@ import java.text.SimpleDateFormat;
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.io.*;
import org.apache.hadoop.fs.*;
@@ -47,7 +47,7 @@ import org.apache.nutch.util.*;
/** The fetcher. Most of the work is done by plugins. */
public class OldFetcher extends Configured implements Tool, MapRunnable<WritableComparable, Writable, Text, NutchWritable> {
- public static final Log LOG = LogFactory.getLog(OldFetcher.class);
+ public static final Logger LOG = LoggerFactory.getLogger(OldFetcher.class);
public static final int PERM_REFRESH_TIME = 5;
@@ -130,9 +130,9 @@ public class OldFetcher extends Configur
break; // at eof, exit
}
} catch (IOException e) {
- if (LOG.isFatalEnabled()) {
- e.printStackTrace(LogUtil.getFatalStream(LOG));
- LOG.fatal("fetcher caught:"+e.toString());
+ if (LOG.isErrorEnabled()) {
+ e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("fetcher caught:"+e.toString());
}
break;
}
@@ -253,9 +253,9 @@ public class OldFetcher extends Configur
}
} catch (Throwable e) {
- if (LOG.isFatalEnabled()) {
- e.printStackTrace(LogUtil.getFatalStream(LOG));
- LOG.fatal("fetcher caught:"+e.toString());
+ if (LOG.isErrorEnabled()) {
+ e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("fetcher caught:"+e.toString());
}
} finally {
synchronized (OldFetcher.this) {activeThreads--;} // count threads
@@ -397,9 +397,9 @@ public class OldFetcher extends Configur
}
}
} catch (IOException e) {
- if (LOG.isFatalEnabled()) {
- e.printStackTrace(LogUtil.getFatalStream(LOG));
- LOG.fatal("fetcher caught:"+e.toString());
+ if (LOG.isErrorEnabled()) {
+ e.printStackTrace(LogUtil.getErrorStream(LOG));
+ LOG.error("fetcher caught:"+e.toString());
}
}
@@ -570,7 +570,7 @@ public class OldFetcher extends Configur
fetch(segment, threads); // run the Fetcher
return 0;
} catch (Exception e) {
- LOG.fatal("OldFetcher: " + StringUtils.stringifyException(e));
+ LOG.error("OldFetcher: " + StringUtils.stringifyException(e));
return -1;
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexerMapReduce.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexerMapReduce.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexerMapReduce.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexerMapReduce.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ import java.io.IOException;
import java.util.Collection;
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.Configured;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -52,7 +52,7 @@ public class IndexerMapReduce extends Co
implements Mapper<Text, Writable, Text, NutchWritable>,
Reducer<Text, NutchWritable, Text, NutchDocument> {
- public static final Log LOG = LogFactory.getLog(IndexerMapReduce.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IndexerMapReduce.class);
private IndexingFilters filters;
private ScoringFilters scfilters;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFilters.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFilters.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFilters.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFilters.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.util.ArrayList;
import java.util.HashMap;
// 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.nutch.plugin.*;
import org.apache.nutch.parse.Parse;
@@ -37,7 +37,7 @@ public class IndexingFilters {
public static final String INDEXINGFILTER_ORDER = "indexingfilter.order";
- public final static Log LOG = LogFactory.getLog(IndexingFilters.class);
+ public final static Logger LOG = LoggerFactory.getLogger(IndexingFilters.class);
private IndexingFilter[] indexingFilters;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/IndexingFiltersChecker.java Thu Sep 22 15:10:44 2011
@@ -3,8 +3,8 @@ package org.apache.nutch.indexer;
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.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.io.Text;
@@ -33,7 +33,7 @@ import org.apache.nutch.util.NutchConfig
public class IndexingFiltersChecker extends Configured implements Tool {
- public static final Log LOG = LogFactory.getLog(IndexingFiltersChecker.class);
+ public static final Logger LOG = LoggerFactory.getLogger(IndexingFiltersChecker.class);
public IndexingFiltersChecker() {
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrClean.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrClean.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrClean.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrClean.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.net.MalformedURLException;
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.ByteWritable;
@@ -57,7 +57,7 @@ import org.apache.solr.client.solrj.requ
*/
public class SolrClean implements Tool {
- public static final Log LOG = LogFactory.getLog(SolrClean.class);
+ public static final Logger LOG = LoggerFactory.getLogger(SolrClean.class);
private Configuration conf;
@Override
@@ -195,4 +195,4 @@ public class SolrClean implements Tool {
new SolrClean(), args);
System.exit(result);
}
-}
\ No newline at end of file
+}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrDeleteDuplicates.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import java.text.SimpleDateFormat;
import java.util.Iterator;
import java.util.Date;
-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.io.Writable;
@@ -85,7 +85,7 @@ public class SolrDeleteDuplicates
implements Reducer<Text, SolrDeleteDuplicates.SolrRecord, Text, SolrDeleteDuplicates.SolrRecord>,
Tool {
- public static final Log LOG = LogFactory.getLog(SolrDeleteDuplicates.class);
+ public static final Logger LOG = LoggerFactory.getLogger(SolrDeleteDuplicates.class);
private static final String SOLR_GET_ALL_QUERY = SolrConstants.ID_FIELD + ":[* TO *]";
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrIndexer.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrIndexer.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrIndexer.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrIndexer.java Thu Sep 22 15:10:44 2011
@@ -16,8 +16,8 @@
*/
package org.apache.nutch.indexer.solr;
-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.FileStatus;
@@ -45,7 +45,7 @@ import java.util.Random;
public class SolrIndexer extends Configured implements Tool {
- public static Log LOG = LogFactory.getLog(SolrIndexer.class);
+ public static Logger LOG = LoggerFactory.getLogger(SolrIndexer.class);
public SolrIndexer() {
super(null);
@@ -92,7 +92,7 @@ public class SolrIndexer extends Configu
LOG.info("SolrIndexer: finished at " + sdf.format(end) + ", elapsed: " + TimingUtil.elapsedTime(start, end));
}
catch (Exception e){
- LOG.error(e);
+ LOG.error(e.toString());
} finally {
FileSystem.get(job).delete(tmp, true);
}
@@ -135,7 +135,7 @@ public class SolrIndexer extends Configu
indexSolr(args[0], crawlDb, linkDb, segments, noCommit);
return 0;
} catch (final Exception e) {
- LOG.fatal("SolrIndexer: " + StringUtils.stringifyException(e));
+ LOG.error("SolrIndexer: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java Thu Sep 22 15:10:44 2011
@@ -26,8 +26,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.conf.Configuration;
import org.apache.nutch.util.ObjectCache;
import org.w3c.dom.Document;
@@ -37,7 +37,7 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class SolrMappingReader {
- public static Log LOG = LogFactory.getLog(SolrMappingReader.class);
+ public static Logger LOG = LoggerFactory.getLogger(SolrMappingReader.class);
private Configuration conf;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrUtils.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrUtils.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrUtils.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrUtils.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.params.HttpClientParams;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.mapred.JobConf;
import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer;
@@ -29,7 +29,7 @@ import java.net.MalformedURLException;
public class SolrUtils {
- public static Log LOG = LogFactory.getLog(SolrIndexer.class);
+ public static Logger LOG = LoggerFactory.getLogger(SolrIndexer.class);
public static CommonsHttpSolrServer getCommonsHttpSolrServer(JobConf job) throws MalformedURLException {
HttpClient client=new HttpClient();
@@ -73,4 +73,4 @@ public class SolrUtils {
return retval.toString();
}
-}
\ No newline at end of file
+}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrWriter.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrWriter.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrWriter.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/indexer/solr/SolrWriter.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.Date;
import java.util.List;
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.mapred.JobConf;
import org.apache.nutch.indexer.NutchDocument;
import org.apache.nutch.indexer.NutchField;
@@ -35,7 +35,7 @@ import org.apache.solr.common.util.DateU
public class SolrWriter implements NutchIndexWriter {
- public static Log LOG = LogFactory.getLog(SolrWriter.class);
+ public static Logger LOG = LoggerFactory.getLogger(SolrWriter.class);
private SolrServer solr;
private SolrMappingReader solrMapping;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/net/URLNormalizers.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/net/URLNormalizers.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/net/URLNormalizers.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/net/URLNormalizers.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Set;
import java.util.Vector;
-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.plugin.Extension;
import org.apache.nutch.plugin.ExtensionPoint;
@@ -97,7 +97,7 @@ public final class URLNormalizers {
public static final String SCOPE_OUTLINK = "outlink";
- public static final Log LOG = LogFactory.getLog(URLNormalizers.class);
+ public static final Logger LOG = LoggerFactory.getLogger(URLNormalizers.class);
/* Empty extension list for caching purposes. */
private final List<Extension> EMPTY_EXTENSION_LIST = Collections.EMPTY_LIST;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/OutlinkExtractor.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/OutlinkExtractor.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/OutlinkExtractor.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/OutlinkExtractor.java Thu Sep 22 15:10:44 2011
@@ -21,8 +21,8 @@ import java.net.MalformedURLException;
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.hadoop.conf.Configuration;
import org.apache.oro.text.regex.MatchResult;
@@ -48,7 +48,7 @@ import org.apache.oro.text.regex.Perl5Ma
* @since 0.7
*/
public class OutlinkExtractor {
- private static final Log LOG = LogFactory.getLog(OutlinkExtractor.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OutlinkExtractor.class);
/**
* Regex pattern to get URLs within a plain text.
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseOutputFormat.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseOutputFormat.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseOutputFormat.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseOutputFormat.java Thu Sep 22 15:10:44 2011
@@ -18,8 +18,8 @@
package org.apache.nutch.parse;
// 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.io.SequenceFile.CompressionType;
@@ -45,7 +45,7 @@ import org.apache.hadoop.util.Progressab
/* Parse content in a segment. */
public class ParseOutputFormat implements OutputFormat<Text, Parse> {
- private static final Log LOG = LogFactory.getLog(ParseOutputFormat.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ParseOutputFormat.class);
private URLFilters filters;
private URLNormalizers normalizers;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParsePluginsReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParsePluginsReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParsePluginsReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParsePluginsReader.java Thu Sep 22 15:10:44 2011
@@ -33,8 +33,8 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
// 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;
@@ -53,7 +53,7 @@ import org.apache.nutch.util.NutchConfig
class ParsePluginsReader {
/* our log stream */
- public static final Log LOG = LogFactory.getLog(ParsePluginsReader.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ParsePluginsReader.class);
/** The property name of the parse-plugins location */
private static final String PP_FILE_PROP = "parse.plugin.file";
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseResult.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseResult.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseResult.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseResult.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.Iterator;
import java.util.Map;
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.io.Text;
/**
@@ -39,7 +39,7 @@ public class ParseResult implements Iter
private Map<Text, Parse> parseMap;
private String originalUrl;
- public static final Log LOG = LogFactory.getLog(ParseResult.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ParseResult.class);
/**
* Create a container for parse results.
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseSegment.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseSegment.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseSegment.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseSegment.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
package org.apache.nutch.parse;
-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.nutch.crawl.SignatureFactory;
@@ -43,7 +43,7 @@ public class ParseSegment extends Config
Mapper<WritableComparable, Content, Text, ParseImpl>,
Reducer<Text, Writable, Text, Writable> {
- public static final Log LOG = LogFactory.getLog(ParseSegment.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ParseSegment.class);
private ScoringFilters scfilters;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseUtil.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseUtil.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseUtil.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParseUtil.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-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.protocol.Content;
@@ -40,7 +40,7 @@ import org.apache.nutch.protocol.Content
public class ParseUtil {
/* our log stream */
- public static final Log LOG = LogFactory.getLog(ParseUtil.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ParseUtil.class);
private ParserFactory parserFactory;
/** Parser timeout set to 30 sec by default. Set -1 to deactivate **/
private int MAX_PARSE_TIME = 30;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserChecker.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserChecker.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserChecker.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserChecker.java Thu Sep 22 15:10:44 2011
@@ -17,8 +17,8 @@
package org.apache.nutch.parse;
-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.Tool;
@@ -37,7 +37,7 @@ import org.apache.nutch.util.NutchConfig
public class ParserChecker implements Tool {
- public static final Log LOG = LogFactory.getLog(ParserChecker.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ParserChecker.class);
public ParserChecker() {
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserFactory.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserFactory.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/parse/ParserFactory.java Thu Sep 22 15:10:44 2011
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Vector;
// 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;
@@ -43,7 +43,7 @@ import org.apache.nutch.util.ObjectCache
/** Creates and caches {@link Parser} plugins.*/
public final class ParserFactory {
- public static final Log LOG = LogFactory.getLog(ParserFactory.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ParserFactory.class);
/** Wildcard for default plugins. */
public static final String DEFAULT_PLUGIN = "*";
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginDescriptor.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginDescriptor.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginDescriptor.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginDescriptor.java Thu Sep 22 15:10:44 2011
@@ -25,8 +25,8 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-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;
/**
@@ -53,7 +53,7 @@ public class PluginDescriptor {
private ArrayList<URL> fNotExportedLibs = new ArrayList<URL>();
private ArrayList<Extension> fExtensions = new ArrayList<Extension>();
private PluginClassLoader fClassLoader;
- public static final Log LOG = LogFactory.getLog(PluginDescriptor.class);
+ public static final Logger LOG = LoggerFactory.getLogger(PluginDescriptor.class);
private Configuration fConf;
/**
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginManifestParser.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginManifestParser.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginManifestParser.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginManifestParser.java Thu Sep 22 15:10:44 2011
@@ -29,7 +29,7 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
import org.apache.hadoop.conf.Configuration;
import org.w3c.dom.Document;
@@ -49,7 +49,7 @@ public class PluginManifestParser {
private static final String ATTR_CLASS = "class";
private static final String ATTR_ID = "id";
- public static final Log LOG = PluginRepository.LOG;
+ public static final Logger LOG = PluginRepository.LOG;
private static final boolean WINDOWS = System.getProperty("os.name")
.startsWith("Windows");
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginRepository.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginRepository.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginRepository.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/plugin/PluginRepository.java Thu Sep 22 15:10:44 2011
@@ -25,8 +25,8 @@ import java.util.WeakHashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
-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;
@@ -55,7 +55,7 @@ public class PluginRepository {
private Configuration conf;
- public static final Log LOG = LogFactory.getLog(PluginRepository.class);
+ public static final Logger LOG = LoggerFactory.getLogger(PluginRepository.class);
/**
* @throws PluginRuntimeException
@@ -80,7 +80,7 @@ public class PluginRepository {
try {
installExtensions(fRegisteredPlugins);
} catch (PluginRuntimeException e) {
- LOG.fatal(e.toString());
+ LOG.error(e.toString());
throw new RuntimeException(e.getMessage());
}
displayStatus();
@@ -197,7 +197,7 @@ public class PluginRepository {
checked.putAll(getPluginCheckedDependencies(plugin, all));
checked.put(plugin.getPluginId(), plugin);
} catch (MissingDependencyException mde) {
- // Log exception and ignore plugin
+ // Logger exception and ignore plugin
LOG.warn(mde.getMessage());
} catch (CircularDependencyException cde) {
// Simply ignore this plugin
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/protocol/ProtocolFactory.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/protocol/ProtocolFactory.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/protocol/ProtocolFactory.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/protocol/ProtocolFactory.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;
import org.apache.nutch.plugin.*;
import org.apache.nutch.util.ObjectCache;
@@ -38,7 +38,7 @@ import org.apache.hadoop.conf.Configurat
*/
public class ProtocolFactory {
- public static final Log LOG = LogFactory.getLog(ProtocolFactory.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ProtocolFactory.class);
private ExtensionPoint extensionPoint;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkDumper.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.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileSystem;
@@ -75,7 +75,7 @@ public class LinkDumper
extends Configured
implements Tool {
- public static final Log LOG = LogFactory.getLog(LinkDumper.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LinkDumper.class);
public static final String DUMP_DIR = "linkdump";
/**
@@ -454,7 +454,7 @@ public class LinkDumper
return 0;
}
catch (Exception e) {
- LOG.fatal("LinkDumper: " + StringUtils.stringifyException(e));
+ LOG.error("LinkDumper: " + StringUtils.stringifyException(e));
return -2;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/LinkRank.java Thu Sep 22 15:10:44 2011
@@ -34,8 +34,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.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FSDataInputStream;
@@ -72,7 +72,7 @@ public class LinkRank
extends Configured
implements Tool {
- public static final Log LOG = LogFactory.getLog(LinkRank.class);
+ public static final Logger LOG = LoggerFactory.getLogger(LinkRank.class);
private static final String NUM_NODES = "_num_nodes_";
/**
@@ -687,7 +687,7 @@ public class LinkRank
return 0;
}
catch (Exception e) {
- LOG.fatal("LinkAnalysis: " + StringUtils.stringifyException(e));
+ LOG.error("LinkAnalysis: " + StringUtils.stringifyException(e));
return -2;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/Loops.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/Loops.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/Loops.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/Loops.java Thu Sep 22 15:10:44 2011
@@ -35,8 +35,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.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileSystem;
@@ -80,7 +80,7 @@ public class Loops
extends Configured
implements Tool {
- public static final Log LOG = LogFactory.getLog(Loops.class);
+ public static final Logger LOG = LoggerFactory.getLogger(Loops.class);
public static final String LOOPS_DIR = "loops";
public static final String ROUTES_DIR = "routes";
@@ -605,7 +605,7 @@ public class Loops
return 0;
}
catch (Exception e) {
- LOG.fatal("Loops: " + StringUtils.stringifyException(e));
+ LOG.error("Loops: " + StringUtils.stringifyException(e));
return -2;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/NodeDumper.java Thu Sep 22 15:10:44 2011
@@ -27,8 +27,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.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.Path;
@@ -65,7 +65,7 @@ public class NodeDumper
extends Configured
implements Tool {
- public static final Log LOG = LogFactory.getLog(NodeDumper.class);
+ public static final Logger LOG = LoggerFactory.getLogger(NodeDumper.class);
private static enum DumpType {
INLINKS,
@@ -271,7 +271,7 @@ public class NodeDumper
return 0;
}
catch (Exception e) {
- LOG.fatal("NodeDumper: " + StringUtils.stringifyException(e));
+ LOG.error("NodeDumper: " + StringUtils.stringifyException(e));
return -2;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/ScoreUpdater.java Thu Sep 22 15:10:44 2011
@@ -28,8 +28,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.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileSystem;
@@ -66,7 +66,7 @@ public class ScoreUpdater
implements Tool, Mapper<Text, Writable, Text, ObjectWritable>,
Reducer<Text, ObjectWritable, Text, CrawlDatum> {
- public static final Log LOG = LogFactory.getLog(ScoreUpdater.class);
+ public static final Logger LOG = LoggerFactory.getLogger(ScoreUpdater.class);
private JobConf conf;
private float clearScore = 0.0f;
@@ -244,7 +244,7 @@ public class ScoreUpdater
return 0;
}
catch (Exception e) {
- LOG.fatal("ScoreUpdater: " + StringUtils.stringifyException(e));
+ LOG.error("ScoreUpdater: " + StringUtils.stringifyException(e));
return -1;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/scoring/webgraph/WebGraph.java Thu Sep 22 15:10:44 2011
@@ -34,8 +34,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.conf.Configuration;
import org.apache.hadoop.conf.Configured;
import org.apache.hadoop.fs.FileStatus;
@@ -93,7 +93,7 @@ public class WebGraph
extends Configured
implements Tool {
- public static final Log LOG = LogFactory.getLog(WebGraph.class);
+ public static final Logger LOG = LoggerFactory.getLogger(WebGraph.class);
public static final String LOCK_NAME = ".locked";
public static final String INLINK_DIR = "inlinks";
public static final String OUTLINK_DIR = "outlinks";
@@ -663,7 +663,7 @@ public class WebGraph
return 0;
}
catch (Exception e) {
- LOG.fatal("WebGraph: " + StringUtils.stringifyException(e));
+ LOG.error("WebGraph: " + StringUtils.stringifyException(e));
return -2;
}
}
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMergeFilters.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMergeFilters.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMergeFilters.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMergeFilters.java Thu Sep 22 15:10:44 2011
@@ -18,8 +18,8 @@ package org.apache.nutch.segment;
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.io.WritableComparable;
import org.apache.nutch.crawl.CrawlDatum;
@@ -39,7 +39,7 @@ import org.apache.nutch.protocol.Content
*
*/
public class SegmentMergeFilters {
- private static final Log LOG = LogFactory.getLog(SegmentMergeFilters.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SegmentMergeFilters.class);
private SegmentMergeFilter[] filters;
public SegmentMergeFilters(Configuration conf) {
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMerger.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMerger.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMerger.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentMerger.java Thu Sep 22 15:10:44 2011
@@ -22,8 +22,8 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.TreeMap;
-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.FileStatus;
@@ -113,7 +113,7 @@ import org.apache.nutch.util.NutchJob;
public class SegmentMerger extends Configured implements
Mapper<Text, MetaWrapper, Text, MetaWrapper>,
Reducer<Text, MetaWrapper, Text, MetaWrapper> {
- private static final Log LOG = LogFactory.getLog(SegmentMerger.class);
+ private static final Logger LOG = LoggerFactory.getLogger(SegmentMerger.class);
private static final String SEGMENT_PART_KEY = "part";
private static final String SEGMENT_SLICE_KEY = "slice";
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentReader.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentReader.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentReader.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/segment/SegmentReader.java Thu Sep 22 15:10:44 2011
@@ -33,8 +33,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;
import org.apache.hadoop.fs.FileStatus;
@@ -74,7 +74,7 @@ import org.apache.nutch.util.NutchJob;
public class SegmentReader extends Configured implements
Reducer<Text, NutchWritable, Text, Text> {
- public static final Log LOG = LogFactory.getLog(SegmentReader.class);
+ public static final Logger LOG = LoggerFactory.getLogger(SegmentReader.class);
long recNo = 0L;
Modified: nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/CrawlDBScanner.java
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/CrawlDBScanner.java?rev=1174191&r1=1174190&r2=1174191&view=diff
==============================================================================
--- nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/CrawlDBScanner.java (original)
+++ nutch/branches/branch-1.4/src/java/org/apache/nutch/tools/CrawlDBScanner.java Thu Sep 22 15:10:44 2011
@@ -20,8 +20,8 @@ import java.io.IOException;
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.conf.Configured;
import org.apache.hadoop.fs.Path;
@@ -59,7 +59,7 @@ import org.apache.nutch.util.TimingUtil;
public class CrawlDBScanner extends Configured implements Tool,
Mapper<Text,CrawlDatum,Text,CrawlDatum>, Reducer<Text,CrawlDatum,Text,CrawlDatum> {
- public static final Log LOG = LogFactory.getLog(CrawlDBScanner.class);
+ public static final Logger LOG = LoggerFactory.getLogger(CrawlDBScanner.class);
public CrawlDBScanner() {}
@@ -182,7 +182,7 @@ public class CrawlDBScanner extends Conf
scan(dbDir, output, args[2], status, text);
return 0;
} catch (Exception e) {
- LOG.fatal("CrawlDBScanner: " + StringUtils.stringifyException(e));
+ LOG.error("CrawlDBScanner: " + StringUtils.stringifyException(e));
return -1;
}
}