Return-Path: 
 <mapreduce-commits-return-1016-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 91818 invoked from network); 6 Aug 2010 20:32:21 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 6 Aug 2010 20:32:21 -0000
Received: (qmail 53833 invoked by uid 500); 6 Aug 2010 20:32:21 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 53754 invoked by uid 500); 6 Aug 2010 20:32:20 -0000
Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:mapreduce-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:mapreduce-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:mapreduce-commits@hadoop.apache.org>
List-Id: <mapreduce-commits.hadoop.apache.org>
Reply-To: mapreduce-dev@hadoop.apache.org
Delivered-To: mailing list mapreduce-commits@hadoop.apache.org
Received: (qmail 53746 invoked by uid 99); 6 Aug 2010 20:32:20 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Aug 2010 20:32:20 +0000
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; Fri, 06 Aug 2010 20:32:17 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 35782238897D; Fri,  6 Aug 2010 20:31:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r983122 - in /hadoop/mapreduce/trunk: CHANGES.txt
 build.xml
 src/contrib/capacity-scheduler/build.xml
Date: Fri, 06 Aug 2010 20:31:00 -0000
To: mapreduce-commits@hadoop.apache.org
From: tomwhite@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100806203100.35782238897D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tomwhite
Date: Fri Aug  6 20:30:59 2010
New Revision: 983122

URL: http://svn.apache.org/viewvc?rev=983122&view=rev
Log:
MAPREDUCE-1926. MapReduce distribution is missing build-utils.xml

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/build.xml
    hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/build.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=983122&r1=983121&r2=983122&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Fri Aug  6 20:30:59 2010
@@ -1726,3 +1726,7 @@ Release 0.21.0 - Unreleased
 
     MAPREDUCE-1876. Fixes TaskAttemptStartedEvent to correctly log event type
     for all task types. (Amar Kamat via amareshwari)
+
+    MAPREDUCE-1926. MapReduce distribution is missing build-utils.xml.
+    (tomwhite)
+

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=983122&r1=983121&r2=983122&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Fri Aug  6 20:30:59 2010
@@ -865,8 +865,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}"/>
@@ -1139,6 +1140,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/trunk/src/contrib/capacity-scheduler/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/build.xml?rev=983122&r1=983121&r2=983122&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/build.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/build.xml Fri Aug  6 20:30:59 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"/>