MAPREDUCE-2465. Disable raid contrib which is unable to compile after HDFS federation merge. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1098820 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 70a5a0b..96e49d5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -151,6 +151,9 @@
     MAPREDUCE-2448. NoSuchMethodError:
     org.apache.hadoop.hdfs.TestDatanodeBlockScanner.corruptReplica(..) (eli)
 
+    MAPREDUCE-2465. Disable raid contrib which is unable to compile after
+    HDFS federation merge. (todd)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES
diff --git a/src/contrib/build.xml b/src/contrib/build.xml
index ddae8b9..6c2e364 100644
--- a/src/contrib/build.xml
+++ b/src/contrib/build.xml
@@ -22,13 +22,21 @@
   <!-- In case one of the contrib subdirectories -->
   <!-- fails the build or test targets and you cannot fix it: -->
   <!-- Then add to fileset: excludes="badcontrib/build.xml" -->
+  <patternset id="contrib-builds">
+    <include name="*/build.xml" />
+      <!-- raid compilation disabled due to failure after
+           federation merge. See MAPREDUCE-2465. -->
+    <exclude name="raid/build.xml" />
+  </patternset>
 
   <!-- ====================================================== -->
   <!-- Compile contribs.                                      -->
   <!-- ====================================================== -->
   <target name="compile">
     <subant target="compile">
-      <fileset dir="." includes="*/build.xml"/>
+      <fileset dir=".">
+        <patternset refid="contrib-builds" />
+      </fileset>
     </subant>
   </target>
 
@@ -37,7 +45,9 @@
   <!-- ====================================================== -->
   <target name="compile-test">
     <subant target="compile-test">
-      <fileset dir="." includes="*/build.xml"/>
+      <fileset dir=".">
+        <patternset refid="contrib-builds" />
+      </fileset>
     </subant>
   </target>
   
@@ -46,7 +56,9 @@
   <!-- ====================================================== -->
   <target name="package">
     <subant target="package">
-      <fileset dir="." includes="*/build.xml"/>
+      <fileset dir=".">
+        <patternset refid="contrib-builds" />
+      </fileset>
     </subant>
   </target>
   
@@ -68,7 +80,9 @@
       <fileset dir="." includes="vertica/build.xml"/>
       <!-- mumak tests disabled due to timeouts. See MAPREDUCE-2348
       <fileset dir="." includes="mumak/build.xml"/> -->
-      <fileset dir="." includes="raid/build.xml"/>
+      <!-- raid tests disabled due to compilation failure after
+           federation merge. See MAPREDUCE-2465.
+      <fileset dir="." includes="raid/build.xml"/> -->
     </subant>
     <available file="${build.contrib.dir}/testsfailed" property="testsfailed"/>
     <fail if="testsfailed">Tests failed!</fail>
@@ -108,7 +122,9 @@
   <!-- ====================================================== -->
   <target name="clean">
     <subant target="clean">
-      <fileset dir="." includes="*/build.xml"/>
+      <fileset dir=".">
+        <patternset refid="contrib-builds" />
+      </fileset>
     </subant>
   </target>