svn commit: r208677 - in /lucene/nutch/branches/mapred: conf/mapred-default.xml.template src/java/org/apache/nutch/mapred/JobConf.java

[mc]

Author: mc
Date: Thu Jun 30 13:21:01 2005
New Revision: 208677

URL: http://svn.apache.org/viewcvs?rev=208677&view=rev
Log:

  JobConf now loads the mapred-default.xml file to obtain
mapreduce params.  The params can be overruled by user input,
but will not be overruled by nutch defaults.  Site-specific
mapred params should go into this file.  That way, users still
have the flexibility to change them, but not setting mapred
values will still result in reasonable choices.


Added:
    lucene/nutch/branches/mapred/conf/mapred-default.xml.template
Modified:
    lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java

Added: lucene/nutch/branches/mapred/conf/mapred-default.xml.template
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/conf/mapred-default.xml.template?rev=208677&view=auto
==============================================================================
--- lucene/nutch/branches/mapred/conf/mapred-default.xml.template (added)
+++ lucene/nutch/branches/mapred/conf/mapred-default.xml.template Thu Jun 30 
13:21:01 2005
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="nutch-conf.xsl"?>
+
+<!-- Put mapred-specific property overrides in this file. -->
+
+<nutch-conf>
+
+</nutch-conf>

Modified: 
lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java
URL: 
http://svn.apache.org/viewcvs/lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java?rev=208677&r1=208676&r2=208677&view=diff
==============================================================================
--- lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java 
(original)
+++ lucene/nutch/branches/mapred/src/java/org/apache/nutch/mapred/JobConf.java 
Thu Jun 30 13:21:01 2005
@@ -72,6 +72,7 @@
    */
   public JobConf(File config) {
     super();
+    addConfResource("mapred-default.xml");
     addConfResource(config);
   }