You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2010/04/26 23:40:56 UTC
svn commit: r938249 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml
Author: tomwhite
Date: Mon Apr 26 21:40:56 2010
New Revision: 938249
URL: http://svn.apache.org/viewvc?rev=938249&view=rev
Log:
MAPREDUCE-1625. Improve grouping of packages in Javadoc.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/build.xml
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=938249&r1=938248&r2=938249&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Apr 26 21:40:56 2010
@@ -273,6 +273,8 @@ Trunk (unreleased changes)
MAPREDUCE-1650. Exclude Private elements from generated MapReduce
Javadoc. (tomwhite)
+ MAPREDUCE-1625. Improve grouping of packages in Javadoc. (tomwhite)
+
OPTIMIZATIONS
MAPREDUCE-270. Fix the tasktracker to optionally send an out-of-band
Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=938249&r1=938248&r2=938249&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Mon Apr 26 21:40:56 2010
@@ -866,12 +866,11 @@
<packageset dir="${mapred.src.dir}"/>
<packageset dir="${examples.dir}"/>
- <packageset dir="src/contrib/capacity-scheduler/src/java"/>
- <packageset dir="src/contrib/streaming/src/java"/>
- <packageset dir="src/contrib/data_join/src/java"/>
- <packageset dir="src/contrib/index/src/java"/>
- <packageset dir="src/contrib/gridmix/src/java"/>
- <packageset dir="src/contrib/mumak/src/java"/>
+ <packageset dir="src/contrib/data_join/src/java"/>
+ <packageset dir="src/contrib/gridmix/src/java"/>
+ <packageset dir="src/contrib/index/src/java"/>
+ <packageset dir="src/contrib/mumak/src/java"/>
+ <packageset dir="src/contrib/streaming/src/java"/>
<link href="${javadoc.link.java}"/>
@@ -886,12 +885,14 @@
<pathelement location="${build.tools}"/>
</classpath>
- <group title="Examples" packages="org.apache.hadoop.examples*"/>
+ <group title="Packages" packages="org.apache.*"/>
+ <group title="Libraries" packages="org.apache.hadoop.mapred.lib*:org.apache.hadoop.mapreduce.lib*"/>
+ <group title="Examples" packages="org.apache.hadoop.examples*"/>
- <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*"/>
<group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
+ <group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/>
<group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
-
+ <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*:org.apache.hadoop.typedbytes*"/>
</javadoc>
</target>
@@ -923,11 +924,13 @@
<packageset dir="${mapred.src.dir}"/>
<packageset dir="${examples.dir}"/>
- <packageset dir="src/contrib/streaming/src/java"/>
- <packageset dir="src/contrib/data_join/src/java"/>
- <packageset dir="src/contrib/index/src/java"/>
- <packageset dir="src/contrib/gridmix/src/java"/>
- <packageset dir="src/contrib/mumak/src/java"/>
+ <!-- Don't include contrib modules that use the same packages as core
+ MapReduce. This includes capacity-scheduler, dynamic-scheduler,
+ fairscheduler, mumak. See also the javadoc-dev target. -->
+ <packageset dir="src/contrib/data_join/src/java"/>
+ <packageset dir="src/contrib/gridmix/src/java"/>
+ <packageset dir="src/contrib/index/src/java"/>
+ <packageset dir="src/contrib/streaming/src/java"/>
<link href="${javadoc.link.java}"/>
@@ -942,11 +945,14 @@
<pathelement location="${build.tools}"/>
</classpath>
- <group title="Examples" packages="org.apache.hadoop.examples*"/>
+ <group title="Packages" packages="org.apache.*"/>
+ <group title="Libraries" packages="org.apache.hadoop.mapred.lib*:org.apache.hadoop.mapreduce.lib*"/>
+ <group title="Examples" packages="org.apache.hadoop.examples*"/>
- <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*"/>
<group title="contrib: DataJoin" packages="org.apache.hadoop.contrib.utils.join*"/>
+ <group title="contrib: Gridmix" packages="org.apache.hadoop.mapred.gridmix*"/>
<group title="contrib: Index" packages="org.apache.hadoop.contrib.index*"/>
+ <group title="contrib: Streaming" packages="org.apache.hadoop.streaming*:org.apache.hadoop.typedbytes*"/>
<doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsStandardDoclet"
path="${common.ivy.lib.dir}/hadoop-core-${version}.jar"/>
</javadoc>