Update of /cvsroot/archive-access/archive-access/projects/nutch
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30318
Modified Files:
build.xml maven.xml
Log Message:
* build.xml
Fix the nutch-site.xml copy. We were picking up default nutch-site.xml rather
than the nutchwax specific nutch-site.template (formerly nutch-site.xml.nutchwax).
* maven.xml
Renamed nutch-site.xml as nutch-site.xml.template to align with how nutch does
template naming.
* conf/nutch-site.xml.template
Added. Rename of nutch-site.xml.nutchwax.
* conf/nutch-site.xml.nutchwax
Removed.
Index: maven.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/maven.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** maven.xml 22 Oct 2005 02:43:23 -0000 1.12
--- maven.xml 4 Nov 2005 19:23:58 -0000 1.13
***************
*** 41,45 ****
</postGoal>
-
<postGoal name="dist:prepare-bin-filesystem">
<echo>[nutchwax] dist:prepare-bin-filesystem postGoal</echo>
--- 41,44 ----
***************
*** 123,127 ****
in place to a viewer such as wera.-->
<copy tofile="${maven.dist.bin.assembly.dir}/conf/nutch-site.xml"
! file="${basedir}/conf/nutch-site.xml.nutchwax" filtering="true"
overwrite="true" />
<attainGoal name="copy_docbook" />
--- 122,126 ----
in place to a viewer such as wera.-->
<copy tofile="${maven.dist.bin.assembly.dir}/conf/nutch-site.xml"
! file="${basedir}/conf/nutch-site.xml.template" filtering="true"
overwrite="true" />
<attainGoal name="copy_docbook" />
Index: build.xml
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/nutch/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** build.xml 26 Jul 2005 20:38:53 -0000 1.10
--- build.xml 4 Nov 2005 19:23:58 -0000 1.11
***************
*** 152,155 ****
--- 152,160 ----
<!-- ================================================================== -->
<target name="war" depends="jar, compile-plugins">
+ <!--Copy our nutchwax nutch-site.xml template into the build dir as
+ nutch-site.xml. Then in the below, add it into the WEB-INF/classes dir.
+ -->
+ <copy file="${root}/conf/nutch-site.xml.template"
+ tofile="${build.dir}/nutch-site.xml" />
<war destfile="${build.dir}/${name}.war"
webxml="${this.web}/web.xml">
***************
*** 159,164 ****
</fileset>
<fileset dir="${this.web}"/>
! <classes dir="${nutch.root}/conf" excludes="**/*.template"/>
! <classes dir="${root}/conf"/>
<classes dir="${nutch.web}/locale"/>
<zipfileset dir="${nutch.root}/build/docs" includes="**/include/*.html"/>
--- 164,176 ----
</fileset>
<fileset dir="${this.web}"/>
! <classes dir="${nutch.root}/conf" >
! <exclude name="nutch-site.xml" />
! <exclude name="**/*.template"/>
! </classes>
! <classes dir="${root}/conf">
! <exclude name="**/*.template"/>
! <exclude name="nutch-site.xml" />
! </classes>
! <classes file="${build.dir}/nutch-site.xml" />
<classes dir="${nutch.web}/locale"/>
<zipfileset dir="${nutch.root}/build/docs" includes="**/include/*.html"/>
|
