[Archive-access-cvs] archive-access/projects/nutch/src/plugin build.xml,1.5,1.6

[Michael S. <sta...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/nutch/src/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30555/src/plugin

Modified Files:
	build.xml 
Log Message:
Merge 'mapred' branch into HEAD.
* .classpath
* project.properties
    Update to point at new 0.8 nutch.
* build.xml
    Merge in 'mapred'.  Add job target.  
* conf/nutch-site.xml
    Cleanup. Removed unused properties or properties that have same values
    as nutch-default.xml (Except 'searcher.dir' -- keeping that here because
    we'll usually want to change it). Reordered so archive properties are
    towards the end. Brought forward descriptions from nutch-default where
    missing.
* conf/nutch-site.xml.template
    Copy of nutch-site.xml but with the nutchwax defaults turned on.
* src/plugin/build.xml
    Commented out parse-default.
* src/plugin/parse-ext/plugin.xml
    Changed path to parse-pdf.sh.
* src/web/search.jsp
    'mapred' update.
* bin/indexArcs.sh
* conf/ia-parse-plugins.xml 
* lib/commons-codec-1.3.jar 
* src/java/org/archive/access/nutch/ImportArcs.java 
* src/java/org/archive/access/nutch/IndexArcs.java 
    Added.
* bin/arc2seg.sh 
* src/java/org/archive/access/nutch/Arc2Segment.java 
    Removed.


Index: build.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/src/plugin/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** build.xml	25 Jul 2005 20:35:00 -0000	1.5
--- build.xml	29 Nov 2005 21:43:43 -0000	1.6
***************
*** 9,14 ****
       <ant dir="index-ia" target="deploy"/>
       <ant dir="query-ia" target="deploy"/>
!      <ant dir="parse-default" target="deploy"/>
!   </target>
  
    <!-- ====================================================== -->
--- 9,14 ----
       <ant dir="index-ia" target="deploy"/>
       <ant dir="query-ia" target="deploy"/>
! <!--      <ant dir="parse-default" target="deploy"/> -->
!    </target>
  
    <!-- ====================================================== -->
***************
*** 18,22 ****
       <ant dir="index-ia" target="test"/>
       <ant dir="query-ia" target="test"/>
!      <ant dir="parse-default" target="test"/>
    </target>
  
--- 18,22 ----
       <ant dir="index-ia" target="test"/>
       <ant dir="query-ia" target="test"/>
!  <!--     <ant dir="parse-default" target="test"/> -->
    </target>
  
***************
*** 27,31 ****
       <ant dir="index-ia" target="clean"/>
       <ant dir="query-ia" target="clean"/>
!      <ant dir="parse-default" target="clean"/>
    </target>
  
--- 27,31 ----
       <ant dir="index-ia" target="clean"/>
       <ant dir="query-ia" target="clean"/>
!  <!--     <ant dir="parse-default" target="clean"/> -->
    </target>