From: Michael S. <sta...@us...> - 2005-09-02 01:08:34
|
Update of /cvsroot/archive-access/archive-access/projects/nutch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25769 Modified Files: .classpath maven.xml project.properties project.xml Log Message: Make mergesegs work with our segments by providing our own versin of SegmentMergeTool and our own version of nutch script that invokes our tool instead of standard nutch's. * .classpath Changed the nutch jar to refer to 0.7 release. * maven.xml Copy over the nutch bins first then ours. Overwrite. This way our version of nutch script sits on top of theirs. * project.properties * project.xml Reference lucene. * bin/arcs2segs.sh * bin/indexarcs.sh Add in setting of logging level. Index: maven.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/maven.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** maven.xml 29 Jul 2005 22:12:23 -0000 1.8 --- maven.xml 2 Sep 2005 01:08:18 -0000 1.9 *************** *** 91,100 **** file="${basedir}/conf/nutch-site.xml.all" filtering="true" /> ! <!--Fill the bin dir.--> ! <copy todir="${maven.dist.bin.assembly.dir}/bin" filtering="true"> ! <fileset dir="${basedir}/bin"> <include name="*"/> </fileset> ! <fileset dir="${nutch.dir}/bin"> <include name="*"/> </fileset> --- 91,103 ---- file="${basedir}/conf/nutch-site.xml.all" filtering="true" /> ! <!--Fill the bin dir. Fill from nutch first. Then from nutchwax ! because we want to overwrite the nutch script with the nutchwax ! version.--> ! <copy todir="${maven.dist.bin.assembly.dir}/bin" ! filtering="true" overwrite="true" > ! <fileset dir="${nutch.dir}/bin"> <include name="*"/> </fileset> ! <fileset dir="${basedir}/bin"> <include name="*"/> </fileset> Index: project.properties =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/project.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** project.properties 19 Aug 2005 21:38:36 -0000 1.12 --- project.properties 2 Sep 2005 01:08:18 -0000 1.13 *************** *** 18,22 **** # Local jars to add to classpath. maven.jar.override = on ! maven.jar.corenutch = ${basedir}/nutch/build/nutch-0.7-dev.jar maven.jar.arc = ${basedir}/lib/arc-1.5.1-200508191341.jar maven.jar.servlet-api = ${basedir}/nutch/lib/servlet-api.jar --- 18,23 ---- # Local jars to add to classpath. maven.jar.override = on ! maven.jar.corenutch = ${basedir}/nutch/build/nutch-0.7.jar ! maven.jar.lucene = ${basedir}/nutch/lib/lucene-1.9-rc1-dev.jar maven.jar.arc = ${basedir}/lib/arc-1.5.1-200508191341.jar maven.jar.servlet-api = ${basedir}/nutch/lib/servlet-api.jar Index: project.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/project.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** project.xml 2 Aug 2005 22:11:08 -0000 1.18 --- project.xml 2 Sep 2005 01:08:18 -0000 1.19 *************** *** 174,177 **** --- 174,189 ---- </dependency> <dependency> + <id>lucene</id> + <version>1_9-rc1-dev</version> + <url>http://nutch.org/</url> + <properties> + <war.bundle>true</war.bundle> + <description>Search library from nutch. + </description> + <license>Apache 2.0 + http://www.apache.org/licenses/LICENSE-2.0</license> + </properties> + </dependency> + <dependency> <id>servlet-api</id> <version>2.3</version> Index: .classpath =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/nutch/.classpath,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** .classpath 19 Aug 2005 21:38:35 -0000 1.10 --- .classpath 2 Sep 2005 01:08:18 -0000 1.11 *************** *** 7,11 **** <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="nutch/lib/lucene-1.9-rc1-dev.jar"/> ! <classpathentry kind="lib" path="nutch/build/nutch-0.7-dev.jar"/> <classpathentry kind="lib" path="lib/arc-1.5.1-200508191341.jar"/> <classpathentry kind="lib" path="lib/commons-httpclient-3.0-alpha2.jar"/> --- 7,11 ---- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="nutch/lib/lucene-1.9-rc1-dev.jar"/> ! <classpathentry kind="lib" path="nutch/build/nutch-0.7.jar"/> <classpathentry kind="lib" path="lib/arc-1.5.1-200508191341.jar"/> <classpathentry kind="lib" path="lib/commons-httpclient-3.0-alpha2.jar"/> *************** *** 14,17 **** --- 14,19 ---- <classpathentry kind="lib" path="nutch/lib/servlet-api.jar"/> <classpathentry sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/> + <classpathentry kind="lib" path="nutch/conf"/> + <classpathentry kind="lib" path="nutch/lib/jakarta-oro-2.0.7.jar"/> <classpathentry kind="output" path="target"/> </classpath> |