Revert HDFS-2341.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1172750 13f79535-47bb-0310-9956-ffa450edef68

hdfs/build.xml

@@ -375,12 +375,11 @@
      <subant target="compile">
         <property name="version" value="${version}"/>
         <!-- Need to pass along properties so that ivy in contrib build resolves correctly. -->
-     	<property name="hadoop-version" value="${hadoop-common.version}"/>
         <property name="hadoop-common.version" value="${hadoop-common.version}"/>
-        <property name="clover.jar" value="${clover.jar}"/>
         <property name="ivy_repo_url" value="${ivy_repo_url}"/>
         <property name="offline" value="${offline}"/>
         <property name="resolvers" value="${resolvers}"/>
+     	<property name="basedir" value="${basedir}"/>
         <fileset file="${contrib.dir}/build.xml"/>
      </subant>  	
   </target>
@@ -747,6 +746,7 @@
        <property name="ivy_repo_url" value="${ivy_repo_url}"/>
        <property name="offline" value="${offline}"/>
        <property name="resolvers" value="${resolvers}"/>
+       <property name="basedir" value="${basedir}"/>
        <fileset file="${contrib.dir}/build.xml"/>
     </subant> 
   </target>
@@ -767,6 +767,7 @@
       <property name="ivy_repo_url" value="${ivy_repo_url}"/>
       <property name="offline" value="${offline}"/>
       <property name="resolvers" value="${resolvers}"/>
+      <property name="basedir" value="${basedir}"/>
       <fileset file="${basedir}/build.xml"/>
      </subant>
   </target>
@@ -1019,6 +1020,7 @@
       <property name="ivy_repo_url" value="${ivy_repo_url}"/>
       <property name="offline" value="${offline}"/>
       <property name="resolvers" value="${resolvers}"/>
+      <property name="basedir" value="${basedir}"/>
       <fileset file="${contrib.dir}/build.xml"/>
     </subant>  	
 
@@ -1117,13 +1119,7 @@
       distribution directory so contribs know where to install to.-->
       <property name="version" value="${version}"/>
       <property name="dist.dir" value="${dist.dir}"/>
-      <property name="version" value="${version}"/>
-      <property name="hadoop-version" value="${hadoop-common.version}"/>
-      <property name="clover.jar" value="${clover.jar}"/>
-      <property name="hadoop-common.version" value="${hadoop-common.version}"/>
-      <property name="ivy_repo_url" value="${ivy_repo_url}"/>
-      <property name="offline" value="${offline}"/>
-      <property name="resolvers" value="${resolvers}"/>
+      <property name="basedir" value="${basedir}"/>
       <fileset file="${contrib.dir}/build.xml"/>
     </subant>  	
 
@@ -1295,13 +1291,7 @@
   <!-- ================================================================== -->
   <target name="clean-contrib">
      <subant target="clean">
-     	<property name="version" value="${version}"/>
-        <property name="hadoop-version" value="${hadoop-common.version}"/>
-     	<property name="clover.jar" value="${clover.jar}"/>
-     	<property name="hadoop-common.version" value="${hadoop-common.version}"/>
-     	<property name="ivy_repo_url" value="${ivy_repo_url}"/>
-     	<property name="offline" value="${offline}"/>
-     	<property name="resolvers" value="${resolvers}"/>
+     	<property name="basedir" value="${basedir}"/>
         <fileset file="src/contrib/build.xml"/>
      </subant>  	
   </target>

hdfs/src/contrib/build.xml

@@ -27,14 +27,7 @@
   <!-- Compile contribs.                                      -->
   <!-- ====================================================== -->
   <target name="compile">
-    <subant target="compile">
-      <property name="version" value="${version}"/>
-      <property name="hadoop-version" value="${hadoop-common.version}"/>
-      <property name="clover.jar" value="${clover.jar}"/>
-      <property name="hadoop-common.version" value="${hadoop-common.version}"/>
-      <property name="ivy_repo_url" value="${ivy_repo_url}"/>
-      <property name="offline" value="${offline}"/>
-      <property name="resolvers" value="${resolvers}"/>
+    <subant target="compile"  inheritAll="true">
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
@@ -44,13 +37,6 @@
   <!-- ====================================================== -->
   <target name="package">
     <subant target="package" inheritAll="true">
-      <property name="version" value="${version}"/>
-      <property name="hadoop-version" value="${hadoop-common.version}"/>
-      <property name="clover.jar" value="${clover.jar}"/>
-      <property name="hadoop-common.version" value="${hadoop-common.version}"/>
-      <property name="ivy_repo_url" value="${ivy_repo_url}"/>
-      <property name="offline" value="${offline}"/>
-      <property name="resolvers" value="${resolvers}"/>
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>
@@ -61,13 +47,6 @@
   <target name="test">
     <!-- hdfsproxy tests failing due to HDFS-1666
     <subant target="test" inheritAll="true">
-      <property name="version" value="${version}"/>
-      <property name="hadoop-version" value="${hadoop-common.version}"/>
-      <property name="clover.jar" value="${clover.jar}"/>
-      <property name="hadoop-common.version" value="${hadoop-common.version}"/>
-      <property name="ivy_repo_url" value="${ivy_repo_url}"/>
-      <property name="offline" value="${offline}"/>
-      <property name="resolvers" value="${resolvers}"/>
       <fileset dir="." includes="hdfsproxy/build.xml"/>
     </subant>
       -->
@@ -79,13 +58,6 @@
   <!-- ====================================================== -->
   <target name="clean">
     <subant target="clean" inheritAll="true">
-      <property name="version" value="${version}"/>
-      <property name="hadoop-version" value="${hadoop-common.version}"/>
-      <property name="clover.jar" value="${clover.jar}"/>
-      <property name="hadoop-common.version" value="${hadoop-common.version}"/>
-      <property name="ivy_repo_url" value="${ivy_repo_url}"/>
-      <property name="offline" value="${offline}"/>
-      <property name="resolvers" value="${resolvers}"/>
       <fileset dir="." includes="*/build.xml"/>
     </subant>
   </target>