HADOOP-6790. svn merge -c 966508 from trunk

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

CHANGES.txt

@@ -908,6 +908,9 @@ Release 0.21.0 - 2010-07-01
 
   BUG FIXES
 
+    HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
+    aspect files. (Konstantin Boudnik)
+
     HADOOP-6860. 'compile-fault-inject' should never be called directly.
     (Konstantin Boudnik)
 

src/test/aop/build/aop.xml

@@ -63,7 +63,7 @@
     <iajc
       encoding="${build.encoding}" 
       srcdir="${java.src.dir};${build.src};${src.dir.path}" 
-      includes="**/org/apache/hadoop/**/*.java, **/org/apache/hadoop/**/*.aj"
+      includes="org/apache/hadoop/**/*.java, org/apache/hadoop/**/*.aj"
       excludes="org/apache/hadoop/classification/tools/**/*, org/apache/hadoop/record/**/*"
       destDir="${dest.dir}"
       debug="${javac.debug}"
@@ -157,7 +157,7 @@
     <mkdir dir="${build-fi.dir}"/>
     <delete file="${compile-inject.output}"/>
     <weave-injectfault-aspects dest.dir="${system-test-build-dir}/classes"
-                               src.dir="${test.src.dir}/system">
+                               src.dir="${test.src.dir}/system/java;${test.src.dir}/system/aop">
     </weave-injectfault-aspects>
   </target>