Author: gkesavan
Date: Fri Jun 5 09:23:49 2009
New Revision: 781958
URL: http://svn.apache.org/viewvc?rev=781958&view=rev
Log:
HADOOP-4687. Fix contrib test failures
Modified:
hadoop/core/branches/HADOOP-4687/mapred/build.xml
hadoop/core/branches/HADOOP-4687/mapred/src/contrib/streaming/ivy.xml
Modified: hadoop/core/branches/HADOOP-4687/mapred/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/build.xml?rev=781958&r1=781957&r2=781958&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/mapred/build.xml Fri Jun 5 09:23:49 2009
@@ -272,6 +272,12 @@
<mkdir dir="${test.build.dir}"/>
<mkdir dir="${test.build.classes}"/>
<mkdir dir="${test.build.extraconf}"/>
+ <tempfile property="touch.temp.file" destDir="${java.io.tmpdir}"/>
+ <touch millis="0" file="${touch.temp.file}">
+ <fileset dir="${conf.dir}" includes="**/*.template"/>
+ <fileset dir="${contrib.dir}" includes="**/*.template"/>
+ </touch>
+ <delete file="${touch.temp.file}"/>
<!-- copy all of the jsp and static files -->
<copy todir="${build.webapps}">
@@ -287,6 +293,11 @@
</patternset>
</unzip>
+ <copy todir="${conf.dir}" verbose="true">
+ <fileset dir="${conf.dir}" includes="**/*.template"/>
+ <mapper type="glob" from="*.template" to="*"/>
+ </copy>
+
<copy todir="${contrib.dir}" verbose="true">
<fileset dir="${contrib.dir}" includes="**/*.template"/>
<mapper type="glob" from="*.template" to="*"/>
Modified: hadoop/core/branches/HADOOP-4687/mapred/src/contrib/streaming/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/mapred/src/contrib/streaming/ivy.xml?rev=781958&r1=781957&r2=781958&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/mapred/src/contrib/streaming/ivy.xml
(original)
+++ hadoop/core/branches/HADOOP-4687/mapred/src/contrib/streaming/ivy.xml Fri
Jun 5 09:23:49 2009
@@ -45,36 +45,24 @@
rev="${jetty.version}"
conf="common->master"/>
<dependency org="org.mortbay.jetty"
+ name="jsp-api-2.1"
+ rev="${jetty.version}"
+ conf="common->master"/>
+ <dependency org="org.mortbay.jetty"
+ name="jsp-2.1"
+ rev="${jetty.version}"
+ conf="common->master"/>
+ <dependency org="org.mortbay.jetty"
name="servlet-api-2.5"
rev="${servlet-api-2.5.version}"
conf="common->master"/>
-<!-- <dependency org="tomcat"
- name="jasper-runtime"
- rev="${jasper.version}"
- conf="common->master"/>
- <dependency org="tomcat"
- name="jasper-compiler"
- rev="${jasper.version}"
- conf="common->master"/> -->
<dependency org="commons-httpclient"
name="commons-httpclient"
rev="${commons-httpclient.version}"
conf="common->master"/>
-<!--<dependency org="commons-codec"
- name="commons-codec"
- rev="${commons-codec.version}"
- conf="common->master"/> -->
<dependency org="log4j"
name="log4j"
rev="${log4j.version}"
conf="common->master"/>
-<!-- <dependency org="net.java.dev.jets3t"
- name="jets3t"
- rev="${jets3t.version}"
- conf="common->master"/> -->
-<!-- <dependency org="commons-net"
- name="commons-net"
- rev="${commons-net.version}"
- conf="common->master"/> -->
</dependencies>
</ivy-module>
