Author: jnioche Date: Wed Jul 9 14:01:20 2014 New Revision: 1609158 URL: http://svn.apache.org/r1609158 Log: NUTCH-1799 ANT Eclipse task discovers all plugin jars automatically (jnioche)
Modified: nutch/trunk/CHANGES.txt nutch/trunk/build.xml Modified: nutch/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1609158&r1=1609157&r2=1609158&view=diff ============================================================================== --- nutch/trunk/CHANGES.txt (original) +++ nutch/trunk/CHANGES.txt Wed Jul 9 14:01:20 2014 @@ -2,6 +2,8 @@ Nutch Change Log Nutch Current Development +* NUTCH-1799 ANT Eclipse task discovers all plugin jars automatically (jnioche) + * NUTCH-578 URL fetched with 403 is generated over and over again (snagel) * NUTCH-1776 Log incorrect plugin.folder file path (Diaa via snagel) Modified: nutch/trunk/build.xml URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1609158&r1=1609157&r2=1609158&view=diff ============================================================================== --- nutch/trunk/build.xml (original) +++ nutch/trunk/build.xml Wed Jul 9 14:01:20 2014 @@ -900,6 +900,9 @@ <include name="*.jar" /> <exclude name="ant-eclipse-1.0-jvm1.2.jar" /> </fileset> + <fileset dir="${build.plugins}"> + <include name="**/*.jar" /> + </fileset> </path> <!-- target: ant-eclipse-download =================================== --> @@ -936,99 +939,86 @@ <library path="${conf.dir}" exported="false" /> <library path="${basedir}/src/bin" exported="false" /> <library pathref="eclipse.classpath" exported="false" /> - <library path="${basedir}/build/plugins/urlfilter-automaton/automaton-1.11-8.jar" - exported="false" /> - <library path="${basedir}/src/plugin/parse-swf/lib/javaswf.jar" - exported="false" /> - <library path="${basedir}/build/plugins/feed/jdom-1.1.jar" - exported="false" /> - <library path="${basedir}/build/plugins/feed/rome-0.9.jar" - exported="false" /> - <library path="${basedir}/build/plugins/lib-nekohtml/nekohtml-1.9.19.jar" - exported="false" /> - <library path="${basedir}/build/plugins/parse-html/tagsoup-1.2.1.jar" - exported="false" /> - <library path="${basedir}/build/plugins/indexer-solr/solr-solrj-3.4.0.jar" - exported="false" /> - + <source path="${basedir}/src/java/" /> <source path="${basedir}/src/test/" /> - <source path="${basedir}/src/plugin/creativecommons/src/java/" /> - <source path="${basedir}/src/plugin/creativecommons/src/test/" /> - <source path="${basedir}/src/plugin/feed/src/java/" /> - <source path="${basedir}/src/plugin/feed/src/test/" /> - <source path="${basedir}/src/plugin/headings/src/java/" /> - <source path="${basedir}/src/plugin/index-anchor/src/java/" /> - <source path="${basedir}/src/plugin/index-anchor/src/test/" /> - <source path="${basedir}/src/plugin/index-basic/src/java/" /> - <source path="${basedir}/src/plugin/index-basic/src/test/" /> - <source path="${basedir}/src/plugin/indexer-dummy/src/java/" /> - <source path="${basedir}/src/plugin/indexer-solr/src/java/" /> - <source path="${basedir}/src/plugin/indexer-elastic/src/java/" /> - <source path="${basedir}/src/plugin/index-metadata/src/java/" /> - <source path="${basedir}/src/plugin/index-more/src/java/" /> - <source path="${basedir}/src/plugin/index-more/src/test/" /> - <source path="${basedir}/src/plugin/index-static/src/java/" /> - <source path="${basedir}/src/plugin/index-static/src/test/" /> - <source path="${basedir}/src/plugin/language-identifier/src/java/" /> - <source path="${basedir}/src/plugin/language-identifier/src/test/" /> - <source path="${basedir}/src/plugin/lib-http/src/java/" /> - <source path="${basedir}/src/plugin/lib-http/src/test/" /> - <source path="${basedir}/src/plugin/lib-regex-filter/src/java/" /> - <source path="${basedir}/src/plugin/lib-regex-filter/src/test/" /> - <source path="${basedir}/src/plugin/microformats-reltag/src/java/" /> - <source path="${basedir}/src/plugin/parse-ext/src/java/" /> - <source path="${basedir}/src/plugin/parse-ext/src/test/" /> - <source path="${basedir}/src/plugin/parse-html/src/java/" /> - <source path="${basedir}/src/plugin/parse-html/src/test/" /> - <source path="${basedir}/src/plugin/parse-js/src/java/" /> - <source path="${basedir}/src/plugin/parse-metatags/src/java/" /> - <source path="${basedir}/src/plugin/parse-metatags/src/test/" /> - <source path="${basedir}/src/plugin/parse-swf/src/java/" /> - <source path="${basedir}/src/plugin/parse-swf/src/test/" /> - <source path="${basedir}/src/plugin/parse-tika/src/java/" /> - <source path="${basedir}/src/plugin/parse-tika/src/test/" /> - <source path="${basedir}/src/plugin/parse-zip/src/java/" /> - <source path="${basedir}/src/plugin/parse-zip/src/test/" /> - <source path="${basedir}/src/plugin/protocol-file/src/java/" /> - <source path="${basedir}/src/plugin/protocol-file/src/test/" /> - <source path="${basedir}/src/plugin/protocol-ftp/src/java/" /> - <source path="${basedir}/src/plugin/protocol-httpclient/src/java/" /> - <source path="${basedir}/src/plugin/protocol-httpclient/src/test/" /> - <source path="${basedir}/src/plugin/protocol-http/src/java/" /> - <source path="${basedir}/src/plugin/protocol-http/src/test/" /> - <source path="${basedir}/src/plugin/scoring-depth/src/java/" /> - <source path="${basedir}/src/plugin/scoring-link/src/java/" /> - <source path="${basedir}/src/plugin/scoring-opic/src/java/" /> - <source path="${basedir}/src/plugin/subcollection/src/java/" /> - <source path="${basedir}/src/plugin/subcollection/src/test/" /> - <source path="${basedir}/src/plugin/tld/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-automaton/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-automaton/src/test/" /> - <source path="${basedir}/src/plugin/urlfilter-domainblacklist/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-domainblacklist/src/test/" /> - <source path="${basedir}/src/plugin/urlfilter-domain/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-domain/src/test/" /> - <source path="${basedir}/src/plugin/urlfilter-prefix/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-regex/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-regex/src/test/" /> - <source path="${basedir}/src/plugin/urlfilter-suffix/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-suffix/src/test/" /> - <source path="${basedir}/src/plugin/urlfilter-validator/src/java/" /> - <source path="${basedir}/src/plugin/urlfilter-validator/src/test/" /> - <source path="${basedir}/src/plugin/urlmeta/src/java/" /> - <source path="${basedir}/src/plugin/urlnormalizer-basic/src/java/" /> - <source path="${basedir}/src/plugin/urlnormalizer-basic/src/test/" /> - <source path="${basedir}/src/plugin/urlnormalizer-host/src/java/" /> - <source path="${basedir}/src/plugin/urlnormalizer-host/src/test/" /> - <source path="${basedir}/src/plugin/urlnormalizer-pass/src/java/" /> - <source path="${basedir}/src/plugin/urlnormalizer-pass/src/test/" /> - <source path="${basedir}/src/plugin/urlnormalizer-regex/src/java/" /> - <source path="${basedir}/src/plugin/urlnormalizer-regex/src/test/" /> - <source path="${basedir}/src/plugin/urlnormalizer-querystring/src/java/" /> - <source path="${basedir}/src/plugin/urlnormalizer-querystring/src/test/" /> + + <source path="${plugins.dir}/creativecommons/src/java/" /> + <source path="${plugins.dir}/creativecommons/src/test/" /> + <source path="${plugins.dir}/feed/src/java/" /> + <source path="${plugins.dir}/feed/src/test/" /> + <source path="${plugins.dir}/headings/src/java/" /> + <source path="${plugins.dir}/index-anchor/src/java/" /> + <source path="${plugins.dir}/index-anchor/src/test/" /> + <source path="${plugins.dir}/index-basic/src/java/" /> + <source path="${plugins.dir}/index-basic/src/test/" /> + <source path="${plugins.dir}/indexer-dummy/src/java/" /> + <source path="${plugins.dir}/indexer-solr/src/java/" /> + <source path="${plugins.dir}/indexer-elastic/src/java/" /> + <source path="${plugins.dir}/index-metadata/src/java/" /> + <source path="${plugins.dir}/index-more/src/java/" /> + <source path="${plugins.dir}/index-more/src/test/" /> + <source path="${plugins.dir}/index-static/src/java/" /> + <source path="${plugins.dir}/index-static/src/test/" /> + <source path="${plugins.dir}/language-identifier/src/java/" /> + <source path="${plugins.dir}/language-identifier/src/test/" /> + <source path="${plugins.dir}/lib-http/src/java/" /> + <source path="${plugins.dir}/lib-http/src/test/" /> + <source path="${plugins.dir}/lib-regex-filter/src/java/" /> + <source path="${plugins.dir}/lib-regex-filter/src/test/" /> + <source path="${plugins.dir}/microformats-reltag/src/java/" /> + <source path="${plugins.dir}/parse-ext/src/java/" /> + <source path="${plugins.dir}/parse-ext/src/test/" /> + <source path="${plugins.dir}/parse-html/src/java/" /> + <source path="${plugins.dir}/parse-html/src/test/" /> + <source path="${plugins.dir}/parse-js/src/java/" /> + <source path="${plugins.dir}/parse-metatags/src/java/" /> + <source path="${plugins.dir}/parse-metatags/src/test/" /> + <source path="${plugins.dir}/parse-swf/src/java/" /> + <source path="${plugins.dir}/parse-swf/src/test/" /> + <source path="${plugins.dir}/parse-tika/src/java/" /> + <source path="${plugins.dir}/parse-tika/src/test/" /> + <source path="${plugins.dir}/parse-zip/src/java/" /> + <source path="${plugins.dir}/parse-zip/src/test/" /> + <source path="${plugins.dir}/protocol-file/src/java/" /> + <source path="${plugins.dir}/protocol-file/src/test/" /> + <source path="${plugins.dir}/protocol-ftp/src/java/" /> + <source path="${plugins.dir}/protocol-httpclient/src/java/" /> + <source path="${plugins.dir}/protocol-httpclient/src/test/" /> + <source path="${plugins.dir}/protocol-http/src/java/" /> + <source path="${plugins.dir}/protocol-http/src/test/" /> + <source path="${plugins.dir}/scoring-depth/src/java/" /> + <source path="${plugins.dir}/scoring-link/src/java/" /> + <source path="${plugins.dir}/scoring-opic/src/java/" /> + <source path="${plugins.dir}/subcollection/src/java/" /> + <source path="${plugins.dir}/subcollection/src/test/" /> + <source path="${plugins.dir}/tld/src/java/" /> + <source path="${plugins.dir}/urlfilter-automaton/src/java/" /> + <source path="${plugins.dir}/urlfilter-automaton/src/test/" /> + <source path="${plugins.dir}/urlfilter-domainblacklist/src/java/" /> + <source path="${plugins.dir}/urlfilter-domainblacklist/src/test/" /> + <source path="${plugins.dir}/urlfilter-domain/src/java/" /> + <source path="${plugins.dir}/urlfilter-domain/src/test/" /> + <source path="${plugins.dir}/urlfilter-prefix/src/java/" /> + <source path="${plugins.dir}/urlfilter-regex/src/java/" /> + <source path="${plugins.dir}/urlfilter-regex/src/test/" /> + <source path="${plugins.dir}/urlfilter-suffix/src/java/" /> + <source path="${plugins.dir}/urlfilter-suffix/src/test/" /> + <source path="${plugins.dir}/urlfilter-validator/src/java/" /> + <source path="${plugins.dir}/urlfilter-validator/src/test/" /> + <source path="${plugins.dir}/urlmeta/src/java/" /> + <source path="${plugins.dir}/urlnormalizer-basic/src/java/" /> + <source path="${plugins.dir}/urlnormalizer-basic/src/test/" /> + <source path="${plugins.dir}/urlnormalizer-host/src/java/" /> + <source path="${plugins.dir}/urlnormalizer-host/src/test/" /> + <source path="${plugins.dir}/urlnormalizer-pass/src/java/" /> + <source path="${plugins.dir}/urlnormalizer-pass/src/test/" /> + <source path="${plugins.dir}/urlnormalizer-regex/src/java/" /> + <source path="${plugins.dir}/urlnormalizer-regex/src/test/" /> + <source path="${plugins.dir}/urlnormalizer-querystring/src/java/" /> + <source path="${plugins.dir}/urlnormalizer-querystring/src/test/" /> - <output path="${basedir}/build/classes" /> + <output path="${build.classes}" /> </classpath> </eclipse> </target>