Author: gkesavan
Date: Fri Jun 5 20:38:36 2009
New Revision: 782128
URL: http://svn.apache.org/viewvc?rev=782128&view=rev
Log:
Fix hdfsproxy cactus tests
Modified:
hadoop/core/branches/HADOOP-4687/hdfs/build.xml
hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/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=782128&r1=782127&r2=782128&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/hdfs/build.xml (original)
+++ hadoop/core/branches/HADOOP-4687/hdfs/build.xml Fri Jun 5 20:38:36 2009
@@ -522,6 +522,7 @@
<target name="test-contrib" depends="compile, compile-hdfs-with-mr-test"
description="Run contrib unit tests">
<subant target="test">
<property name="version" value="${version}"/>
+ <property name="hadoop-version" value="${hadoop-core.version}"/>
<property name="clover.jar" value="${clover.jar}"/>
<fileset file="${contrib.dir}/build.xml"/>
</subant>
Modified: hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/build.xml?rev=782128&r1=782127&r2=782128&view=diff
==============================================================================
--- hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/build.xml
(original)
+++ hadoop/core/branches/HADOOP-4687/hdfs/src/contrib/hdfsproxy/build.xml Fri
Jun 5 20:38:36 2009
@@ -118,13 +118,21 @@
<war destfile="${build.dir}/${final.name}.war"
webxml="${basedir}/conf/tomcat-web.xml">
<lib dir="${common.ivy.lib.dir}">
<include name="commons-logging-${commons-logging.version}.jar"/>
- <include name="junit-${junit.version}.jar"/>
- <include name="log4j-${log4j.version}.jar"/>
- <include name="slf4j-api-${slf4j-api.version}.jar"/>
- <include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
- <include name="xmlenc-${xmlenc.version}.jar"/>
- <include name="core-${core.version}.jar"/>
+ <include name="junit-${junit.version}.jar"/>
+ <include name="log4j-${log4j.version}.jar"/>
+ <include name="slf4j-api-${slf4j-api.version}.jar"/>
+ <include name="slf4j-log4j12-${slf4j-log4j12.version}.jar"/>
+ <include name="xmlenc-${xmlenc.version}.jar"/>
+ <include name="core-${core.version}.jar"/>
</lib>
+ <lib dir="${hadoop.root}/lib">
+ <include name="hadoop-mapred-tools-${hadoop-version}.jar"/>
+ <include name="hadoop-mapred-examples-${hadoop-version}.jar"/>
+ <include name="hadoop-mapred-test-${hadoop-version}.jar"/>
+ <include name="hadoop-core-test-${hadoop-version}.jar"/>
+ <include name="hadoop-core-${hadoop-version}.jar"/>
+ <include name="hadoop-mapred-test-${hadoop-version}.jar"/>
+ </lib>
<classes dir="${proxy.conf.dir}" excludes="**/*.example
**/*.template **/*.sh hadoop-site.xml"/>
<classes dir="${build.classes}"/>
<classes dir="${hadoop.root}/build/classes"/>
@@ -438,15 +446,15 @@
<pathelement location="${proxy.conf.test}" />
<pathelement location="${test.build.dir}" />
<pathelement location="${hadoop.root}/build/test/classes"/>
- <pathelement location="${hadoop.root}/build/test/core/classes"/>
+ <pathelement
location="${hadoop.root}/lib/hadoop-core-test-${hadoop-version}.jar"/>
<pathelement location="${hadoop.root}/build/test/hdfs/classes"/>
- <pathelement location="${hadoop.root}/build/test/mapred/classes"/>
+ <pathelement
location="${hadoop.root}/lib/hadoop-mapred-test-${hadoop-version}.jar"/>
<!--<pathelement location="${hadoop.root}/src/contrib/test"/>-->
<pathelement location="${hadoop.root}/conf"/>
<pathelement location="${hadoop.root}/build"/>
<pathelement location="${hadoop.root}/build/classes"/>
- <pathelement location="${hadoop.root}/build/tools"/>
<pathelement location="${build.examples}"/>
+ <pathelement
location="${hadoop.root}/lib/hadoop-mapred-tools-${hadoop-version}.jar"/>
<pathelement path="${clover.jar}"/>
<path refid="contrib-classpath"/>
</path>
