hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1104568 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml ivy.xml src/test/aop/build/aop.xml
Date Tue, 17 May 2011 21:31:10 GMT
Author: szetszwo
Date: Tue May 17 21:31:10 2011
New Revision: 1104568

URL: http://svn.apache.org/viewvc?rev=1104568&view=rev
Log:
HDFS-1939.  In ivy.xml, test conf should not extend common conf.  Contributed by Eric Yang

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml
    hadoop/hdfs/trunk/ivy.xml
    hadoop/hdfs/trunk/src/test/aop/build/aop.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1104568&r1=1104567&r2=1104568&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue May 17 21:31:10 2011
@@ -430,6 +430,9 @@ Trunk (unreleased changes)
     HDFS-1573. Add useful tracing information to Lease Renewer thread names
     (todd)
 
+    HDFS-1939.  In ivy.xml, test conf should not extend common conf.
+    (Eric Yang via szetszwo)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1104568&r1=1104567&r2=1104568&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Tue May 17 21:31:10 2011
@@ -264,7 +264,7 @@
   <!-- ====================================================== -->
   <!-- Stuff needed by all targets                            -->
   <!-- ====================================================== -->
-  <target name="init" depends="ivy-retrieve-common,ivy-retrieve-hdfs">
+  <target name="init" depends="ivy-retrieve-common,ivy-retrieve-hdfs,ivy-retrieve-test">
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${build.classes}"/>
     <mkdir dir="${build.src}"/>
@@ -407,7 +407,7 @@
     </jar>
   </target>
 
-  <target name="compile-hdfs-test" depends="compile-hdfs-classes, ivy-retrieve-hdfs, ivy-retrieve-test">
+  <target name="compile-hdfs-test" depends="compile-hdfs-classes">
     <macro-compile-hdfs-test
       target.dir="${test.hdfs.build.classes}"
       source.dir="${test.src.dir}/hdfs;${test.src.dir}/unit"

Modified: hadoop/hdfs/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/ivy.xml?rev=1104568&r1=1104567&r2=1104568&view=diff
==============================================================================
--- hadoop/hdfs/trunk/ivy.xml (original)
+++ hadoop/hdfs/trunk/ivy.xml Tue May 17 21:31:10 2011
@@ -39,7 +39,7 @@
     <conf name="common" visibility="private" extends="compile" description="Hadoop common
artifacts"/>
     <conf name="hdfs" visibility="private" extends="compile,runtime" description="HDFS
dependent artifacts"/>
     <conf name="javadoc" visibility="private" description="artiracts required while performing
doc generation" extends="common"/>
-    <conf name="test" extends="common" visibility="private" description="the classpath
needed to run tests"/>
+    <conf name="test" extends="master" visibility="private" description="the classpath
needed to run tests"/>
     <conf name="system" extends="test" visibility="private" description="the classpath
needed to run system tests"/>
 
     <conf name="test-hdfswithmr" extends="test, common" visibility="private" description="the
classpath needed to run tests"/>
@@ -57,8 +57,12 @@
   </publications>
   <dependencies>
     
-    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default"/>
-    <dependency org="org.apache.hadoop" name="hadoop-common-instrumented" rev="${hadoop-common.version}"
conf="system->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common" rev="${hadoop-common.version}"
conf="common->default">
+      <exclude module="ant"/>
+    </dependency>
+    <dependency org="org.apache.hadoop" name="hadoop-common-instrumented" rev="${hadoop-common.version}"
conf="system->default">
+      <exclude module="ant"/>
+    </dependency>
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->master"/>
     <dependency org="commons-daemon" name="commons-daemon" rev="${commons-daemon.version}"
conf="hdfs->default" />
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
@@ -72,7 +76,7 @@
 
     <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}" conf="test->master"/>
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}" conf="test->master"/>
-    <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="test->default"/>
+    <dependency org="org.apache.hadoop" name="hadoop-common-test" rev="${hadoop-common.version}"
conf="test->master"/>
 
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}" conf="checkstyle->default"/>
 

Modified: hadoop/hdfs/trunk/src/test/aop/build/aop.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/aop/build/aop.xml?rev=1104568&r1=1104567&r2=1104568&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/test/aop/build/aop.xml (original)
+++ hadoop/hdfs/trunk/src/test/aop/build/aop.xml Tue May 17 21:31:10 2011
@@ -124,7 +124,7 @@
   <!-- ================ -->
   <!-- run system tests -->
   <!-- ================ -->
-  <target name="test-system" depends="ivy-retrieve-common, ivy-retrieve-hdfs, ivy-retrieve-system"
+  <target name="test-system" depends="init, ivy-retrieve-system"
     description="Run system tests">
     <subant buildpath="build.xml" target="jar-test-system"/>
     <macro-test-runner test.file="${test.hdfs.all.tests.file}"
@@ -143,7 +143,7 @@
     <delete file="${compile-inject.output}"/>
     <weave-injectfault-aspects dest.dir="${build-fi.dir}/classes"
                                src.dir="${test.src.dir}/aop"
-      aspects.jar="${build-fi.dir}/ivy/lib/${ant.project.name}/test/hadoop-common-${project.version}.jar">
+      aspects.jar="${build-fi.dir}/ivy/lib/${ant.project.name}/common/hadoop-common-${project.version}.jar">
     </weave-injectfault-aspects>
   </target>
 



Mime
View raw message