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 2014/07/17 14:42:01 UTC
svn commit: r1611343 - in /nutch/trunk: CHANGES.txt
src/plugin/build-plugin.xml src/plugin/urlfilter-automaton/build.xml
src/plugin/urlfilter-regex/build.xml
Author: jnioche
Date: Thu Jul 17 12:42:01 2014
New Revision: 1611343
URL: http://svn.apache.org/r1611343
Log:
NUTCH-1818 Add deps-test-compile task for building plugins
Modified:
nutch/trunk/CHANGES.txt
nutch/trunk/src/plugin/build-plugin.xml
nutch/trunk/src/plugin/urlfilter-automaton/build.xml
nutch/trunk/src/plugin/urlfilter-regex/build.xml
Modified: nutch/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1611343&r1=1611342&r2=1611343&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Thu Jul 17 12:42:01 2014
@@ -2,6 +2,8 @@ Nutch Change Log
Nutch Current Development
+* NUTCH-1818 Add deps-test-compile task for building plugins (jnioche)
+
* NUTCH-1817 Remove pom.xml from source (jnioche)
* NUTCH-926 Redirections from META tag don't get filtered (snagel)
Modified: nutch/trunk/src/plugin/build-plugin.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/build-plugin.xml?rev=1611343&r1=1611342&r2=1611343&view=diff
==============================================================================
--- nutch/trunk/src/plugin/build-plugin.xml (original)
+++ nutch/trunk/src/plugin/build-plugin.xml Thu Jul 17 12:42:01 2014
@@ -110,6 +110,12 @@
!-->
<target name="deps-test"/>
+ <!--
+ ! Used to compile test for plugin runtime dependencies
+ ! (to be overridden by plugins)
+ !-->
+ <target name="deps-test-compile"/>
+
<!-- ====================================================== -->
<!-- Compile the Java files -->
<!-- ====================================================== -->
@@ -177,7 +183,7 @@
<!-- ================================================================== -->
<!-- Compile test code -->
<!-- ================================================================== -->
- <target name="compile-test" depends="compile" if="test.available">
+ <target name="compile-test" depends="compile, deps-test-compile" if="test.available">
<javac
encoding="${build.encoding}"
srcdir="${src.test}"
Modified: nutch/trunk/src/plugin/urlfilter-automaton/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlfilter-automaton/build.xml?rev=1611343&r1=1611342&r2=1611343&view=diff
==============================================================================
--- nutch/trunk/src/plugin/urlfilter-automaton/build.xml (original)
+++ nutch/trunk/src/plugin/urlfilter-automaton/build.xml Thu Jul 17 12:42:01 2014
@@ -32,6 +32,11 @@
<pathelement location="${nutch.root}/build/lib-regex-filter/test"/>
</path>
+ <!-- Compile test classes for dependencies -->
+ <target name="deps-test-compile">
+ <ant target="compile-test" inheritall="false" dir="../lib-regex-filter"/>
+ </target>
+
<!-- Deploy Unit test dependencies -->
<target name="deps-test">
<ant target="deploy" inheritall="false" dir="../lib-regex-filter"/>
Modified: nutch/trunk/src/plugin/urlfilter-regex/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/urlfilter-regex/build.xml?rev=1611343&r1=1611342&r2=1611343&view=diff
==============================================================================
--- nutch/trunk/src/plugin/urlfilter-regex/build.xml (original)
+++ nutch/trunk/src/plugin/urlfilter-regex/build.xml Thu Jul 17 12:42:01 2014
@@ -32,6 +32,11 @@
<pathelement location="${nutch.root}/build/lib-regex-filter/test"/>
</path>
+ <!-- Compile test classes for dependencies -->
+ <target name="deps-test-compile">
+ <ant target="compile-test" inheritall="false" dir="../lib-regex-filter"/>
+ </target>
+
<!-- Deploy Unit test dependencies -->
<target name="deps-test">
<ant target="deploy" inheritall="false" dir="../lib-regex-filter"/>