Return-Path: 
 <mapreduce-commits-return-441-apmail-hadoop-mapreduce-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org
Received: (qmail 22584 invoked from network); 3 Nov 2009 07:50:29 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 3 Nov 2009 07:50:29 -0000
Received: (qmail 59577 invoked by uid 500); 3 Nov 2009 07:50:29 -0000
Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org
Received: (qmail 59525 invoked by uid 500); 3 Nov 2009 07:50:28 -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 59515 invoked by uid 99); 3 Nov 2009 07:50:28 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Nov 2009 07:50:28 +0000
X-ASF-Spam-Status: No, hits=-2.8 required=5.0
	tests=AWL,BAYES_00
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; Tue, 03 Nov 2009 07:50:25 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 86B8823888DA; Tue,  3 Nov 2009 07:50:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r832326 - in /hadoop/mapreduce/trunk: CHANGES.txt
 src/contrib/mumak/build.xml
Date: Tue, 03 Nov 2009 07:50:05 -0000
To: mapreduce-commits@hadoop.apache.org
From: cdouglas@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20091103075005.86B8823888DA@eris.apache.org>

Author: cdouglas
Date: Tue Nov  3 07:50:05 2009
New Revision: 832326

URL: http://svn.apache.org/viewvc?rev=832326&view=rev
Log:
MAPREDUCE-1038. Weave Mumak aspects only if related files have changed.
Contributed by Aaron Kimball

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/src/contrib/mumak/build.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=832326&r1=832325&r2=832326&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Nov  3 07:50:05 2009
@@ -840,3 +840,6 @@
     queue capacity. (Rahul Kumar Singh via yhemanth)
 
     MAPREDUCE-1016.  Make the job history log format JSON.  (cutting)
+
+    MAPREDUCE-1038. Weave Mumak aspects only if related files have changed.
+    (Aaron Kimball via cdouglas)

Modified: hadoop/mapreduce/trunk/src/contrib/mumak/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/build.xml?rev=832326&r1=832325&r2=832326&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/build.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/build.xml Tue Nov  3 07:50:05 2009
@@ -30,6 +30,7 @@
   <property name="javac.version" value="1.6"/>
   <property name="javac.args.warnings" value="-Xlint:unchecked"/>
   <import file="../build-contrib.xml"/>
+  <property name="mumak.stamp.file" value="${build.dir}/mumak.uptodate.stamp"/>
 
   <target name="compile-java-sources" depends="init, ivy-retrieve-common" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
@@ -68,6 +69,7 @@
       deprecation="${javac.deprecation}">
       <classpath refid="contrib-classpath"/>
     </iajc>
+    <touch file="${mumak.stamp.file}" mkdirs="true" />
     <echo message="Weaving of aspects is finished"/>
   </target>
 
@@ -94,7 +96,7 @@
         <include name="*.jar"/>
       </fileset>
     </copy>
-    <exec executable="sed">                                                                                                          
+    <exec executable="sed">
       <arg value="-i"/>
       <arg value="-e"/>
       <arg value="s/^HADOOP_VERSION=/HADOOP_VERSION=${version}/"/>
@@ -104,14 +106,13 @@
   </target>
 
   <target name="check.aspects">
-    <uptodate property="build.unnecessary" 
-        targetfile="${build.dir}/${dest.jar}" >
-        <srcfiles dir="${hadoop.root}/src/java/"
-          includes="org/apache/hadoop/**/*.java" />
-        <srcfiles dir="${hadoop.root}/build/src/"
-          includes="org/apache/hadoop/**/*.java" />
-        <srcfiles dir="${src.dir}"
-          includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj" />
+    <uptodate property="build.unnecessary"
+        targetfile="${mumak.stamp.file}">
+      <srcfiles dir="${hadoop.root}/src/java/"
+        includes="org/apache/hadoop/**/*.java" />
+      <srcfiles dir="${hadoop.root}/src/webapps/"
+        includes="**/*.jsp" />
+      <srcfiles dir="${src.dir}" includes="org/apache/hadoop/**/*.aj" />
     </uptodate>
   </target>