svn commit: r620818 - in /lucene/nutch/trunk: CHANGES.txt src/java/org/apache/nutch/crawl/Crawl.java src/java/org/apache/nutch/util/NutchConfiguration.java src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java

[kubes]

Author: kubes
Date: Tue Feb 12 06:54:42 2008
New Revision: 620818

URL: http://svn.apache.org/viewvc?rev=620818&view=rev
Log:
NUTCH-605 - Change deprecated configuration methods for Hadoop.

Modified:
    lucene/nutch/trunk/CHANGES.txt
    lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java
    lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java
    lucene/nutch/trunk/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java

Modified: lucene/nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?rev=620818&r1=620817&r2=620818&view=diff
==============================================================================
--- lucene/nutch/trunk/CHANGES.txt (original)
+++ lucene/nutch/trunk/CHANGES.txt Tue Feb 12 06:54:42 2008
@@ -206,6 +206,8 @@
 
 73. NUTCH-606 - Refactoring of Generator, run all urls through checks (kubes)
 
+74. NUTCH-605 - Change deprecated configuration methods for Hadoop (kubes)
+
 Release 0.9 - 2007-04-02
 
  1. Changed log4j confiquration to log to stdout on commandline

Modified: lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java?rev=620818&r1=620817&r2=620818&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java (original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/crawl/Crawl.java Tue Feb 12 
06:54:42 2008
@@ -54,7 +54,7 @@
     }
 
     Configuration conf = NutchConfiguration.create();
-    conf.addDefaultResource("crawl-tool.xml");
+    conf.addResource("crawl-tool.xml");
     JobConf job = new NutchJob(conf);
 
     Path rootUrlDir = null;

Modified: 
lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java?rev=620818&r1=620817&r2=620818&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java 
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/util/NutchConfiguration.java 
Tue Feb 12 06:54:42 2008
@@ -81,8 +81,8 @@
   
   /** Add the standard Nutch resources to [EMAIL PROTECTED] Configuration}. */
   public static Configuration addNutchResources(Configuration conf) {
-    conf.addDefaultResource("nutch-default.xml");
-    conf.addFinalResource("nutch-site.xml");
+    conf.addResource("nutch-default.xml");
+    conf.addResource("nutch-site.xml");
     return conf;
   }
   

Modified: 
lucene/nutch/trunk/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java?rev=620818&r1=620817&r2=620818&view=diff
==============================================================================
--- lucene/nutch/trunk/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java 
(original)
+++ lucene/nutch/trunk/src/test/org/apache/nutch/crawl/CrawlDBTestUtil.java Tue 
Feb 12 06:54:42 2008
@@ -86,8 +86,8 @@
    */
   public static Configuration createConfiguration(){
     Configuration conf = new Configuration();
-    conf.addDefaultResource("nutch-default.xml");
-    conf.addFinalResource("crawl-tests.xml");
+    conf.addResource("nutch-default.xml");
+    conf.addResource("crawl-tests.xml");
     return conf;
   }