You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by jn...@apache.org on 2010/07/07 10:48:20 UTC
svn commit: r961306 [1/2] - in /nutch/trunk: ./ ivy/ lib/ lib/jsp-2.1/
src/plugin/ src/plugin/creativecommons/ src/plugin/feed/
src/plugin/feed/lib/ src/plugin/index-anchor/ src/plugin/index-basic/
src/plugin/index-more/ src/plugin/languageidentifier/ ...
Author: jnioche
Date: Wed Jul 7 08:48:17 2010
New Revision: 961306
URL: http://svn.apache.org/viewvc?rev=961306&view=rev
Log:
NUTCH-821: Use IVY in Nutch builds
Added:
nutch/trunk/ivy/
nutch/trunk/ivy/ivy-2.1.0.jar (with props)
nutch/trunk/ivy/ivy-configurations.xml
nutch/trunk/ivy/ivy.xml
nutch/trunk/ivy/ivysettings.xml
nutch/trunk/src/plugin/creativecommons/ivy.xml
nutch/trunk/src/plugin/feed/ivy.xml
nutch/trunk/src/plugin/index-anchor/ivy.xml
nutch/trunk/src/plugin/index-basic/ivy.xml
nutch/trunk/src/plugin/index-more/ivy.xml
nutch/trunk/src/plugin/languageidentifier/ivy.xml
nutch/trunk/src/plugin/lib-http/ivy.xml
nutch/trunk/src/plugin/lib-nekohtml/ivy.xml
nutch/trunk/src/plugin/lib-regex-filter/ivy.xml
nutch/trunk/src/plugin/lib-xml/ivy.xml
nutch/trunk/src/plugin/microformats-reltag/ivy.xml
nutch/trunk/src/plugin/nutch-extensionpoints/ivy.xml
nutch/trunk/src/plugin/parse-ext/ivy.xml
nutch/trunk/src/plugin/parse-js/ivy.xml
nutch/trunk/src/plugin/parse-rss/ivy.xml
nutch/trunk/src/plugin/parse-swf/ivy.xml
nutch/trunk/src/plugin/parse-zip/ivy.xml
nutch/trunk/src/plugin/protocol-file/ivy.xml
nutch/trunk/src/plugin/protocol-ftp/ivy.xml
nutch/trunk/src/plugin/protocol-http/ivy.xml
nutch/trunk/src/plugin/protocol-httpclient/ivy.xml
nutch/trunk/src/plugin/scoring-link/ivy.xml
nutch/trunk/src/plugin/scoring-opic/ivy.xml
nutch/trunk/src/plugin/subcollection/ivy.xml
nutch/trunk/src/plugin/tld/ivy.xml
nutch/trunk/src/plugin/urlfilter-automaton/ivy.xml
nutch/trunk/src/plugin/urlfilter-domain/ivy.xml
nutch/trunk/src/plugin/urlfilter-prefix/ivy.xml
nutch/trunk/src/plugin/urlfilter-regex/ivy.xml
nutch/trunk/src/plugin/urlfilter-suffix/ivy.xml
nutch/trunk/src/plugin/urlfilter-validator/ivy.xml
nutch/trunk/src/plugin/urlnormalizer-basic/ivy.xml
nutch/trunk/src/plugin/urlnormalizer-pass/ivy.xml
nutch/trunk/src/plugin/urlnormalizer-regex/ivy.xml
Removed:
nutch/trunk/lib/apache-solr-core-1.4.0.jar
nutch/trunk/lib/apache-solr-solrj-1.4.0.jar
nutch/trunk/lib/commons-beanutils-1.8.0.jar
nutch/trunk/lib/commons-cli-1.2.jar
nutch/trunk/lib/commons-codec-1.3.jar
nutch/trunk/lib/commons-collections-3.2.1.jar
nutch/trunk/lib/commons-el-1.0.jar
nutch/trunk/lib/commons-httpclient-3.1.jar
nutch/trunk/lib/commons-io-1.4.jar
nutch/trunk/lib/commons-lang-2.1.jar
nutch/trunk/lib/commons-logging-1.0.4.jar
nutch/trunk/lib/commons-logging-api-1.0.4.jar
nutch/trunk/lib/commons-net-1.4.1.jar
nutch/trunk/lib/core-3.1.1.jar
nutch/trunk/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
nutch/trunk/lib/hadoop-0.20.2-core.jar
nutch/trunk/lib/hadoop-0.20.2-tools.jar
nutch/trunk/lib/hsqldb-1.8.0.10.LICENSE.txt
nutch/trunk/lib/hsqldb-1.8.0.10.jar
nutch/trunk/lib/icu4j-4_0_1.LICENSE.txt
nutch/trunk/lib/icu4j-4_0_1.jar
nutch/trunk/lib/jakarta-oro-2.0.8.jar
nutch/trunk/lib/jasper-compiler-5.5.12.jar
nutch/trunk/lib/jasper-runtime-5.5.12.jar
nutch/trunk/lib/jcl-over-slf4j-1.5.5.jar
nutch/trunk/lib/jets3t-0.6.1.LICENSE.txt
nutch/trunk/lib/jets3t-0.6.1.jar
nutch/trunk/lib/jetty-6.1.14.jar
nutch/trunk/lib/jetty-util-6.1.14.jar
nutch/trunk/lib/jsp-2.1/
nutch/trunk/lib/junit-3.8.1.LICENSE.txt
nutch/trunk/lib/junit-3.8.1.jar
nutch/trunk/lib/kfs-0.2.2.jar
nutch/trunk/lib/kfs-0.2.LICENSE.txt
nutch/trunk/lib/log4j-1.2.15.jar
nutch/trunk/lib/lucene-core-3.0.1.jar
nutch/trunk/lib/lucene-misc-3.0.1.jar
nutch/trunk/lib/oro-2.0.8.jar
nutch/trunk/lib/resolver.jar
nutch/trunk/lib/serializer.jar
nutch/trunk/lib/servlet-api-2.5-6.1.14.jar
nutch/trunk/lib/slf4j-api-1.5.5.jar
nutch/trunk/lib/slf4j-log4j12-1.4.3.jar
nutch/trunk/lib/taglibs-i18n.jar
nutch/trunk/lib/taglibs-i18n.tld
nutch/trunk/lib/tika-core-0.7.jar
nutch/trunk/lib/wstx-asl-3.2.7.jar
nutch/trunk/lib/xercesImpl.jar
nutch/trunk/lib/xml-apis.jar
nutch/trunk/lib/xmlenc-0.52.jar
nutch/trunk/src/plugin/feed/lib/
nutch/trunk/src/plugin/lib-lucene-analyzers/
nutch/trunk/src/plugin/lib-nekohtml/lib/
nutch/trunk/src/plugin/lib-xml/lib/
nutch/trunk/src/plugin/parse-rss/lib/xmlrpc-1.2.jar
nutch/trunk/src/plugin/parse-tika/lib/
nutch/trunk/src/plugin/protocol-ftp/lib/
Modified:
nutch/trunk/build.xml
nutch/trunk/default.properties
nutch/trunk/src/plugin/build-plugin.xml
nutch/trunk/src/plugin/build.xml
nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/NGramProfile.java
nutch/trunk/src/plugin/languageidentifier/src/test/org/apache/nutch/analysis/lang/TestLanguageIdentifier.java
nutch/trunk/src/plugin/lib-nekohtml/build.xml
nutch/trunk/src/plugin/lib-xml/build.xml
nutch/trunk/src/plugin/nutch-extensionpoints/build.xml
nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml
nutch/trunk/src/plugin/parse-tika/ivy.xml
nutch/trunk/src/plugin/urlnormalizer-regex/plugin.xml
Modified: nutch/trunk/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/build.xml (original)
+++ nutch/trunk/build.xml Wed Jul 7 08:48:17 2010
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project name="Nutch" default="job">
+<project name="Nutch" default="job" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- Load all the default properties, and any the user wants -->
<!-- to contribute (without having to type -D or edit this file -->
@@ -23,11 +23,12 @@
<property file="${basedir}/build.properties" />
<property file="${basedir}/default.properties" />
<property name="test.junit.output.format" value="plain"/>
+ <!-- <loadproperties srcfile="${ivy.dir}/libraries.properties"/> -->
<!-- the normal classpath -->
<path id="classpath">
<pathelement location="${build.classes}"/>
- <fileset dir="${lib.dir}">
+ <fileset dir="${build.lib.dir}">
<include name="*.jar" />
</fileset>
</path>
@@ -41,12 +42,15 @@
<pathelement location="${plugins.classpath.dir}"/>
<path refid="classpath"/>
<pathelement location="${build.dir}/${final.name}.job" />
+ <fileset dir="${build.lib.dir}">
+ <include name="*.jar" />
+ </fileset>
</path>
<!-- ====================================================== -->
<!-- Stuff needed by all targets -->
<!-- ====================================================== -->
- <target name="init">
+ <target name="init" depends="ivy-init">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes}"/>
@@ -61,11 +65,13 @@
<fileset dir="${conf.dir}" includes="**/*.template"/>
<mapper type="glob" from="*.template" to="*"/>
</copy>
+ </target>
+ <target name="extract-hadoop" depends="ivy-init">
<!-- unpack hadoop scripts from hadoop jar into bin directory -->
<mkdir dir="${build.dir}/hadoop"/>
<unjar dest="${build.dir}/hadoop">
- <fileset dir="${lib.dir}" includes="hadoop*.jar"/>
+ <fileset dir="${build.lib.dir}" includes="hadoop*.jar"/>
<patternset includes="bin.tgz"/>
</unjar>
@@ -74,21 +80,14 @@
<replace file="bin/hadoop" token="PlatformName" value="PlatformName | sed -e 's/ /_/g'"/>
<chmod dir="bin" perm="ugo+rx" includes="*.sh,hadoop"/>
- <!-- unpack hadoop webapp from hadoop jar into build directory -->
- <mkdir dir="${build.dir}/webapps"/>
- <unjar dest="${build.dir}">
- <fileset dir="${lib.dir}" includes="hadoop*.jar"/>
- <patternset includes="webapps/**"/>
- </unjar>
-
</target>
<!-- ====================================================== -->
<!-- Compile the Java files -->
<!-- ====================================================== -->
- <target name="compile" depends="compile-core, compile-plugins"/>
+ <target name="compile" depends="compile-core, compile-plugins, extract-hadoop"/>
- <target name="compile-core" depends="init">
+ <target name="compile-core" depends="init, resolve-default">
<javac
encoding="${build.encoding}"
srcdir="${src.dir}"
@@ -103,7 +102,7 @@
</javac>
</target>
- <target name="compile-plugins">
+ <target name="compile-plugins" depends="init, resolve-default">
<ant dir="src/plugin" target="deploy" inheritAll="false"/>
</target>
@@ -138,7 +137,7 @@
<zipfileset dir="${build.classes}"
excludes="nutch-default.xml,nutch-site.xml"/>
<zipfileset dir="${conf.dir}" excludes="*.template,hadoop*.*"/>
- <zipfileset dir="${lib.dir}" prefix="lib"
+ <zipfileset dir="${build.lib.dir}" prefix="lib"
includes="**/*.jar" excludes="hadoop-*.jar"/>
<zipfileset dir="${build.plugins}" prefix="plugins"/>
</jar>
@@ -147,7 +146,7 @@
<!-- ================================================================== -->
<!-- Compile test code -->
<!-- ================================================================== -->
- <target name="compile-core-test" depends="compile-core">
+ <target name="compile-core-test" depends="compile-core, resolve-test">
<javac
encoding="${build.encoding}"
srcdir="${test.src.dir}"
@@ -223,6 +222,7 @@
errorProperty="tests.failed" failureProperty="tests.failed" maxmemory="1000m">
<sysproperty key="test.build.data" value="${test.build.data}"/>
<sysproperty key="test.src.dir" value="${test.src.dir}"/>
+ <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"/>
<classpath refid="test.classpath"/>
<formatter type="${test.junit.output.format}" />
<batchtest todir="${test.build.dir}" unless="testcase">
@@ -246,6 +246,89 @@
</target>
<!-- ================================================================== -->
+ <!-- Ivy targets -->
+ <!-- ================================================================== -->
+
+ <!-- target: resolve ================================================= -->
+ <target name="resolve-default" depends="clean-lib" description="--> resolve and retrieve dependencies with ivy">
+ <ivy:resolve file="${ivy.file}" conf="default" log="download-only"/>
+ <ivy:retrieve pattern="${build.lib.dir}/[artifact]-[revision].[ext]" symlink="false" log="quiet"/>
+ <antcall target="copy-libs"/>
+ </target>
+
+ <target name="resolve-test" depends="clean-lib" description="--> resolve and retrieve dependencies with ivy">
+ <ivy:resolve file="${ivy.file}" conf="test" log="download-only"/>
+ <ivy:retrieve pattern="${build.lib.dir}/[artifact]-[revision].[ext]" symlink="false" log="quiet"/>
+ <antcall target="copy-libs"/>
+ </target>
+
+ <target name="copy-libs">
+ <!-- copy the libs in lib, which are not ivy enabled-->
+ <copy todir="${build.lib.dir}/" failonerror="false">
+ <fileset dir="${lib.dir}" includes="**/*.jar"/>
+ </copy>
+ </target>
+
+ <!-- target: publish-local =========================================== -->
+ <target name="publish-local" depends="jar" description="--> publish this project in the local ivy repository">
+ <ivy:publish artifactspattern="${build.dir}/[artifact]-${version}.[ext]"
+ resolver="local"
+ pubrevision="${version}"
+ pubdate="${now}"
+ status="integration"
+ forcedeliver="true"
+ overwrite="true"
+ />
+ <echo message="project ${ant.project.name} published locally with version ${version}" />
+ </target>
+
+ <!-- target: report ================================================== -->
+ <target name="report" depends="resolve-test" description="--> generates a report of dependencies">
+ <ivy:report todir="${build.dir}"/>
+ </target>
+
+ <!-- target: ivy-init ================================================ -->
+ <target name="ivy-init" depends="ivy-probe-antlib, ivy-init-antlib">
+ <ivy:settings file="${ivy.dir}/ivysettings.xml" />
+ </target>
+
+ <!-- target: ivy-probe-antlib ======================================== -->
+ <target name="ivy-probe-antlib">
+ <condition property="ivy.found">
+ <typefound uri="antlib:org.apache.ivy.ant" name="cleancache" />
+ </condition>
+ </target>
+
+ <!-- target: ivy-download ============================================ -->
+ <target name="ivy-download" description="Download ivy">
+ <available file="${ivy.jar}" property="ivy.jar.found"/>
+ <antcall target="-ivy-download-unchecked"/>
+ </target>
+
+ <!-- target: ivy-download-unchecked ================================== -->
+ <target name="-ivy-download-unchecked" unless="ivy.jar.found">
+ <get src="${ivy.repo.url}" dest="${ivy.jar}" usetimestamp="true" />
+ </target>
+
+ <!-- target: ivy-init-antlib ========================================= -->
+ <target name="ivy-init-antlib" depends="ivy-download" unless="ivy.found">
+ <typedef uri="antlib:org.apache.ivy.ant" onerror="fail" loaderRef="ivyLoader">
+ <classpath>
+ <pathelement location="${ivy.jar}" />
+ </classpath>
+ </typedef>
+ <fail>
+ <condition>
+ <not>
+ <typefound uri="antlib:org.apache.ivy.ant" name="cleancache" />
+ </not>
+ </condition>
+ You need Apache Ivy 2.0 or later from http://ant.apache.org/
+ It could not be loaded from ${ivy.repo.url}
+ </fail>
+ </target>
+
+ <!-- ================================================================== -->
<!-- Documentation -->
<!-- ================================================================== -->
<target name="javadoc" depends="compile">
@@ -271,6 +354,7 @@
<packageset dir="${plugins.dir}/protocol-ftp/src/java"/>
<packageset dir="${plugins.dir}/protocol-http/src/java"/>
<packageset dir="${plugins.dir}/protocol-httpclient/src/java"/>
+ <packageset dir="${plugins.dir}/parse-tika/src/java"/>
<packageset dir="${plugins.dir}/parse-ext/src/java"/>
<packageset dir="${plugins.dir}/parse-js/src/java"/>
<packageset dir="${plugins.dir}/parse-rss/src/java"/>
@@ -321,53 +405,57 @@
<!-- -->
<!-- ================================================================== -->
<target name="package" depends="jar, job, javadoc">
- <mkdir dir="${dist.dir}"/>
- <mkdir dir="${dist.dir}/lib"/>
- <mkdir dir="${dist.dir}/bin"/>
- <mkdir dir="${dist.dir}/docs"/>
- <mkdir dir="${dist.dir}/docs/api"/>
- <mkdir dir="${dist.dir}/plugins"/>
+ <mkdir dir="${dist.version.dir}"/>
+ <mkdir dir="${dist.version.dir}/lib"/>
+ <mkdir dir="${dist.version.dir}/bin"/>
+ <mkdir dir="${dist.version.dir}/docs"/>
+ <mkdir dir="${dist.version.dir}/docs/api"/>
+ <mkdir dir="${dist.version.dir}/plugins"/>
- <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
- <fileset dir="lib"/>
+ <copy todir="${dist.version.dir}/lib" includeEmptyDirs="false">
+ <fileset dir="${build.lib.dir}"/>
</copy>
- <copy todir="${dist.dir}/plugins">
+ <copy todir="${dist.version.dir}/plugins">
<fileset dir="${build.plugins}"/>
</copy>
- <copy file="${build.dir}/${final.name}.jar" todir="${dist.dir}"/>
- <copy file="${build.dir}/${final.name}.job" todir="${dist.dir}"/>
-
- <copy todir="${dist.dir}/bin">
+ <copy file="${build.dir}/${final.name}.jar" todir="${dist.version.dir}"/>
+ <copy file="${build.dir}/${final.name}.job" todir="${dist.version.dir}"/>
+
+ <copy todir="${dist.version.dir}/bin">
<fileset dir="bin"/>
</copy>
- <copy todir="${dist.dir}/conf">
+ <copy todir="${dist.version.dir}/conf">
<fileset dir="${conf.dir}" excludes="**/*.template"/>
</copy>
<chmod perm="ugo+x" type="file">
- <fileset dir="${dist.dir}/bin"/>
+ <fileset dir="${dist.version.dir}/bin"/>
</chmod>
- <copy todir="${dist.dir}/docs/api">
+ <copy todir="${dist.version.dir}/docs">
+ <fileset dir="site" />
+ </copy>
+
+ <copy todir="${dist.version.dir}/docs/api">
<fileset dir="${build.javadoc}"/>
</copy>
- <copy todir="${dist.dir}">
+ <copy todir="${dist.version.dir}">
<fileset dir=".">
<include name="*.txt" />
<include name="KEYS" />
</fileset>
</copy>
- <copy todir="${dist.dir}/src" includeEmptyDirs="true">
+ <copy todir="${dist.version.dir}/src" includeEmptyDirs="true">
<fileset dir="src"/>
</copy>
- <copy todir="${dist.dir}/" file="build.xml"/>
- <copy todir="${dist.dir}/" file="default.properties"/>
+ <copy todir="${dist.version.dir}/" file="build.xml"/>
+ <copy todir="${dist.version.dir}/" file="default.properties"/>
</target>
@@ -376,12 +464,12 @@
<!-- ================================================================== -->
<target name="tar" depends="package">
<tar compression="gzip" longfile="gnu"
- destfile="${build.dir}/${final.name}.tar.gz">
- <tarfileset dir="${build.dir}" mode="664">
+ destfile="${dist.dir}/${final.name}.tar.gz">
+ <tarfileset dir="${dist.dir}" mode="664">
<exclude name="${final.name}/bin/*" />
<include name="${final.name}/**" />
</tarfileset>
- <tarfileset dir="${build.dir}" mode="755">
+ <tarfileset dir="${dist.dir}" mode="755">
<include name="${final.name}/bin/*" />
</tarfileset>
</tar>
@@ -391,22 +479,49 @@
<!-- Make release tarball -->
<!-- ================================================================== -->
<target name="zip" depends="package">
- <zip compress="true" casesensitive="yes" destfile="${build.dir}/${final.name}.zip">
- <zipfileset dir="${build.dir}" filemode="664">
- <exclude name="${final.name}/bin/*" />
- <include name="${final.name}/**" />
- </zipfileset>
- <zipfileset dir="${build.dir}" filemode="755">
- <include name="${final.name}/bin/*" />
- </zipfileset>
+ <zip compress="true" casesensitive="yes" destfile="${dist.dir}/${final.name}.zip">
+ <zipfileset dir="${dist.dir}" filemode="664">
+ <exclude name="${final.name}/bin/*" />
+ <include name="${final.name}/**" />
+ </zipfileset>
+ <zipfileset dir="${dist.dir}" filemode="755">
+ <include name="${final.name}/bin/*" />
+ </zipfileset>
</zip>
</target>
<!-- ================================================================== -->
<!-- Clean. Delete the build files, and their directories -->
<!-- ================================================================== -->
- <target name="clean">
- <delete dir="${build.dir}"/>
+
+ <!-- target: clean =================================================== -->
+ <target name="clean" depends="clean-build, clean-lib, clean-dist" description="--> clean the project" />
+
+ <!-- target: clean-local ============================================= -->
+ <target name="clean-local" depends=""
+ description="--> cleans the local repository for the current module">
+ <delete dir="${ivy.local.default.root}/${ivy.organisation}/${ivy.module}"/>
+ </target>
+
+ <!-- target: clean-lib =============================================== -->
+ <target name="clean-lib" description="--> clean the project libraries directory (dependencies)">
+ <delete includeemptydirs="true" dir="${build.lib.dir}"/>
+ </target>
+
+ <!-- target: clean-build ============================================= -->
+ <target name="clean-build" description="--> clean the project built files">
+ <delete includeemptydirs="true" dir="${build.dir}"/>
+ </target>
+
+ <!-- target: clean-dist ============================================= -->
+ <target name="clean-dist" description="--> clean the project dist files">
+ <delete includeemptydirs="true" dir="${dist.dir}"/>
+ </target>
+
+ <!-- target: clean-cache ============================================= -->
+ <target name="clean-cache" depends=""
+ description="delete ivy cache">
+ <ivy:cleancache />
</target>
<!-- ================================================================== -->
Modified: nutch/trunk/default.properties
URL: http://svn.apache.org/viewvc/nutch/trunk/default.properties?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/default.properties (original)
+++ nutch/trunk/default.properties Wed Jul 7 08:48:17 2010
@@ -2,7 +2,7 @@ Name=Nutch
name=nutch
version=2.0-dev
final.name=${name}-${version}
-year=2006
+year=2010
basedir = ./
src.dir = ./src/java
@@ -15,6 +15,8 @@ build.classes = ${build.dir}/classes
build.plugins = ${build.dir}/plugins
build.javadoc = ${build.dir}/docs/api
build.encoding = UTF-8
+build.ivy.dir=${build.dir}/ivy
+build.lib.dir=${build.dir}/lib
test.src.dir = ./src/test
test.build.dir = ${build.dir}/test
@@ -29,16 +31,31 @@ javadoc.proxy.host=-J-DproxyHost=
javadoc.proxy.port=-J-DproxyPort=
javadoc.link.java=http://java.sun.com/javase/6/docs/api/
javadoc.link.lucene=http://lucene.apache.org/java/2_9_1/api/all
-javadoc.link.hadoop=http://hadoop.apache.org/common/docs/r0.20.1/api/
+javadoc.link.hadoop=http://hadoop.apache.org/common/docs/r0.20.2/api/
javadoc.packages=org.apache.nutch.*
-dist.dir=${build.dir}/${final.name}
+dist.dir=./dist
+dist.version.dir=${dist.dir}/${final.name}
javac.debug=on
javac.optimize=on
javac.deprecation=off
javac.version= 1.6
+ivy.version=2.1.0
+ivy.dir=${basedir}/ivy
+ivy.file=${ivy.dir}/ivy.xml
+ivy.jar=${ivy.dir}/ivy-${ivy.version}.jar
+ivy.repo.url=http://repo2.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar
+
+ivy.local.default.root=${ivy.default.ivy.user.dir}/local
+ivy.local.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext]
+ivy.local.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext]
+
+ivy.shared.default.root=${ivy.default.ivy.user.dir}/shared
+ivy.shared.default.ivy.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext]
+ivy.shared.default.artifact.pattern=[organisation]/[module]/[revision]/[type]s/[artifact].[ext]
+
#
# Plugins API
#
@@ -88,15 +105,6 @@ plugins.index=\
org.apache.nutch.indexer.more*
#
-# Query Filter Plugins
-#
-plugins.query=\
- org.apache.nutch.searcher.basic*:\
- org.apache.nutch.searcher.more*:\
- org.apache.nutch.searcher.site*:\
- org.apache.nutch.searcher.url*
-
-#
# Misc. Plugins
#
# (gathers plugins that cannot be dispatched
Added: nutch/trunk/ivy/ivy-2.1.0.jar
URL: http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy-2.1.0.jar?rev=961306&view=auto
==============================================================================
Binary file - no diff available.
Propchange: nutch/trunk/ivy/ivy-2.1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: nutch/trunk/ivy/ivy-configurations.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy-configurations.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/ivy/ivy-configurations.xml (added)
+++ nutch/trunk/ivy/ivy-configurations.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<configurations defaultconfmapping="default">
+ <!--these match the Maven configurations-->
+ <conf name="default" extends="master"/>
+ <conf name="master" description="contains the artifact but no dependencies"/>
+
+ <!--Testing pulls in everything-->
+ <conf name="test" extends="default" visibility="private"
+ description="the classpath needed to run tests"/>
+</configurations>
Added: nutch/trunk/ivy/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/ivy/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/ivy/ivy.xml (added)
+++ nutch/trunk/ivy/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,91 @@
+<?xml version="1.0" ?>
+
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0" />
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org" />
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${basedir}/ivy/ivy-configurations.xml" />
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name -->
+ <artifact conf="master" />
+ </publications>
+
+ <dependencies>
+ <dependency org="org.apache.solr" name="solr-solrj" rev="1.3.0"
+ conf="*->master" />
+ <dependency org="org.apache.solr" name="solr-common" rev="1.3.0"
+ conf="*->master" />
+
+ <dependency org="org.apache.hadoop" name="avro" rev="1.3.2"
+ conf="*->default">
+ <exclude org="ant" name="ant" />
+ </dependency>
+
+ <dependency org="commons-logging" name="commons-logging"
+ rev="1.0.4" conf="*->master" />
+ <dependency org="commons-logging" name="commons-logging-api"
+ rev="1.0.4" conf="*->master" />
+
+ <dependency org="commons-lang" name="commons-lang" rev="2.4"
+ conf="*->default" />
+ <dependency org="commons-collections" name="commons-collections"
+ rev="3.1" conf="*->default" />
+ <dependency org="commons-httpclient" name="commons-httpclient"
+ rev="3.0.1" conf="*->master" />
+ <dependency org="commons-codec" name="commons-codec" rev="1.3"
+ conf="*->default" />
+
+ <dependency org="org.apache.hadoop" name="hadoop-core" rev="0.20.2"
+ conf="*->default">
+ <exclude org="hsqldb" name="hsqldb" />
+ <exclude org="net.sf.kosmosfs" name="kfs" />
+ <exclude org="net.java.dev.jets3t" name="jets3t" />
+ <exclude org="org.eclipse.jdt" name="core" />
+ <exclude org="org.mortbay.jetty" name="jsp-*" />
+ </dependency>
+
+ <dependency org="com.ibm.icu" name="icu4j" rev="4.0.1" />
+ <dependency org="org.apache.lucene" name="lucene-core" rev="2.4.0"/>
+ <dependency org="org.apache.lucene" name="lucene-misc" rev="2.4.0"/>
+ <dependency org="org.apache.tika" name="tika-core" rev="0.7" />
+
+ <dependency org="log4j" name="log4j" rev="1.2.15" conf="*->master" />
+
+ <dependency org="xerces" name="xercesImpl" rev="2.6.2" />
+ <dependency org="xerces" name="xmlParserAPIs" rev="2.6.2" />
+ <dependency org="oro" name="oro" rev="2.0.8" />
+
+ <!--Configuration: test -->
+
+ <!--artifacts needed for testing -->
+ <dependency org="junit" name="junit" rev="3.8.1" conf="test->default" />
+ <dependency org="org.apache.hadoop" name="hadoop-test" rev="0.20.2"
+ conf="test->default" />
+
+ <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.7"
+ conf="test->default" />
+ <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.7"
+ conf="test->default" />
+
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/ivy/ivysettings.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/ivy/ivysettings.xml (added)
+++ nutch/trunk/ivy/ivysettings.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,79 @@
+<ivysettings>
+
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+ <!--
+ see http://www.jayasoft.org/ivy/doc/configuration
+ -->
+ <!-- you can override this property to use mirrors
+ http://repo1.maven.org/maven2/
+ http://mirrors.dotsrc.org/maven2
+ http://ftp.ggi-project.org/pub/packages/maven2
+ http://mirrors.sunsite.dk/maven2
+ http://public.planetmirror.com/pub/maven2
+ http://ibiblio.lsu.edu/main/pub/packages/maven2
+ http://www.ibiblio.net/pub/packages/maven2
+ -->
+ <property name="repo.maven.org"
+ value="http://repo1.maven.org/maven2/"
+ override="false"/>
+ <property name="snapshot.apache.org"
+ value="http://people.apache.org/repo/m2-snapshot-repository/"
+ override="false"/>
+ <property name="maven2.pattern"
+ value="[organisation]/[module]/[revision]/[module]-[revision]"/>
+ <property name="maven2.pattern.ext"
+ value="${maven2.pattern}.[ext]"/>
+ <!-- pull in the local repository -->
+ <include url="${ivy.default.conf.dir}/ivyconf-local.xml"/>
+ <settings defaultResolver="default"/>
+ <resolvers>
+ <ibiblio name="maven2"
+ root="${repo.maven.org}"
+ pattern="${maven2.pattern.ext}"
+ m2compatible="true"
+ />
+ <ibiblio name="apache-snapshot"
+ root="${snapshot.apache.org}"
+ pattern="${maven2.pattern.ext}"
+ m2compatible="true"
+ />
+ <chain name="default" dual="true">
+ <resolver ref="local"/>
+ <resolver ref="maven2"/>
+ </chain>
+ <chain name="internal">
+ <resolver ref="local"/>
+ </chain>
+ <chain name="external">
+ <resolver ref="maven2"/>
+ </chain>
+ <chain name="external-and-snapshots">
+ <resolver ref="maven2"/>
+ <resolver ref="apache-snapshot"/>
+ </chain>
+ </resolvers>
+ <modules>
+
+ <!--
+ This forces a requirement for other nutch-artifacts to be built locally
+ rather than look for them online.
+ -->
+ <module organisation="org.apache.nutch" name=".*" resolver="internal"/>
+ </modules>
+</ivysettings>
Modified: nutch/trunk/src/plugin/build-plugin.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/build-plugin.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/build-plugin.xml (original)
+++ nutch/trunk/src/plugin/build-plugin.xml Wed Jul 7 08:48:17 2010
@@ -16,7 +16,7 @@
limitations under the License.
-->
<!-- Imported by plugin build.xml files to define default targets. -->
-<project>
+<project xmlns:ivy="antlib:org.apache.ivy.ant">
<property name="name" value="${ant.project.name}"/>
<property name="root" value="${basedir}"/>
@@ -43,6 +43,8 @@
<!-- load nutch defaults last so that they can be overridden above -->
<property file="${nutch.root}/default.properties" />
+ <ivy:settings id="ivy.instance" file="${nutch.root}/ivy/ivysettings.xml" />
+
<path id="plugin.deps"/>
<fileset id="lib.jars" dir="${root}" includes="lib/*.jar"/>
@@ -52,10 +54,13 @@
<pathelement location="${build.classes}"/>
<fileset refid="lib.jars"/>
<pathelement location="${nutch.root}/build/classes"/>
- <fileset dir="${nutch.root}/lib">
+ <fileset dir="${nutch.root}/build/lib">
<include name="*.jar" />
</fileset>
<path refid="plugin.deps"/>
+ <fileset dir="${deploy.dir}">
+ <include name="*.jar" />
+ </fileset>
</path>
<!-- the unit test classpath -->
@@ -75,6 +80,7 @@
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.test}"/>
+ <mkdir dir="${deploy.dir}"/>
<antcall target="init-plugin"/>
</target>
@@ -97,7 +103,7 @@
<!-- ====================================================== -->
<!-- Compile the Java files -->
<!-- ====================================================== -->
- <target name="compile" depends="init,deps-jar">
+ <target name="compile" depends="init,deps-jar, resolve-default">
<echo message="Compiling plugin: ${name}"/>
<javac
encoding="${build.encoding}"
@@ -186,6 +192,7 @@
errorProperty="tests.failed" failureProperty="tests.failed">
<sysproperty key="test.data" value="${build.test}/data"/>
<sysproperty key="test.input" value="${root}/data"/>
+ <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"/>
<classpath refid="test.classpath"/>
<formatter type="plain" />
<batchtest todir="${build.test}" unless="testcase">
@@ -201,12 +208,32 @@
</target>
+ <!-- target: resolve ================================================= -->
+ <target name="resolve-default" depends="clean-lib" description="resolve and retrieve dependencies with ivy">
+ <ivy:resolve file="ivy.xml" conf="default" log="download-only"/>
+ <ivy:retrieve pattern="${deploy.dir}/[artifact]-[revision].[ext]" symlink="false" log="quiet"/>
+ </target>
+
+ <target name="resolve-test" depends="clean-lib" description="resolve and retrieve dependencies with ivy">
+ <ivy:resolve file="ivy.xml" conf="test" log="download-only"/>
+ <ivy:retrieve pattern="${deploy.dir}/[artifact]-[revision].[ext]" symlink="false" log="quiet"/>
+ </target>
+
<!-- ================================================================== -->
<!-- Clean. Delete the build files, and their directories -->
<!-- ================================================================== -->
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${deploy.dir}"/>
+ <!-- target: clean =================================================== -->
+ <target name="clean" depends="clean-build, clean-lib" description="--> clean the project" />
+
+ <!-- target: clean-lib =============================================== -->
+ <target name="clean-lib" description="--> clean the project libraries directory (dependencies)">
+ <delete includeemptydirs="true" dir="${build.lib.dir}"/>
+ </target>
+
+ <!-- target: clean-build ============================================= -->
+ <target name="clean-build" description="--> clean the project built files">
+ <delete includeemptydirs="true" dir="${build.dir}"/>
+ <delete includeemptydirs="true" dir="${deploy.dir}"/>
</target>
</project>
Modified: nutch/trunk/src/plugin/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/build.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/build.xml (original)
+++ nutch/trunk/src/plugin/build.xml Wed Jul 7 08:48:17 2010
@@ -33,7 +33,6 @@
<ant dir="index-more" target="deploy"/>
<ant dir="languageidentifier" target="deploy"/>
<ant dir="lib-http" target="deploy"/>
- <ant dir="lib-lucene-analyzers" target="deploy"/>
<ant dir="lib-nekohtml" target="deploy"/>
<ant dir="lib-regex-filter" target="deploy"/>
<ant dir="lib-xml" target="deploy"/>
Added: nutch/trunk/src/plugin/creativecommons/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/creativecommons/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/creativecommons/ivy.xml (added)
+++ nutch/trunk/src/plugin/creativecommons/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/feed/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/feed/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/feed/ivy.xml (added)
+++ nutch/trunk/src/plugin/feed/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="net.java.dev.rome" name="rome" rev="1.0.0" conf="*->master"/>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/index-anchor/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/index-anchor/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/index-anchor/ivy.xml (added)
+++ nutch/trunk/src/plugin/index-anchor/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/index-basic/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/index-basic/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/index-basic/ivy.xml (added)
+++ nutch/trunk/src/plugin/index-basic/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/index-more/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/index-more/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/index-more/ivy.xml (added)
+++ nutch/trunk/src/plugin/index-more/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/languageidentifier/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/languageidentifier/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/languageidentifier/ivy.xml (added)
+++ nutch/trunk/src/plugin/languageidentifier/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Modified: nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/NGramProfile.java
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/NGramProfile.java?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/NGramProfile.java (original)
+++ nutch/trunk/src/plugin/languageidentifier/src/java/org/apache/nutch/analysis/lang/NGramProfile.java Wed Jul 7 08:48:17 2010
@@ -38,9 +38,6 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-// Lucene imports
-import org.apache.lucene.analysis.Token;
-
// Nutch imports
import org.apache.nutch.util.LogUtil;
@@ -133,9 +130,9 @@ public class NGramProfile {
*
* @param t is the Token to be added
*/
- public void add(Token t) {
+ public void add(String token) {
add(new StringBuffer().append(SEPARATOR)
- .append(t.term())
+ .append(token)
.append(SEPARATOR));
}
Modified: nutch/trunk/src/plugin/languageidentifier/src/test/org/apache/nutch/analysis/lang/TestLanguageIdentifier.java
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/languageidentifier/src/test/org/apache/nutch/analysis/lang/TestLanguageIdentifier.java?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/languageidentifier/src/test/org/apache/nutch/analysis/lang/TestLanguageIdentifier.java (original)
+++ nutch/trunk/src/plugin/languageidentifier/src/test/org/apache/nutch/analysis/lang/TestLanguageIdentifier.java Wed Jul 7 08:48:17 2010
@@ -30,211 +30,208 @@ import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-// Lucene imports
-import org.apache.lucene.analysis.Token;
-
import org.apache.nutch.analysis.lang.NGramProfile.NGramEntry;
import org.apache.nutch.util.NutchConfiguration;
/**
* JUnit based test of class {@link LanguageIdentifier}.
- *
+ *
* @author Sami Siren
* @author Jerome Charron - http://frutch.free.fr/
*/
public class TestLanguageIdentifier extends TestCase {
-
-
- public TestLanguageIdentifier(String testName) {
- super(testName);
- }
-
- public static Test suite() {
- return new TestSuite(TestLanguageIdentifier.class);
- }
-
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- String tokencontent1 = "testaddtoken";
- String tokencontent2 = "anotherteststring";
-
- int[] counts1 = { 3, 2, 2, 1, 1, 1, 1, 1 };
-
- String[] chars1 = { "t", "d", "e", "a", "k", "n", "o", "s" };
-
- /**
- * Test addFromToken method
- *
- */
- public void testAddToken() {
-
- NGramProfile p = new NGramProfile("test", 1, 1);
-
- Token t = new Token(tokencontent1, 0, tokencontent1.length());
- p.add(t);
- p.normalize();
-
- testCounts(p.getSorted(), counts1);
- testContents(p.getSorted(), chars1);
- }
-
- /**
- * Test analyze method
- */
- public void testAnalyze() {
- String tokencontent = "testmeagain";
-
- NGramProfile p = new NGramProfile("test", 1, 1);
- p.analyze(new StringBuilder(tokencontent));
-
- //test that profile size is ok, eg 9 different NGramEntries "tesmagin"
- assertEquals(8, p.getSorted().size());
- }
-
- /**
- * Test addNGrams method with StringBuffer argument
- *
- */
- public void testAddNGramsStringBuffer() {
- String tokencontent = "testmeagain";
-
- NGramProfile p = new NGramProfile("test", 1, 1);
- p.add(new StringBuffer(tokencontent));
-
- //test that profile size is ok, eg 8 different NGramEntries "tesmagin"
- assertEquals(8, p.getSorted().size());
-
- }
-
- /**
- * test getSorted method
- */
- public void testGetSorted() {
- int[] count = { 4, 3, 1 };
- String[] ngram = { "a", "b", "c" };
-
- String teststring = "AAaaBbbC";
-
- NGramProfile p = new NGramProfile("test", 1, 1);
- p.analyze(new StringBuilder(teststring));
-
- //test size of profile
- assertEquals(3, p.getSorted().size());
-
- testCounts(p.getSorted(), count);
- testContents(p.getSorted(), ngram);
-
- }
-
- public void testGetSimilarity() {
- NGramProfile a = new NGramProfile("a", 1, 1);
- NGramProfile b = new NGramProfile("b", 1, 1);
-
- a.analyze(new StringBuilder(tokencontent1));
- b.analyze(new StringBuilder(tokencontent2));
-
- //because of rounding errors might slightly return different results
- assertEquals(a.getSimilarity(b), b.getSimilarity(a), 0.0000002);
-
- }
-
- public void testExactMatch() {
- NGramProfile a = new NGramProfile("a", 1, 1);
-
- a.analyze(new StringBuilder(tokencontent1));
-
- assertEquals(a.getSimilarity(a), 0, 0);
-
- }
-
-
- public void testIO() {
- //Create profile and set some contents
- NGramProfile a = new NGramProfile("a", 1, 1);
- a.analyze(new StringBuilder(this.tokencontent1));
-
- NGramProfile b = new NGramProfile("a_from_inputstream", 1, 1);
-
- //save profile
- ByteArrayOutputStream os = new ByteArrayOutputStream();
-
- try {
- a.save(os);
- os.close();
- } catch (Exception e) {
- fail();
- }
-
- //load profile
- InputStream is = new ByteArrayInputStream(os.toByteArray());
- try {
- b.load(is);
- is.close();
- } catch (Exception e) {
- fail();
- }
-
- //check it
- testCounts(b.getSorted(), counts1);
- testContents(b.getSorted(), chars1);
- }
-
- private void testContents(List<NGramEntry> entries, String contents[]) {
- int c = 0;
-
- for (NGramEntry nge : entries) {
- assertEquals(contents[c], nge.getSeq().toString());
- c++;
- }
- }
-
- private void testCounts(List<NGramEntry> entries, int counts[]) {
- int c = 0;
-
- for (NGramEntry nge : entries) {
- System.out.println(nge);
- assertEquals(counts[c], nge.getCount());
- c++;
- }
- }
- public void testIdentify() {
- try {
- long total = 0;
- LanguageIdentifier idfr = new LanguageIdentifier(NutchConfiguration.create());
- BufferedReader in = new BufferedReader(new InputStreamReader(
- this.getClass().getResourceAsStream("test-referencial.txt")));
- String line = null;
- while((line = in.readLine()) != null) {
- String[] tokens = line.split(";");
- if (!tokens[0].equals("")) {
- long start = System.currentTimeMillis();
- // Identify the whole file
- String lang = idfr.identify(this.getClass().getResourceAsStream(tokens[0]), "UTF-8");
- total += System.currentTimeMillis() - start;
- assertEquals(tokens[1], lang);
- // Then, each line of the file...
- BufferedReader testFile = new BufferedReader(
- new InputStreamReader(
- this.getClass().getResourceAsStream(tokens[0]), "UTF-8"));
- String testLine = null;
- while((testLine = testFile.readLine()) != null) {
- testLine = testLine.trim();
- if (testLine.length() > 256) {
- lang = idfr.identify(testLine);
- assertEquals(tokens[1], lang);
- }
- }
- testFile.close();
- }
- }
- in.close();
- System.out.println("Total Time=" + total);
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.toString());
- }
- }
+
+ public TestLanguageIdentifier(String testName) {
+ super(testName);
+ }
+
+ public static Test suite() {
+ return new TestSuite(TestLanguageIdentifier.class);
+ }
+
+ public static void main(String[] args) {
+ TestRunner.run(suite());
+ }
+
+ String tokencontent1 = "testaddtoken";
+ String tokencontent2 = "anotherteststring";
+
+ int[] counts1 = { 3, 2, 2, 1, 1, 1, 1, 1 };
+
+ String[] chars1 = { "t", "d", "e", "a", "k", "n", "o", "s" };
+
+ /**
+ * Test addFromToken method
+ *
+ */
+ public void testAddToken() {
+
+ NGramProfile p = new NGramProfile("test", 1, 1);
+
+ p.add(tokencontent1);
+ p.normalize();
+
+ testCounts(p.getSorted(), counts1);
+ testContents(p.getSorted(), chars1);
+ }
+
+ /**
+ * Test analyze method
+ */
+ public void testAnalyze() {
+ String tokencontent = "testmeagain";
+
+ NGramProfile p = new NGramProfile("test", 1, 1);
+ p.analyze(new StringBuilder(tokencontent));
+
+ // test that profile size is ok, eg 9 different NGramEntries "tesmagin"
+ assertEquals(8, p.getSorted().size());
+ }
+
+ /**
+ * Test addNGrams method with StringBuffer argument
+ *
+ */
+ public void testAddNGramsStringBuffer() {
+ String tokencontent = "testmeagain";
+
+ NGramProfile p = new NGramProfile("test", 1, 1);
+ p.add(new StringBuffer(tokencontent));
+
+ // test that profile size is ok, eg 8 different NGramEntries "tesmagin"
+ assertEquals(8, p.getSorted().size());
+
+ }
+
+ /**
+ * test getSorted method
+ */
+ public void testGetSorted() {
+ int[] count = { 4, 3, 1 };
+ String[] ngram = { "a", "b", "c" };
+
+ String teststring = "AAaaBbbC";
+
+ NGramProfile p = new NGramProfile("test", 1, 1);
+ p.analyze(new StringBuilder(teststring));
+
+ // test size of profile
+ assertEquals(3, p.getSorted().size());
+
+ testCounts(p.getSorted(), count);
+ testContents(p.getSorted(), ngram);
+
+ }
+
+ public void testGetSimilarity() {
+ NGramProfile a = new NGramProfile("a", 1, 1);
+ NGramProfile b = new NGramProfile("b", 1, 1);
+
+ a.analyze(new StringBuilder(tokencontent1));
+ b.analyze(new StringBuilder(tokencontent2));
+
+ // because of rounding errors might slightly return different results
+ assertEquals(a.getSimilarity(b), b.getSimilarity(a), 0.0000002);
+
+ }
+
+ public void testExactMatch() {
+ NGramProfile a = new NGramProfile("a", 1, 1);
+
+ a.analyze(new StringBuilder(tokencontent1));
+
+ assertEquals(a.getSimilarity(a), 0, 0);
+
+ }
+
+ public void testIO() {
+ // Create profile and set some contents
+ NGramProfile a = new NGramProfile("a", 1, 1);
+ a.analyze(new StringBuilder(this.tokencontent1));
+
+ NGramProfile b = new NGramProfile("a_from_inputstream", 1, 1);
+
+ // save profile
+ ByteArrayOutputStream os = new ByteArrayOutputStream();
+
+ try {
+ a.save(os);
+ os.close();
+ } catch (Exception e) {
+ fail();
+ }
+
+ // load profile
+ InputStream is = new ByteArrayInputStream(os.toByteArray());
+ try {
+ b.load(is);
+ is.close();
+ } catch (Exception e) {
+ fail();
+ }
+
+ // check it
+ testCounts(b.getSorted(), counts1);
+ testContents(b.getSorted(), chars1);
+ }
+
+ private void testContents(List<NGramEntry> entries, String contents[]) {
+ int c = 0;
+
+ for (NGramEntry nge : entries) {
+ assertEquals(contents[c], nge.getSeq().toString());
+ c++;
+ }
+ }
+
+ private void testCounts(List<NGramEntry> entries, int counts[]) {
+ int c = 0;
+
+ for (NGramEntry nge : entries) {
+ System.out.println(nge);
+ assertEquals(counts[c], nge.getCount());
+ c++;
+ }
+ }
+
+ public void testIdentify() {
+ try {
+ long total = 0;
+ LanguageIdentifier idfr = new LanguageIdentifier(
+ NutchConfiguration.create());
+ BufferedReader in = new BufferedReader(new InputStreamReader(this
+ .getClass().getResourceAsStream("test-referencial.txt")));
+ String line = null;
+ while ((line = in.readLine()) != null) {
+ String[] tokens = line.split(";");
+ if (!tokens[0].equals("")) {
+ long start = System.currentTimeMillis();
+ // Identify the whole file
+ String lang = idfr.identify(this.getClass()
+ .getResourceAsStream(tokens[0]), "UTF-8");
+ total += System.currentTimeMillis() - start;
+ assertEquals(tokens[1], lang);
+ // Then, each line of the file...
+ BufferedReader testFile = new BufferedReader(
+ new InputStreamReader(this.getClass()
+ .getResourceAsStream(tokens[0]), "UTF-8"));
+ String testLine = null;
+ while ((testLine = testFile.readLine()) != null) {
+ testLine = testLine.trim();
+ if (testLine.length() > 256) {
+ lang = idfr.identify(testLine);
+ assertEquals(tokens[1], lang);
+ }
+ }
+ testFile.close();
+ }
+ }
+ in.close();
+ System.out.println("Total Time=" + total);
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.toString());
+ }
+ }
}
Added: nutch/trunk/src/plugin/lib-http/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-http/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/lib-http/ivy.xml (added)
+++ nutch/trunk/src/plugin/lib-http/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Modified: nutch/trunk/src/plugin/lib-nekohtml/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-nekohtml/build.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/lib-nekohtml/build.xml (original)
+++ nutch/trunk/src/plugin/lib-nekohtml/build.xml Wed Jul 7 08:48:17 2010
@@ -23,7 +23,7 @@
! Override the compile and jar targets,
! since there is nothing to compile here.
! -->
- <target name="compile" depends="init"/>
+ <target name="compile" depends="init, resolve-default"/>
<target name="jar" depends="compile">
<copy todir="${build.dir}" verbose="true">
Added: nutch/trunk/src/plugin/lib-nekohtml/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-nekohtml/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/lib-nekohtml/ivy.xml (added)
+++ nutch/trunk/src/plugin/lib-nekohtml/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="nekohtml" name="nekohtml" rev="0.9.5" conf="*->master"/>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/lib-regex-filter/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-regex-filter/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/lib-regex-filter/ivy.xml (added)
+++ nutch/trunk/src/plugin/lib-regex-filter/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Modified: nutch/trunk/src/plugin/lib-xml/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-xml/build.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/lib-xml/build.xml (original)
+++ nutch/trunk/src/plugin/lib-xml/build.xml Wed Jul 7 08:48:17 2010
@@ -23,7 +23,7 @@
! Override the compile and jar targets,
! since there is nothing to compile here.
! -->
- <target name="compile" depends="init"/>
+ <target name="compile" depends="init, resolve-default"/>
<target name="jar" depends="compile">
<copy todir="${build.dir}" verbose="true">
Added: nutch/trunk/src/plugin/lib-xml/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/lib-xml/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/lib-xml/ivy.xml (added)
+++ nutch/trunk/src/plugin/lib-xml/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="org.jdom" name="jdom" rev="1.1" conf="*->default"/>
+ <dependency org="jaxen" name="jaxen" rev="1.1.1" conf="*->master"/>
+ <dependency org="xerces" name="xercesImpl" rev="2.6.2" conf="*->master"/>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/microformats-reltag/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/microformats-reltag/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/microformats-reltag/ivy.xml (added)
+++ nutch/trunk/src/plugin/microformats-reltag/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Modified: nutch/trunk/src/plugin/nutch-extensionpoints/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/nutch-extensionpoints/build.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/nutch-extensionpoints/build.xml (original)
+++ nutch/trunk/src/plugin/nutch-extensionpoints/build.xml Wed Jul 7 08:48:17 2010
@@ -23,7 +23,7 @@
! Override the compile and jar targets,
! since there is nothing to compile here.
! -->
- <target name="compile" depends="init"/>
+ <target name="compile" depends="init, resolve-default"/>
<!--target name="jar" depends="compile"/-->
Added: nutch/trunk/src/plugin/nutch-extensionpoints/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/nutch-extensionpoints/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/nutch-extensionpoints/ivy.xml (added)
+++ nutch/trunk/src/plugin/nutch-extensionpoints/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Modified: nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml (original)
+++ nutch/trunk/src/plugin/nutch-extensionpoints/plugin.xml Wed Jul 7 08:48:17 2010
@@ -18,7 +18,7 @@
<plugin
id="nutch-extensionpoints"
name="the nutch core extension points"
- version="0.8.0"
+ version="2.0.0"
provider-name="nutch.org">
<!-- this file hosts all extension points nutch core code offers.
Added: nutch/trunk/src/plugin/parse-ext/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-ext/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/parse-ext/ivy.xml (added)
+++ nutch/trunk/src/plugin/parse-ext/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/parse-js/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-js/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/parse-js/ivy.xml (added)
+++ nutch/trunk/src/plugin/parse-js/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/parse-rss/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-rss/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/parse-rss/ivy.xml (added)
+++ nutch/trunk/src/plugin/parse-rss/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="xmlrpc" name="xmlrpc" rev="1.2" conf="*->master"/>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/parse-swf/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-swf/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/parse-swf/ivy.xml (added)
+++ nutch/trunk/src/plugin/parse-swf/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Modified: nutch/trunk/src/plugin/parse-tika/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-tika/ivy.xml?rev=961306&r1=961305&r2=961306&view=diff
==============================================================================
--- nutch/trunk/src/plugin/parse-tika/ivy.xml (original)
+++ nutch/trunk/src/plugin/parse-tika/ivy.xml Wed Jul 7 08:48:17 2010
@@ -1,20 +1,43 @@
-<ivy-module version="2.0">
- <info organisation="apache" module="parse-tika"/>
- <dependencies>
- <dependency org="org.apache.tika" name="tika-parsers" rev="0.7">
- <exclude module="lucene-*"/>
- <exclude module="tika-core"/>
- <exclude module="log4j"/>
- <exclude org="org.apache.tika" module="tika-parsers" name="*" type="javadoc" ext="*" conf="" matcher="exact"/>
- <exclude org="org.apache.tika" module="tika-parsers" name="*" type="source" ext="*" conf="" matcher="exact"/>
- </dependency>
- <dependency org="bouncycastle" name="bcprov-jdk14" rev="136">
- <exclude org="bouncycastle" module="bcprov-jdk14" name="*" type="javadoc" ext="*" conf="" matcher="exact"/>
- <exclude org="bouncycastle" module="bcprov-jdk14" name="*" type="source" ext="*" conf="" matcher="exact"/>
- </dependency>
- <dependency org="bouncycastle" name="bcmail-jdk14" rev="136">
- <exclude org="bouncycastle" module="bcmail-jdk14" name="*" type="javadoc" ext="*" conf="" matcher="exact"/>
- <exclude org="bouncycastle" module="bcmail-jdk14" name="*" type="source" ext="*" conf="" matcher="exact"/>
- </dependency>
- </dependencies>
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ <dependency org="org.apache.poi" name="poi-scratchpad" rev="3.6" conf="*->master"/>
+ <dependency org="org.apache.tika" name="tika-parsers" rev="0.7" conf="*->default"/>
+ </dependencies>
+
</ivy-module>
Added: nutch/trunk/src/plugin/parse-zip/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/parse-zip/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/parse-zip/ivy.xml (added)
+++ nutch/trunk/src/plugin/parse-zip/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>
Added: nutch/trunk/src/plugin/protocol-file/ivy.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/protocol-file/ivy.xml?rev=961306&view=auto
==============================================================================
--- nutch/trunk/src/plugin/protocol-file/ivy.xml (added)
+++ nutch/trunk/src/plugin/protocol-file/ivy.xml Wed Jul 7 08:48:17 2010
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ivy-module version="1.0">
+ <info organisation="org.apache.nutch" module="${ant.project.name}">
+ <license name="Apache 2.0"/>
+ <ivyauthor name="Apache Nutch Team" url="http://nutch.apache.org"/>
+ <description>
+ Apache Nutch
+ </description>
+ </info>
+
+ <configurations>
+ <include file="${nutch.root}/ivy/ivy-configurations.xml"/>
+ </configurations>
+
+ <publications>
+ <!--get the artifact from our module name-->
+ <artifact conf="master"/>
+ </publications>
+
+ <dependencies>
+ </dependencies>
+
+</ivy-module>