svn commit: r1690865 - in /nutch/trunk: build.xml default.properties src/plugin/build-plugin.xml

[ma...@apache.org]

Author: mattmann
Date: Tue Jul 14 06:00:19 2015
New Revision: 1690865

URL: http://svn.apache.org/r1690865
Log:
related to NUTCH-2059: refactor junit output formatter property to default.properties, and allow to override from command line. set to to plan by default (can be overriden to xml in a consistent way with -D)

Modified:
    nutch/trunk/build.xml
    nutch/trunk/default.properties
    nutch/trunk/src/plugin/build-plugin.xml

Modified: nutch/trunk/build.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1690865&r1=1690864&r2=1690865&view=diff
==============================================================================
--- nutch/trunk/build.xml (original)
+++ nutch/trunk/build.xml Tue Jul 14 06:00:19 2015
@@ -22,7 +22,6 @@
   <property file="${user.home}/build.properties" />
   <property file="${basedir}/build.properties" />
   <property file="${basedir}/default.properties" />
-  <property name="test.junit.output.format" value="plain"/>
   <property name="release.dir" value="${build.dir}/release"/>
   
   <!-- define Maven coordinates, repository url and artifacts name etc -->

Modified: nutch/trunk/default.properties
URL: http://svn.apache.org/viewvc/nutch/trunk/default.properties?rev=1690865&r1=1690864&r2=1690865&view=diff
==============================================================================
--- nutch/trunk/default.properties (original)
+++ nutch/trunk/default.properties Tue Jul 14 06:00:19 2015
@@ -38,6 +38,7 @@ test.build.lib.dir = ${test.build.dir}/l
 test.build.data =  ${test.build.dir}/data
 test.build.classes = ${test.build.dir}/classes
 test.build.javadoc = ${test.build.dir}/docs/api
+test.junit.output.format = plain
 
 # Proxy Host and Port to use for building JavaDoc
 javadoc.proxy.host=-J-DproxyHost=

Modified: nutch/trunk/src/plugin/build-plugin.xml
URL: http://svn.apache.org/viewvc/nutch/trunk/src/plugin/build-plugin.xml?rev=1690865&r1=1690864&r2=1690865&view=diff
==============================================================================
--- nutch/trunk/src/plugin/build-plugin.xml (original)
+++ nutch/trunk/src/plugin/build-plugin.xml Tue Jul 14 06:00:19 2015
@@ -210,7 +210,7 @@
       <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" />
+      <formatter type="${test.junit.output.format}" />
       <batchtest todir="${build.test}" unless="testcase">
         <fileset dir="${src.test}"
                  includes="**/Test*.java" excludes="**/${test.exclude}.java" />