svn commit: r983126 - in /hadoop/mapreduce/branches/branch-0.21: CHANGES.txt build.xml src/contrib/capacity-scheduler/build.xml

[tomwhite]

Author: tomwhite
Date: Fri Aug  6 20:35:34 2010
New Revision: 983126

URL: http://svn.apache.org/viewvc?rev=983126&view=rev
Log:
Merge -r 983121:983122 from trunk to branch-0.21. Fixes: MAPREDUCE-1926

Modified:
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/build.xml
    
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/build.xml

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=983126&r1=983125&r2=983126&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Fri Aug  6 20:35:34 2010
@@ -1498,4 +1498,7 @@ Release 0.21.0 - 2010-07-01
     (Konstantin Boudnik)
 
     MAPREDUCE-1876. Fixes TaskAttemptStartedEvent to correctly log event type
-    for all task types. (Amar Kamat via amareshwari)
\ No newline at end of file
+    for all task types. (Amar Kamat via amareshwari)
+
+    MAPREDUCE-1926. MapReduce distribution is missing build-utils.xml.
+    (tomwhite)

Modified: hadoop/mapreduce/branches/branch-0.21/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/build.xml?rev=983126&r1=983125&r2=983126&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/build.xml Fri Aug  6 20:35:34 2010
@@ -863,8 +863,9 @@
   <!-- ================================================================== -->
   
   <target name="docs" depends="forrest.check" description="Generate 
forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache 
Forrest installation&gt; on the command line." if="forrest.home">
+       <!-- The template file may not exist if building from a tarball -->
        <copy file="${conf.dir}/mapred-queues.xml.template"
-             tofile="${build.docs}/mapred-queues.xml"/>
+             tofile="${build.docs}/mapred-queues.xml" failonerror="false"/>
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
          failonerror="true">
       <env key="JAVA_HOME" value="${java5.home}"/>
@@ -1137,6 +1138,7 @@
     </copy>
 
     <copy todir="${dist.dir}/" file="build.xml"/>
+    <copy todir="${dist.dir}/" file="build-utils.xml"/>
 
     <chmod perm="ugo+x" type="file" parallel="false">
         <fileset dir="${dist.dir}/bin"/>

Modified: 
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/build.xml?rev=983126&r1=983125&r2=983126&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/build.xml 
(original)
+++ 
hadoop/mapreduce/branches/branch-0.21/src/contrib/capacity-scheduler/build.xml 
Fri Aug  6 20:35:34 2010
@@ -25,9 +25,19 @@ to call at top-level: ant deploy-contrib
 
   <import file="../build-contrib.xml"/>
 
-  <target name="docs" depends="forrest.check" description="Generate 
forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache 
Forrest installation&gt; on the command line." if="forrest.home">
+  <target name="docs.check">
+    <condition property="generate-capacity-scheduler-docs">
+      <and>
+        <isset property="forrest.home"/>
+        <available file="${conf.dir}/capacity-scheduler.xml.template" 
property="capacity-scheduler.xml.template.present"/>
+      </and>
+    </condition>
+  </target>
+  <target name="docs" depends="forrest.check,docs.check" 
if="generate-capacity-scheduler-docs" description="Generate forrest-based 
documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest 
installation&gt; on the command line.">
+       <!-- The template file may not exist if building from a tarball -->
        <copy file="src/java/mapred-queues.xml.template"
-             tofile="${build.docs}/mapred-queues-capacity-scheduler.xml"/>
+             tofile="${build.docs}/mapred-queues-capacity-scheduler.xml"
+             failonerror="false"/>
     <xslt in="${conf.dir}/capacity-scheduler.xml.template"
        out="${build.docs}/capacity-scheduler-conf.html"
        style="${conf.dir}/configuration.xsl"/>