You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2008/09/26 00:49:23 UTC
svn commit: r699123 - in /hadoop/core/branches/branch-0.18: CHANGES.txt
build.xml docs/jdiff/hadoop_0.18.1.xml
src/docs/src/documentation/conf/cli.xconf
src/docs/src/documentation/content/xdocs/site.xml
Author: cutting
Date: Thu Sep 25 15:49:22 2008
New Revision: 699123
URL: http://svn.apache.org/viewvc?rev=699123&view=rev
Log:
Merge -r 699118:699119 from trunk to 0.18 branch. Fixes: HADOOP-2421.
Added:
hadoop/core/branches/branch-0.18/docs/jdiff/hadoop_0.18.1.xml
- copied unchanged from r699119, hadoop/core/trunk/docs/jdiff/hadoop_0.18.1.xml
Modified:
hadoop/core/branches/branch-0.18/CHANGES.txt
hadoop/core/branches/branch-0.18/build.xml
hadoop/core/branches/branch-0.18/src/docs/src/documentation/conf/cli.xconf
hadoop/core/branches/branch-0.18/src/docs/src/documentation/content/xdocs/site.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=699123&r1=699122&r2=699123&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.18/CHANGES.txt Thu Sep 25 15:49:22 2008
@@ -6,6 +6,11 @@
HADOOP-4116. Balancer should provide better resource management. (hairong)
+ NEW FEATURES
+
+ HADOOP-2421. Add jdiff output to documentation, listing all API
+ changes from the prior release. (cutting)
+
Release 0.18.1 - 2008-09-17
IMPROVEMENTS
Modified: hadoop/core/branches/branch-0.18/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/build.xml?rev=699123&r1=699122&r2=699123&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/build.xml (original)
+++ hadoop/core/branches/branch-0.18/build.xml Thu Sep 25 15:49:22 2008
@@ -120,8 +120,9 @@
<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.build.dir" value="${build.docs}/jdiff"/>
+ <property name="jdiff.xml.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/"/>
@@ -804,15 +805,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=<base of jdiff installation> 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 >
@@ -823,15 +827,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"/>
@@ -866,6 +871,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">
Modified: hadoop/core/branches/branch-0.18/src/docs/src/documentation/conf/cli.xconf
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/docs/src/documentation/conf/cli.xconf?rev=699123&r1=699122&r2=699123&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/docs/src/documentation/conf/cli.xconf (original)
+++ hadoop/core/branches/branch-0.18/src/docs/src/documentation/conf/cli.xconf Thu Sep 25 15:49:22 2008
@@ -211,6 +211,7 @@
<exclude pattern="**/"/>
<exclude pattern="api/**"/>
+ <exclude pattern="jdiff/**"/>
<exclude pattern="changes.html"/>
<exclude pattern="releasenotes.html"/>
Modified: hadoop/core/branches/branch-0.18/src/docs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.18/src/docs/src/documentation/content/xdocs/site.xml?rev=699123&r1=699122&r2=699123&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.18/src/docs/src/documentation/content/xdocs/site.xml (original)
+++ hadoop/core/branches/branch-0.18/src/docs/src/documentation/content/xdocs/site.xml Thu Sep 25 15:49:22 2008
@@ -52,6 +52,7 @@
<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" />
@@ -89,6 +90,9 @@
</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/">