Return-Path: 
 <core-commits-return-5186-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 7661 invoked from network); 30 Jun 2008 15:20:53 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 30 Jun 2008 15:20:53 -0000
Received: (qmail 87427 invoked by uid 500); 30 Jun 2008 15:20:54 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 87396 invoked by uid 500); 30 Jun 2008 15:20:54 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 87387 invoked by uid 99); 30 Jun 2008 15:20:54 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jun 2008 08:20:54 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Jun 2008 15:20:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3394A238898E; Mon, 30 Jun 2008 08:20:02 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r672792 - in /hadoop/core/branches/branch-0.18:
 CHANGES.txt
 build.xml docs/jdiff/ docs/jdiff/hadoop_0.17.0.xml
Date: Mon, 30 Jun 2008 15:20:02 -0000
To: core-commits@hadoop.apache.org
From: omalley@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080630152002.3394A238898E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: omalley
Date: Mon Jun 30 08:20:01 2008
New Revision: 672792

URL: http://svn.apache.org/viewvc?rev=672792&view=rev
Log:
HADOOP-3532. Merge -r 672790:672791 from trunk to branch 0.18.

Added:
    hadoop/core/branches/branch-0.18/docs/jdiff/
      - copied from r672791, hadoop/core/trunk/docs/jdiff/
    hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.17.0.xml
      - copied unchanged from r672791, hadoop/core/trunk/docs/jdiff/hadoop_0.17.0.xml
Modified:
    hadoop/core/branches/branch-0.18/CHANGES.txt
    hadoop/core/branches/branch-0.18/build.xml

Modified: hadoop/core/branches/branch-0.18/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/CHANGES.txt?rev=672792&r1=672791&r2=672792&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Mon Jun 30 08:20:01 2008
@@ -310,6 +310,8 @@
 
     HADOOP-3606. Updates the Streaming doc. (Amareshwari Sriramadasu via ddas) 
 
+    HADOOP-3532. Add jdiff reports to the build scripts. (omalley)
+
   OPTIMIZATIONS
 
     HADOOP-3274. The default constructor of BytesWritable creates empty 

Modified: hadoop/core/branches/branch-0.18/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/build.xml?rev=672792&r1=672791&r2=672792&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/build.xml (original)
+++ hadoop/core/branches/branch-0.18/build.xml Mon Jun 30 08:20:01 2008
@@ -120,6 +120,11 @@
   <property name="clover.report.dir" location="${build.dir}/test/clover/reports"/>
 
   <property name="rat.reporting.classname" value="rat.Report"/>
+  <property name="jdiff.home" value="${user.home}/jdiff-1.1.0"/>
+  <property name="jdiff.reports.dir" value="${docs.dir}/jdiff"/>
+  <property name="jdiff.stable" value="0.17.0"/>
+  <property name="jdiff.stable.javadoc" 
+            value="http://hadoop.apache.org/core/docs/r${jdiff.stable}/api/"/>
 
   <property name="scratch.dir" value="${user.home}/tmp"/>
   <property name="svn.cmd" value="svn"/>
@@ -793,6 +798,45 @@
 
     </javadoc>
   </target>	
+
+  <target name="api-xml" depends="javadoc">
+    <javadoc>
+       <doclet name="jdiff.JDiff"
+               path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
+         <param name="-apidir" value="${build.dir}"/>
+         <param name="-apiname" value="hadoop ${version}"/>
+       </doclet>
+       <packageset dir="src/core"/>
+       <packageset dir="src/hdfs"/>
+       <packageset dir="src/mapred"/>
+       <packageset dir="src/tools"/>
+       <classpath >
+         <path refid="classpath" />
+         <pathelement path="${java.class.path}"/>
+       </classpath>
+    </javadoc>
+  </target>
+	
+  <target name="api-report" depends="api-xml">
+    <javadoc sourcepath="src/core,src/hdfs,src,mapred,src/tools"
+             destdir="${build.dir}"
+             sourceFiles="${jdiff.home}/Null.java">
+       <doclet name="jdiff.JDiff"
+               path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
+         <param name="-oldapi" value="hadoop ${jdiff.stable}"/>
+         <param name="-newapi" value="hadoop ${version}"/>
+         <param name="-oldapidir" value="${jdiff.reports.dir}"/>
+         <param name="-newapidir" value="${build.dir}"/>
+         <param name="-javadocold" value="${jdiff.stable.javadoc}"/>
+         <param name="-javadocnew" value="${build.javadoc}/"/>
+         <param name="-stats"/>
+       </doclet>
+       <classpath >
+         <path refid="classpath" />
+         <pathelement path="${java.class.path}"/>
+       </classpath>
+    </javadoc>
+  </target>
 	
   <target name="changes-to-html" description="Convert CHANGES.txt into an html file">
     <mkdir dir="${docs.dir}"/>