Merging changes r1076696:r1079069 except r1078925 from trunk to federation

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1079611 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -265,6 +265,8 @@ Trunk (unreleased changes)
     HDFS-1629. Add a method to BlockPlacementPolicy for keeping the chosen
     nodes in the output array.  (szetszwo)
 
+    HDFS-1731. Allow using a file to exclude certain tests from build (todd)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image
@@ -315,6 +317,9 @@ Trunk (unreleased changes)
 
     HDFS-1600. Fix release audit warnings on trunk. (todd)
 
+    HDFS-1691. Remove a duplicated static initializer for reading default
+    configurations in DFSck.  (Alexey Diomin via szetszwo)
+
 Release 0.22.0 - Unreleased
 
   NEW FEATURES
@@ -814,6 +819,9 @@ Release 0.21.1 - Unreleased
     block placement and checkpoint/backup node features.  (Joe Crobak
     via szetszwo)
 
+
+Release 0.21.0 - 2010-08-13
+
   INCOMPATIBLE CHANGES
 
     HDFS-538. Per the contract elucidated in HADOOP-6201, throw

build.xml

@@ -101,6 +101,7 @@
   <property name="test.hdfs.commit.tests.file" value="${test.src.dir}/commit-tests" />
   <property name="test.hdfs.smoke.tests.file" value="${test.src.dir}/smoke-tests" />
   <property name="test.hdfs.all.tests.file" value="${test.src.dir}/all-tests" />
+  <property name="test.exclude.file" value="/dev/null" />
 
   <property name="test.hdfs.rpc.engine" value=""/>
   <property name="test.libhdfs.dir" value="${test.build.dir}/libhdfs"/>
@@ -638,6 +639,7 @@
               aop/** system/**">
              <patternset>
                <includesfile name="@{test.file}"/>
+               <excludesfile name="${test.exclude.file}" />
              </patternset>
              <patternset refid="@{exclude.list.id}"/>
          </fileset>
@@ -645,7 +647,8 @@
         <batchtest todir="@{test.dir}" if="tests.notestcase.fi">
           <fileset dir="@{fileset.dir}/aop"
             includes="**/${test.include}.java"
-            excludes="**/${test.exclude}.java" />
+            excludes="**/${test.exclude}.java"
+            excludesfile="${test.exclude.file}" />
         </batchtest>
         <batchtest todir="@{test.dir}" if="tests.testcase">
           <fileset dir="@{fileset.dir}/@{suite.type}" includes="**/${testcase}.java"

src/java/org/apache/hadoop/hdfs/tools/DFSck.java

@@ -333,11 +333,6 @@ public class DFSck extends Configured implements Tool {
     return errCode;
   }
 
-  static{
-    Configuration.addDefaultResource("hdfs-default.xml");
-    Configuration.addDefaultResource("hdfs-site.xml");
-  }
-  
   public static void main(String[] args) throws Exception {
     // -files option is also used by GenericOptionsParser
     // Make sure that is not the first argument for fsck