Author: omalley
Date: Wed Jun 3 04:57:51 2009
New Revision: 781261
URL: http://svn.apache.org/viewvc?rev=781261&view=rev
Log:
HADOOP-4687. Fix for webapps in hdfs and mapred.
Modified:
hadoop/core/branches/HADOOP-4687/hdfs/build.xml
hadoop/core/branches/HADOOP-4687/mapred/build.xml
Modified: hadoop/core/branches/HADOOP-4687/hdfs/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/hdfs/build.xml?rev=781261&r1=781260&r2=781261&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/hdfs/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/hdfs/build.xml Wed Jun 3 04:57:51 2009
@@ -250,6 +250,12 @@
<exclude name="**/*.jsp" />
</fileset>
</copy>
+ <unzip src="${lib.dir}/hadoop-mapred-${hadoop-mr.version}.jar"
+ dest="${build.dir}">
+ <patternset>
+ <include name="webapps/**"/>
+ </patternset>
+ </unzip>
</target>
<target name="compile-hdfs-classes" depends="init">
Modified: hadoop/core/branches/HADOOP-4687/mapred/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/build.xml?rev=781261&r1=781260&r2=781261&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/mapred/build.xml Wed Jun 3 04:57:51 2009
@@ -280,6 +280,13 @@
</fileset>
</copy>
+ <unzip src="${lib.dir}/hadoop-hdfs-${hadoop-hdfs.version}.jar"
+ dest="${build.dir}">
+ <patternset>
+ <include name="webapps/**"/>
+ </patternset>
+ </unzip>
+
<copy todir="${contrib.dir}" verbose="true">
<fileset dir="${contrib.dir}" includes="**/*.template"/>
<mapper type="glob" from="*.template" to="*"/>
