You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by om...@apache.org on 2009/09/23 00:06:12 UTC
svn commit: r817863 - in /hadoop/hdfs/trunk: build.xml
conf/capacity-scheduler.xml.template conf/mapred-queue-acls.xml.template
conf/mapred-site.xml.template
Author: omalley
Date: Tue Sep 22 22:06:11 2009
New Revision: 817863
URL: http://svn.apache.org/viewvc?rev=817863&view=rev
Log:
HDFS-641. Move all of the components that depend on map/reduce to
map/reduce. (omalley)
Removed:
hadoop/hdfs/trunk/conf/capacity-scheduler.xml.template
hadoop/hdfs/trunk/conf/mapred-queue-acls.xml.template
hadoop/hdfs/trunk/conf/mapred-site.xml.template
Modified:
hadoop/hdfs/trunk/build.xml
Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=817863&r1=817862&r2=817863&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Tue Sep 22 22:06:11 2009
@@ -32,7 +32,6 @@
<property name="hadoop-mr.version" value="0.22.0-dev"/>
<property name="final.name" value="${name}-${version}"/>
<property name="test.hdfs.final.name" value="${name}-test-${version}"/>
- <property name="test.hdfswithmr.final.name" value="${name}-hdfswithmr-test-${version}"/>
<property name="ant.final.name" value="${name}-ant-${version}"/>
<property name="year" value="2009"/>
@@ -90,7 +89,6 @@
<property name="test.junit.maxmemory" value="512m" />
<property name="test.hdfs.build.classes" value="${test.build.dir}/classes"/>
- <property name="test.hdfs.with.mr.build.classes" value="${test.build.dir}/hdfs-with-mr/classes"/>
<property name="test.hdfs.with.mr.classpath.id" value="test.hdfs.with.mr.classpath"/>
<property name="test.hdfs.commit.tests.file" value="${test.src.dir}/commit-tests" />
@@ -396,7 +394,7 @@
<!-- -->
<!-- ================================================================== -->
- <target name="jar-test-fault-inject" depends="jar-hdfs-test-fault-inject, jar-hdfswithmr-test-fault-inject"
+ <target name="jar-test-fault-inject" depends="jar-hdfs-test-fault-inject"
description="Make hadoop-test.jar files"/>
<target name="jar-hdfs-test-fault-inject" description="Make hadoop-test-fi.jar">
@@ -406,14 +404,6 @@
</subant>
</target>
- <target name="jar-hdfswithmr-test-fault-inject" description="Make hadoop-hdfswithmr-test-fi.jar">
- <subant buildpath="build.xml" target="jar-hdfswithmr-test">
- <property name="build.dir" value="${build-fi.dir}"/>
- <property name="test.hdfswithmr.final.name"
- value="${name}-hdsfwithmr-test-${version}-fi"/>
- </subant>
- </target>
-
<!--End of Fault Injection (FI) related session-->
<target name="compile-core" depends="clover, compile-hdfs-classes" description="Compile"/>
@@ -479,30 +469,12 @@
<copy file="${test.src.dir}/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/fsimageV19" todir="${test.cache.data}"/>
</target>
- <target name="compile-hdfs-with-mr-test" depends="compile-hdfs-test">
- <mkdir dir="${test.hdfs.with.mr.build.classes}"/>
- <javac
- encoding="${build.encoding}"
- srcdir="${test.src.dir}/hdfs-with-mr"
- includes="org/apache/hadoop/**/*.java"
- destdir="${test.hdfs.with.mr.build.classes}"
- debug="${javac.debug}"
- optimize="${javac.optimize}"
- target="${javac.version}"
- source="${javac.version}"
- deprecation="${javac.deprecation}">
- <compilerarg line="${javac.args} ${javac.args.warnings}" />
- <classpath refid="test.hdfs.with.mr.classpath"/>
- </javac>
- </target>
-
-
<!-- ================================================================== -->
<!-- Make hadoop-test.jar -->
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="jar-test" depends="jar-hdfs-test, jar-hdfswithmr-test" description="Make hadoop-test.jar"/>
+ <target name="jar-test" depends="jar-hdfs-test" description="Make hadoop-test.jar"/>
<target name="jar-hdfs-test" depends="compile-hdfs-test" description="Make hadoop-hdfs-test.jar">
<copy todir="${test.build.classes}">
@@ -522,24 +494,6 @@
</jar>
</target>
- <target name="jar-hdfswithmr-test" depends="compile-hdfs-with-mr-test" description="Make hadoop-hdfswithmr-test.jar">
- <copy todir="${test.build.classes}">
- <fileset dir="${test.hdfs.with.mr.build.classes}"/>
- </copy>
- <jar jarfile="${build.dir}/${test.hdfswithmr.final.name}.jar"
- basedir="${test.build.classes}">
- <manifest>
- <attribute name="Main-Class"
- value="org/apache/hadoop/test/HdfsWithMRTestDriver"/>
- <section name="org/apache/hadoop">
- <attribute name="Implementation-Title" value="${ant.project.name}"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Apache"/>
- </section>
- </manifest>
- </jar>
- </target>
-
<condition property="tests.notestcase">
<and>
<isfalse value="${test.fault.inject}"/>
@@ -646,20 +600,10 @@
<fail unless="continueOnFailure">Tests failed!</fail>
</target>
- <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>
- </target>
-
<target name="test-core" description="Run hdfs unit tests">
<delete file="${test.build.dir}/testsfailed"/>
<property name="continueOnFailure" value="true"/>
<antcall target="run-test-hdfs"/>
- <antcall target="run-test-hdfs-with-mr"/>
<antcall target="run-test-hdfs-fault-inject"/>
<available file="${test.build.dir}/testsfailed" property="testsfailed"/>
<fail if="testsfailed">Tests failed!</fail>