Merge -r 699118:699119 from trunk to 0.19 branch. Fixes: HADOOP-2421.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.19@699121 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -208,6 +208,9 @@ Release 0.19.0 - Unreleased
     HADOOP-3924. Added a 'KILLED' job status. (Subramaniam Krishnan via
     acmurthy) 
 
+    HADOOP-2421.  Add jdiff output to documentation, listing all API
+    changes from the prior release.  (cutting)
+
   IMPROVEMENTS
 
     HADOOP-4205. hive: metastore and ql to use the refactored SerDe library.

build.xml

@@ -126,9 +126,10 @@
   <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.build.dir" value="${build.docs}/jdiff"/>
+  <property name="jdiff.xml.dir" value="${docs.dir}/jdiff"/>
+  <property name="jdiff.stable" value="0.18.1"/>
   <property name="jdiff.stable.javadoc" 
             value="http://hadoop.apache.org/core/docs/r${jdiff.stable}/api/"/>
 
@@ -868,15 +869,18 @@
     </javadoc>
   </target>	
 
-  <target name="api-xml" depends="javadoc">
+  <target name="jdiff.check" unless="jdiff.home">
+    <fail message="'jdiff.home' is not defined. Please pass -Djdiff.home=&lt;base of jdiff installation&gt; to Ant on the command-line." />
+  </target>
+
+  <target name="api-xml" depends="jdiff.check,javadoc">
     <javadoc>
        <doclet name="jdiff.JDiff"
                path="${jdiff.home}/jdiff.jar:${jdiff.home}/xerces.jar">
-         <param name="-apidir" value="${build.dir}"/>
+         <param name="-apidir" value="${jdiff.xml.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 >
@@ -887,15 +891,16 @@
   </target>
 	
   <target name="api-report" depends="api-xml">
+    <mkdir dir="${jdiff.build.dir}"/>
     <javadoc sourcepath="src/core,src/hdfs,src,mapred,src/tools"
-             destdir="${build.dir}"
+             destdir="${jdiff.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="-oldapidir" value="${jdiff.xml.dir}"/>
+         <param name="-newapidir" value="${jdiff.xml.dir}"/>
          <param name="-javadocold" value="${jdiff.stable.javadoc}"/>
          <param name="-javadocnew" value="${build.javadoc}/"/>
          <param name="-stats"/>
@@ -930,6 +935,7 @@
     <mkdir dir="${dist.dir}/bin"/>
     <mkdir dir="${dist.dir}/docs"/>
     <mkdir dir="${dist.dir}/docs/api"/>
+    <mkdir dir="${dist.dir}/docs/jdiff"/>
 
     <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
       <fileset dir="lib">

src/docs/src/documentation/conf/cli.xconf

@@ -211,6 +211,7 @@
 
    <exclude pattern="**/"/>
    <exclude pattern="api/**"/>
+   <exclude pattern="jdiff/**"/>
    <exclude pattern="changes.html"/>
    <exclude pattern="releasenotes.html"/>
 

src/docs/src/documentation/content/xdocs/site.xml

@@ -53,6 +53,7 @@ See http://forrest.apache.org/docs/linking.html for more info.
       <hod-config-guide href="hod_config_guide.html"/>
     </hod>
     <api       label="API Docs"           href="ext:api/index" />
+    <jdiff     label="API Changes"        href="ext:jdiff/changes" />
     <wiki      label="Wiki"               href="ext:wiki" />
     <faq       label="FAQ"                href="ext:faq" />
     <lists     label="Mailing Lists"      href="ext:lists" />
@@ -90,6 +91,9 @@ See http://forrest.apache.org/docs/linking.html for more info.
     </hod>
     <relnotes href="releasenotes.html" />
     <changes href="changes.html" />
+    <jdiff href="jdiff/">
+      <changes href="changes.html" />
+    </jdiff>
     <api href="api/">
       <index href="index.html" />
       <org href="org/">