Author: jerome Date: Fri Feb 17 15:28:39 2006 New Revision: 378655 URL: http://svn.apache.org/viewcvs?rev=378655&view=rev Log: Review plugins building and testing
Modified: lucene/nutch/trunk/src/plugin/analysis-de/build.xml lucene/nutch/trunk/src/plugin/analysis-fr/build.xml lucene/nutch/trunk/src/plugin/build-plugin.xml lucene/nutch/trunk/src/plugin/build.xml lucene/nutch/trunk/src/plugin/clustering-carrot2/build.xml lucene/nutch/trunk/src/plugin/creativecommons/build.xml lucene/nutch/trunk/src/plugin/index-basic/build.xml lucene/nutch/trunk/src/plugin/index-more/build.xml lucene/nutch/trunk/src/plugin/languageidentifier/build.xml lucene/nutch/trunk/src/plugin/lib-commons-httpclient/build.xml lucene/nutch/trunk/src/plugin/lib-http/build.xml lucene/nutch/trunk/src/plugin/lib-jakarta-poi/build.xml lucene/nutch/trunk/src/plugin/lib-log4j/build.xml lucene/nutch/trunk/src/plugin/lib-lucene-analyzers/build.xml lucene/nutch/trunk/src/plugin/lib-nekohtml/build.xml lucene/nutch/trunk/src/plugin/lib-parsems/build.xml lucene/nutch/trunk/src/plugin/ontology/build.xml lucene/nutch/trunk/src/plugin/parse-ext/build.xml lucene/nutch/trunk/src/plugin/parse-html/build.xml lucene/nutch/trunk/src/plugin/parse-js/build.xml lucene/nutch/trunk/src/plugin/parse-mp3/build.xml lucene/nutch/trunk/src/plugin/parse-msexcel/build.xml lucene/nutch/trunk/src/plugin/parse-mspowerpoint/build.xml lucene/nutch/trunk/src/plugin/parse-msword/build.xml lucene/nutch/trunk/src/plugin/parse-pdf/build.xml lucene/nutch/trunk/src/plugin/parse-rss/build.xml lucene/nutch/trunk/src/plugin/parse-rtf/build.xml lucene/nutch/trunk/src/plugin/parse-swf/build.xml lucene/nutch/trunk/src/plugin/parse-text/build.xml lucene/nutch/trunk/src/plugin/parse-zip/build.xml lucene/nutch/trunk/src/plugin/protocol-file/build.xml lucene/nutch/trunk/src/plugin/protocol-ftp/build.xml lucene/nutch/trunk/src/plugin/protocol-http/build.xml lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml lucene/nutch/trunk/src/plugin/query-basic/build.xml lucene/nutch/trunk/src/plugin/query-more/build.xml lucene/nutch/trunk/src/plugin/query-site/build.xml lucene/nutch/trunk/src/plugin/query-url/build.xml lucene/nutch/trunk/src/plugin/urlfilter-prefix/build.xml lucene/nutch/trunk/src/plugin/urlfilter-regex/build.xml Modified: lucene/nutch/trunk/src/plugin/analysis-de/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/analysis-de/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/analysis-de/build.xml (original) +++ lucene/nutch/trunk/src/plugin/analysis-de/build.xml Fri Feb 17 15:28:39 2006 @@ -4,9 +4,16 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-lucene-analyzers"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../lib-lucene-analyzers/lib"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-lucene-analyzers/*.jar" /> </fileset> </path> Modified: lucene/nutch/trunk/src/plugin/analysis-fr/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/analysis-fr/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/analysis-fr/build.xml (original) +++ lucene/nutch/trunk/src/plugin/analysis-fr/build.xml Fri Feb 17 15:28:39 2006 @@ -4,9 +4,16 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-lucene-analyzers"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../lib-lucene-analyzers/lib"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-lucene-analyzers/*.jar" /> </fileset> </path> Modified: lucene/nutch/trunk/src/plugin/build-plugin.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/build-plugin.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/build-plugin.xml (original) +++ lucene/nutch/trunk/src/plugin/build-plugin.xml Fri Feb 17 15:28:39 2006 @@ -68,10 +68,22 @@ <!-- to be overridden by sub-projects --> <target name="init-plugin"/> + <!-- + ! Used to build plugin compilation dependencies + ! (to be overridden by plugins) + !--> + <target name="deps-jar"/> + + <!-- + ! Used to deploy plugin runtime dependencies + ! (to be overridden by plugins) + !--> + <target name="deps-test"/> + <!-- ====================================================== --> <!-- Compile the Java files --> <!-- ====================================================== --> - <target name="compile" depends="init"> + <target name="compile" depends="init,deps-jar"> <echo message="Compiling plugin: ${name}"/> <javac encoding="${build.encoding}" @@ -104,7 +116,7 @@ <!-- ================================================================== --> <!-- --> <!-- ================================================================== --> - <target name="deploy" depends="jar"> + <target name="deploy" depends="jar, deps-test"> <mkdir dir="${deploy.dir}"/> <copy file="plugin.xml" todir="${deploy.dir}" preservelastmodified="true"/> Modified: lucene/nutch/trunk/src/plugin/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/build.xml (original) +++ lucene/nutch/trunk/src/plugin/build.xml Fri Feb 17 15:28:39 2006 @@ -6,6 +6,11 @@ <!-- Build & deploy all the plugin jars. --> <!-- ====================================================== --> <target name="deploy"> + <ant dir="clustering-carrot2" target="deploy"/> + <ant dir="creativecommons" target="deploy"/> + <ant dir="index-basic" target="deploy"/> + <ant dir="index-more" target="deploy"/> + <ant dir="languageidentifier" target="deploy"/> <ant dir="lib-commons-httpclient" target="deploy"/> <ant dir="lib-http" target="deploy"/> <ant dir="lib-jakarta-poi" target="deploy"/> @@ -13,11 +18,6 @@ <ant dir="lib-lucene-analyzers" target="deploy"/> <ant dir="lib-nekohtml" target="deploy"/> <ant dir="lib-parsems" target="deploy"/> - <ant dir="clustering-carrot2" target="deploy"/> - <ant dir="creativecommons" target="deploy"/> - <ant dir="index-basic" target="deploy"/> - <ant dir="index-more" target="deploy"/> - <ant dir="languageidentifier" target="deploy"/> <ant dir="nutch-extensionpoints" target="deploy"/> <ant dir="ontology" target="deploy"/> <ant dir="protocol-file" target="deploy"/> @@ -54,7 +54,7 @@ <ant dir="languageidentifier" target="test"/> <ant dir="lib-http" target="test"/> <ant dir="ontology" target="test"/> - <ant dir="parse-ext" target="test"/> + <!--ant dir="parse-ext" target="test"/--> <ant dir="parse-html" target="test"/> <!-- <ant dir="parse-mp3" target="test"/> --> <ant dir="parse-msexcel" target="test"/> Modified: lucene/nutch/trunk/src/plugin/clustering-carrot2/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/clustering-carrot2/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/clustering-carrot2/build.xml (original) +++ lucene/nutch/trunk/src/plugin/clustering-carrot2/build.xml Fri Feb 17 15:28:39 2006 @@ -4,11 +4,26 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-log4j"/> + <ant target="jar" inheritall="false" dir="../lib-nekohtml"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> <fileset dir="${nutch.root}/build"> <include name="**/lib-log4j/*.jar" /> <include name="**/lib-nekohtml/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-log4j"/> + <ant target="deploy" inheritall="false" dir="../lib-nekohtml"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/creativecommons/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/creativecommons/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/creativecommons/build.xml (original) +++ lucene/nutch/trunk/src/plugin/creativecommons/build.xml Fri Feb 17 15:28:39 2006 @@ -4,6 +4,18 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../parse-html"/> + </target> + + <property name="this.web" location="${root}/src/web"/> <property name="nutch.web" location="${nutch.root}/src/web"/> Modified: lucene/nutch/trunk/src/plugin/index-basic/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-basic/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/index-basic/build.xml (original) +++ lucene/nutch/trunk/src/plugin/index-basic/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/index-more/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/index-more/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/index-more/build.xml (original) +++ lucene/nutch/trunk/src/plugin/index-more/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/languageidentifier/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/languageidentifier/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/languageidentifier/build.xml (original) +++ lucene/nutch/trunk/src/plugin/languageidentifier/build.xml Fri Feb 17 15:28:39 2006 @@ -14,5 +14,16 @@ <fileset dir="${src.test}" includes="**/*.test, **/*.txt"/> </copy> </target> - + + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../parse-html"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/lib-commons-httpclient/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-commons-httpclient/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-commons-httpclient/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-commons-httpclient/build.xml Fri Feb 17 15:28:39 2006 @@ -6,13 +6,11 @@ <!-- ! Override the compile and jar targets, - ! since there is nothing to compile here. + ! since there is nothing to compile here. ! --> - <target name="compile" depends="init"> - <echo message="Compiling plugin: ${name}"/> - </target> + <target name="compile" depends="init"/> - <target name="jar" depends="compile"> + <target name="jar"> <copy todir="${build.dir}" verbose="true"> <fileset dir="./lib" includes="**/*.jar"/> </copy> Modified: lucene/nutch/trunk/src/plugin/lib-http/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-http/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-http/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-http/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/lib-jakarta-poi/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-jakarta-poi/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-jakarta-poi/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-jakarta-poi/build.xml Fri Feb 17 15:28:39 2006 @@ -6,12 +6,14 @@ <!-- ! Override the compile and jar targets, - ! since there is nothing to compile here. + ! since there is nothing to compile here. ! --> - <target name="compile" depends="init"> - <echo message="Compiling plugin: ${name}"/> - </target> + <target name="compile" depends="init"/> - <target name="jar" depends="compile"/> + <target name="jar" depends="compile"> + <copy todir="${build.dir}" verbose="true"> + <fileset dir="${root}/lib" includes="**/*.jar"/> + </copy> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/lib-log4j/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-log4j/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-log4j/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-log4j/build.xml Fri Feb 17 15:28:39 2006 @@ -8,10 +8,12 @@ ! Override the compile and jar targets, ! since there is nothing to compile here. ! --> - <target name="compile" depends="init"> - <echo message="Compiling plugin: ${name}"/> - </target> + <target name="compile" depends="init"/> - <target name="jar" depends="compile"/> + <target name="jar" depends="compile"> + <copy todir="${build.dir}" verbose="true"> + <fileset dir="./lib" includes="**/*.jar"/> + </copy> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/lib-lucene-analyzers/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-lucene-analyzers/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-lucene-analyzers/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-lucene-analyzers/build.xml Fri Feb 17 15:28:39 2006 @@ -8,10 +8,12 @@ ! Override the compile and jar targets, ! since there is nothing to compile here. ! --> - <target name="compile" depends="init"> - <echo message="Compiling plugin: ${name}"/> - </target> + <target name="compile" depends="init"/> - <target name="jar" depends="compile"/> + <target name="jar" depends="compile"> + <copy todir="${build.dir}" verbose="true"> + <fileset dir="./lib" includes="**/*.jar"/> + </copy> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/lib-nekohtml/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-nekohtml/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-nekohtml/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-nekohtml/build.xml Fri Feb 17 15:28:39 2006 @@ -6,11 +6,9 @@ <!-- ! Override the compile and jar targets, - ! since there is nothing to compile here. + ! since there is nothing to compile here. ! --> - <target name="compile" depends="init"> - <echo message="Compiling plugin: ${name}"/> - </target> + <target name="compile" depends="init"/> <target name="jar" depends="compile"> <copy todir="${build.dir}" verbose="true"> Modified: lucene/nutch/trunk/src/plugin/lib-parsems/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/lib-parsems/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/lib-parsems/build.xml (original) +++ lucene/nutch/trunk/src/plugin/lib-parsems/build.xml Fri Feb 17 15:28:39 2006 @@ -4,10 +4,23 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-jakarta-poi"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../lib-jakarta-poi/lib"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-jakarta-poi/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/ontology/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/ontology/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/ontology/build.xml (original) +++ lucene/nutch/trunk/src/plugin/ontology/build.xml Fri Feb 17 15:28:39 2006 @@ -4,6 +4,17 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + </target> + + <!-- for junit test --> <mkdir dir="${build.test}/data"/> <copy file="sample/time.owl" todir="${build.test}/data"/> Modified: lucene/nutch/trunk/src/plugin/parse-ext/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-ext/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-ext/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-ext/build.xml Fri Feb 17 15:28:39 2006 @@ -4,6 +4,18 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + + <copy file="command" todir="${deploy.dir}" preservelastmodified="true"/> <chmod file="${deploy.dir}/command" perm="755"/> Modified: lucene/nutch/trunk/src/plugin/parse-html/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-html/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-html/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-html/build.xml Fri Feb 17 15:28:39 2006 @@ -4,10 +4,23 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-nekohtml"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> <fileset dir="${nutch.root}/build"> <include name="**/lib-nekohtml/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-nekohtml"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/parse-js/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-js/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-js/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-js/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/parse-mp3/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-mp3/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-mp3/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-mp3/build.xml Fri Feb 17 15:28:39 2006 @@ -4,6 +4,11 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + <!-- for junit test --> <mkdir dir="${build.test}/data"/> <copy file="sample/postgresql-id3v1.mp3" todir="${build.test}/data"/> Modified: lucene/nutch/trunk/src/plugin/parse-msexcel/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-msexcel/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-msexcel/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-msexcel/build.xml Fri Feb 17 15:28:39 2006 @@ -4,14 +4,28 @@ <import file="../build-plugin.xml" /> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="jar" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="jar" inheritall="false" dir="../lib-parsems"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../lib-jakarta-poi/lib"> - <include name="*.jar" /> - </fileset> - <fileset dir="../../../build/lib-parsems"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-jakarta-poi/*.jar" /> + <include name="**/lib-parsems/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="deploy" inheritall="false" dir="../lib-parsems"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + <!-- for junit test --> <mkdir dir="${build.test}/data" /> Modified: lucene/nutch/trunk/src/plugin/parse-mspowerpoint/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-mspowerpoint/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-mspowerpoint/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-mspowerpoint/build.xml Fri Feb 17 15:28:39 2006 @@ -2,50 +2,64 @@ <project name="parse-mspowerpoint" default="jar"> - <import file="../build-plugin.xml" /> + <import file="../build-plugin.xml" /> - <path id="plugin.deps"> - <fileset dir="../lib-jakarta-poi/lib"> - <include name="*.jar" /> - </fileset> - <fileset dir="../../../build/lib-parsems"> - <include name="*.jar" /> - </fileset> - </path> - - <!-- for junit test --> - <mkdir dir="${build.test}/data" /> - <copy todir="${build.test}/data"> - <fileset dir="sample"> - <include name="*.ppt" /> - <include name="*.content" /> - <include name="*.meta" /> - </fileset> - </copy> - - <!-- ================================================================== --> - <!-- Run unit tests --> - <!-- ================================================================== --> - <target name="test" depends="compile-test, deploy" if="test.available"> - <echo message="Testing plugin: ${name}"/> - - <junit printsummary="yes" haltonfailure="no" fork="yes" - errorProperty="tests.failed" failureProperty="tests.failed"> - <sysproperty key="test.data" value="${build.test}/data"/> - <sysproperty key="test.input" value="${root}/data"/> - <classpath refid="test.classpath"/> - <formatter type="plain" /> - <batchtest todir="${build.test}" unless="testcase"> - <fileset dir="${src.test}" - includes="**/AllTests.java" excludes="**/${test.exclude}.java" /> - </batchtest> - <batchtest todir="${build.test}" if="testcase"> - <fileset dir="${src.test}" includes="**/${testcase}.java"/> - </batchtest> - </junit> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="jar" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="jar" inheritall="false" dir="../lib-parsems"/> + </target> - <fail if="tests.failed">Tests failed!</fail> + <!-- Add compilation dependencies to classpath --> + <path id="plugin.deps"> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-jakarta-poi/*.jar" /> + <include name="**/lib-parsems/*.jar" /> + </fileset> + </path> - </target> + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="deploy" inheritall="false" dir="../lib-parsems"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + + + <!-- for junit test --> + <mkdir dir="${build.test}/data" /> + <copy todir="${build.test}/data"> + <fileset dir="sample"> + <include name="*.ppt" /> + <include name="*.content" /> + <include name="*.meta" /> + </fileset> + </copy> + + <!-- ================================================================== --> + <!-- Run unit tests --> + <!-- ================================================================== --> + <target name="test" depends="compile-test, deploy" if="test.available"> + <echo message="Testing plugin: ${name}"/> + + <junit printsummary="yes" haltonfailure="no" fork="yes" + errorProperty="tests.failed" failureProperty="tests.failed"> + <sysproperty key="test.data" value="${build.test}/data"/> + <sysproperty key="test.input" value="${root}/data"/> + <classpath refid="test.classpath"/> + <formatter type="plain" /> + <batchtest todir="${build.test}" unless="testcase"> + <fileset dir="${src.test}" + includes="**/AllTests.java" excludes="**/${test.exclude}.java" /> + </batchtest> + <batchtest todir="${build.test}" if="testcase"> + <fileset dir="${src.test}" includes="**/${testcase}.java"/> + </batchtest> + </junit> + + <fail if="tests.failed">Tests failed!</fail> + + </target> </project> Modified: lucene/nutch/trunk/src/plugin/parse-msword/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-msword/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-msword/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-msword/build.xml Fri Feb 17 15:28:39 2006 @@ -4,14 +4,28 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="jar" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="jar" inheritall="false" dir="../lib-parsems"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../lib-jakarta-poi/lib"> - <include name="*.jar" /> - </fileset> - <fileset dir="../../../build/lib-parsems"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-jakarta-poi/*.jar" /> + <include name="**/lib-parsems/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-jakarta-poi"/> + <ant target="deploy" inheritall="false" dir="../lib-parsems"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + <!-- for junit test --> <mkdir dir="${build.test}/data"/> Modified: lucene/nutch/trunk/src/plugin/parse-pdf/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-pdf/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-pdf/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-pdf/build.xml Fri Feb 17 15:28:39 2006 @@ -4,11 +4,26 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-log4j"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../lib-log4j/lib"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-log4j/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-log4j"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + <!-- for junit test --> <mkdir dir="${build.test}/data"/> Modified: lucene/nutch/trunk/src/plugin/parse-rss/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-rss/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-rss/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-rss/build.xml Fri Feb 17 15:28:39 2006 @@ -2,18 +2,32 @@ <project name="parse-rss" default="jar"> - <import file="../build-plugin.xml"/> + <import file="../build-plugin.xml"/> + + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + <ant target="jar" inheritall="false" dir="../lib-log4j"/> + </target> + + <!-- Add compilation dependencies to classpath --> + <path id="plugin.deps"> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-log4j/*.jar" /> + </fileset> + </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-log4j"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../lib-commons-httpclient"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + - <path id="plugin.deps"> - <fileset dir="${nutch.root}/build"> - <include name="**/lib-log4j/*.jar" /> - <include name="**/lib-commons-httpclient/*.jar" /> - </fileset> - </path> - <!-- for junit test --> <mkdir dir="${build.test}/data"/> <copy file="sample/rsstest.rss" todir="${build.test}/data"/> - </project> Modified: lucene/nutch/trunk/src/plugin/parse-rtf/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-rtf/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-rtf/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-rtf/build.xml Fri Feb 17 15:28:39 2006 @@ -3,7 +3,19 @@ <project name="parse-rtf" default="jar"> <import file="../build-plugin.xml"/> - + + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + + <property name="rtf-src.jar" value="tmp/rtf_parser_src.jar"/> <property name="rtf-parser.jar" value="lib/rtf-parser.jar"/> Modified: lucene/nutch/trunk/src/plugin/parse-swf/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-swf/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-swf/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-swf/build.xml Fri Feb 17 15:28:39 2006 @@ -4,6 +4,18 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + </target> + + <!-- for junit test --> <mkdir dir="${build.test}/data"/> <copy file="sample/test1.swf" todir="${build.test}/data"/> Modified: lucene/nutch/trunk/src/plugin/parse-text/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-text/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-text/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-text/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/parse-zip/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/parse-zip/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/parse-zip/build.xml (original) +++ lucene/nutch/trunk/src/plugin/parse-zip/build.xml Fri Feb 17 15:28:39 2006 @@ -3,13 +3,26 @@ <project name="parse-zip" default="jar"> <import file="../build-plugin.xml"/> - - <!-- for junit test --> - <mkdir dir="${build.test}/data" /> - <copy todir="${build.test}/data"> - <fileset dir="sample"> - <include name="*.zip" /> - </fileset> - </copy> + + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + <ant target="deploy" inheritall="false" dir="../protocol-file"/> + <ant target="deploy" inheritall="false" dir="../parse-text"/> + </target> + + + <!-- for junit test --> + <mkdir dir="${build.test}/data" /> + <copy todir="${build.test}/data"> + <fileset dir="sample"> + <include name="*.zip" /> + </fileset> + </copy> </project> Modified: lucene/nutch/trunk/src/plugin/protocol-file/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-file/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-file/build.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-file/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/protocol-ftp/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-ftp/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-ftp/build.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-ftp/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/protocol-http/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-http/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-http/build.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-http/build.xml Fri Feb 17 15:28:39 2006 @@ -4,10 +4,22 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="jar" inheritall="false" dir="../lib-http"/> + </target> + + <!-- Add compilation dependencies to classpath --> <path id="plugin.deps"> - <fileset dir="../../../build/lib-http"> - <include name="*.jar" /> + <fileset dir="${nutch.root}/build"> + <include name="**/lib-http/*.jar" /> </fileset> </path> + + <!-- Deploy Unit test dependencies --> + <target name="deps-test"> + <ant target="deploy" inheritall="false" dir="../lib-http"/> + <ant target="deploy" inheritall="false" dir="../nutch-extensionpoints"/> + </target> </project> Modified: lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml (original) +++ lucene/nutch/trunk/src/plugin/protocol-httpclient/build.xml Fri Feb 17 15:28:39 2006 @@ -4,6 +4,11 @@ <import file="../build-plugin.xml"/> + <target name="deps-jar"> + <ant target="jar" inheritall="false" dir="../lib-commons-httpclient"/> + <ant target="jar" inheritall="false" dir="../lib-http"/> + </target> + <path id="plugin.deps"> <fileset dir="${nutch.root}/build"> <include name="**/lib-http/*.jar" /> Modified: lucene/nutch/trunk/src/plugin/query-basic/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-basic/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-basic/build.xml (original) +++ lucene/nutch/trunk/src/plugin/query-basic/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/query-more/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-more/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-more/build.xml (original) +++ lucene/nutch/trunk/src/plugin/query-more/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/query-site/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-site/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-site/build.xml (original) +++ lucene/nutch/trunk/src/plugin/query-site/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/query-url/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/query-url/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/query-url/build.xml (original) +++ lucene/nutch/trunk/src/plugin/query-url/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/urlfilter-prefix/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/urlfilter-prefix/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/urlfilter-prefix/build.xml (original) +++ lucene/nutch/trunk/src/plugin/urlfilter-prefix/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> Modified: lucene/nutch/trunk/src/plugin/urlfilter-regex/build.xml URL: http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/plugin/urlfilter-regex/build.xml?rev=378655&r1=378654&r2=378655&view=diff ============================================================================== --- lucene/nutch/trunk/src/plugin/urlfilter-regex/build.xml (original) +++ lucene/nutch/trunk/src/plugin/urlfilter-regex/build.xml Fri Feb 17 15:28:39 2006 @@ -4,4 +4,9 @@ <import file="../build-plugin.xml"/> + <!-- Build compilation dependencies --> + <target name="deps-jar"> + <ant target="compile-core" inheritall="false" dir="${nutch.root}"/> + </target> + </project> ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ Nutch-cvs mailing list Nutch-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nutch-cvs