svn commit: r885156 - in /lucene/nutch/trunk: CHANGES.txt build.xml

[ab...@apache.org]

Author: ab
Date: Sat Nov 28 22:29:22 2009
New Revision: 885156

URL: http://svn.apache.org/viewvc?rev=885156&view=rev
Log:
NUTCH-741 Job file includes multiple copies of nutch config files.

Modified:
    lucene/nutch/trunk/CHANGES.txt
    lucene/nutch/trunk/build.xml

Modified: lucene/nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?rev=885156&r1=885155&r2=885156&view=diff
==============================================================================
--- lucene/nutch/trunk/CHANGES.txt (original)
+++ lucene/nutch/trunk/CHANGES.txt Sat Nov 28 22:29:22 2009
@@ -2,6 +2,9 @@
 
 Unreleased Changes
 
+* NUTCH-741 Job file includes multiple copies of nutch config files
+  (Kirby Bohling via ab)
+
 * NUTCH-739 SolrDeleteDuplications too slow when using hadoop (Dmitry Lihachev via ab)
 
 * NUTCH-738 Close SegmentUpdater when FetchedSegments is closed

Modified: lucene/nutch/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/nutch/trunk/build.xml?rev=885156&r1=885155&r2=885156&view=diff
==============================================================================
--- lucene/nutch/trunk/build.xml (original)
+++ lucene/nutch/trunk/build.xml Sat Nov 28 22:29:22 2009
@@ -149,7 +149,12 @@
   <!-- ================================================================== -->
   <target name="job" depends="compile">
     <jar jarfile="${build.dir}/${final.name}.job">
-      <zipfileset dir="${build.classes}"/>
+      <!-- If the build.classes has the nutch config files because the jar
+           command command has run, exclude them.  The conf directory has 
+           them.
+      -->
+      <zipfileset dir="${build.classes}"
+                  excludes="nutch-default.xml,nutch-site.xml"/>
       <zipfileset dir="${conf.dir}" excludes="*.template,hadoop*.*"/>
       <zipfileset dir="${lib.dir}" prefix="lib"
                   includes="**/*.jar" excludes="hadoop-*.jar"/>