Author: lewismc Date: Thu Oct 6 12:49:31 2011 New Revision: 1179603 URL: http://svn.apache.org/viewvc?rev=1179603&view=rev Log: commit to address NUTCH-1136 and update to changes.txt
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=1179603&r1=1179602&r2=1179603&view=diff ============================================================================== --- nutch/trunk/CHANGES.txt (original) +++ nutch/trunk/CHANGES.txt Thu Oct 6 12:49:31 2011 @@ -2,6 +2,8 @@ Nutch Change Log Release 1.4 - Current development +* NUTCH-1136 Ant pmd target is broken + * NUTCH-1058 Upgrade Solr schema to version 1.4 (markus) * NUTCH-1137 LinkDB invertlinks other options ignored when using -dir option (Sebastian Nagel, markus) Modified: nutch/trunk/build.xml URL: http://svn.apache.org/viewvc/nutch/trunk/build.xml?rev=1179603&r1=1179602&r2=1179603&view=diff ============================================================================== --- nutch/trunk/build.xml (original) +++ nutch/trunk/build.xml Thu Oct 6 12:49:31 2011 @@ -323,40 +323,8 @@ </target> <!-- ================================================================== --> - <!-- Run code checks (PMD) --> + <!-- Run Nutch proxy --> <!-- ================================================================== --> - <target name="pmd" depends="compile"> - <property name="pmd.report" location="${build.dir}/pmd-report.html" /> - <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"> - <classpath> - <fileset dir="${lib.dir}"> - <include name="pmd-ext/*.jar" /> - <include name="xerces*.jar" /> - </fileset> - </classpath> - </taskdef> - <pmd shortFilenames="true" failonerror="true" failOnRuleViolation="false" - encoding="${build.encoding}" failuresPropertyName="pmd.failures"> - <ruleset>unusedcode</ruleset> - <!--ruleset>basic</ruleset--> - <!--ruleset>optimizations</ruleset--> - <formatter type="html" toFile="${pmd.report}" /> - <!-- <formatter type="xml" toFile="${tempbuild}/$report_pmd.xml"/> --> - <fileset dir="${basedir}/src"> - <include name="java/**/*.java"/> - <include name="plugin/**/*.java"/> - </fileset> - </pmd> - <condition property="pmd.stop" value="true"> - <and> - <isset property="pmd.failures" /> - <not> - <equals arg1="0" arg2="${pmd.failures}" trim="true" /> - </not> - </and> - </condition> - <fail if="pmd.stop">FAILURE: PMD shows ${pmd.failures} rule violations. See ${pmd.report} for details.</fail> - </target> <target name="proxy" depends="job, compile-core-test"> <java classname="org.apache.nutch.tools.proxy.TestbedProxy" fork="true"> @@ -370,6 +338,10 @@ </java> </target> + <!-- ================================================================== --> + <!-- Run Nutch benchmarking analysis --> + <!-- ================================================================== --> + <target name="benchmark"> <java classname="org.apache.nutch.tools.Benchmark" fork="true"> <classpath refid="test.classpath"/>