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 cd...@apache.org on 2009/10/14 10:24:41 UTC

svn commit: r825056 - in /hadoop/mapreduce/branches/branch-0.21: CHANGES.txt build.xml lib/hadoop-hdfs-0.21.0-dev.jar lib/hadoop-hdfs-test-0.21.0-dev.jar

Author: cdouglas
Date: Wed Oct 14 08:24:40 2009
New Revision: 825056

URL: http://svn.apache.org/viewvc?rev=825056&view=rev
Log:
MAPREDUCE-1029. Fix failing TestCopyFiles by restoring the unzipping of
HDFS webapps from the hdfs jar. Contributed by Aaron Kimball and Jothi Padmanabhan

Modified:
    hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
    hadoop/mapreduce/branches/branch-0.21/build.xml
    hadoop/mapreduce/branches/branch-0.21/lib/hadoop-hdfs-0.21.0-dev.jar
    hadoop/mapreduce/branches/branch-0.21/lib/hadoop-hdfs-test-0.21.0-dev.jar

Modified: hadoop/mapreduce/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/CHANGES.txt?rev=825056&r1=825055&r2=825056&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.21/CHANGES.txt Wed Oct 14 08:24:40 2009
@@ -739,3 +739,7 @@
 
     MAPREDUCE-986. Fix Rumen to work with truncated task lines. (Dick King via
     cdouglas)
+
+    MAPREDUCE-1029. Fix failing TestCopyFiles by restoring the unzipping of
+    HDFS webapps from the hdfs jar. (Aaron Kimball and Jothi Padmanabhan via
+    cdouglas)

Modified: hadoop/mapreduce/branches/branch-0.21/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/build.xml?rev=825056&r1=825055&r2=825056&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/build.xml (original)
+++ hadoop/mapreduce/branches/branch-0.21/build.xml Wed Oct 14 08:24:40 2009
@@ -293,6 +293,15 @@
       </fileset>
     </copy>
 
+     <unzip src="${lib.dir}/hadoop-hdfs-${hadoop-hdfs.version}.jar"
+         dest="${build.dir}">
+       <patternset>
+         <include name="webapps/hdfs/**"/>
+         <include name="webapps/datanode/**"/>
+         <include name="webapps/secondary/**"/>
+       </patternset>
+     </unzip>
+
     <copy todir="${conf.dir}" verbose="true">
       <fileset dir="${conf.dir}" includes="**/*.template"/>
       <mapper type="glob" from="*.template" to="*"/>

Modified: hadoop/mapreduce/branches/branch-0.21/lib/hadoop-hdfs-0.21.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/lib/hadoop-hdfs-0.21.0-dev.jar?rev=825056&r1=825055&r2=825056&view=diff
==============================================================================
Binary files - no diff available.

Modified: hadoop/mapreduce/branches/branch-0.21/lib/hadoop-hdfs-test-0.21.0-dev.jar
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/lib/hadoop-hdfs-test-0.21.0-dev.jar?rev=825056&r1=825055&r2=825056&view=diff
==============================================================================
Binary files - no diff available.