Bring mutant into line with current Ant1 build

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271921 13f79535-47bb-0310-9956-ffa450edef68

proposal/mutant/build/ant1compat.xml

@@ -96,7 +96,7 @@
              unless="jdk1.2+" />
     <!-- uses the context classloader -->
     <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
-             />
+             unless="jdk1.2+" />
   </patternset>
   <patternset id="needs.jdk1.3+">
     <exclude name="${ant.package}/taskdefs/TestProcess.java"
@@ -175,15 +175,7 @@
   <patternset id="needs.jakarta.bcel">
     <exclude name="${ant.package}/filters/util/JavaClassHelper.java" 
              unless="bcel.present" />
-    <exclude name="${optional.type.package}/depend/*.java" 
-             unless="bcel.present" />
-    <exclude name="${util.package}/depend/*.java"
-             unless="bcel.present" />
-    <exclude name="${optional.package}/ejb/EjbJar.java"
-             unless="bcel.present" />
-    <exclude name="${optional.package}/ejb/*DeploymentTool.java"
-             unless="bcel.present" />
-    <exclude name="${optional.package}/ejb/IPlanet*.java"
+    <exclude name="${util.package}/depend/bcel/*.java"
              unless="bcel.present" />
   </patternset>
   <patternset id="needs.jakarta.log4j">

proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java

@@ -129,6 +129,7 @@ public class Builder {
         files.add(new File(UTIL_ROOT, "IdentityMapper.java"));
         files.add(new File(UTIL_ROOT, "MergingMapper.java"));
         files.add(new File(UTIL_ROOT, "GlobPatternMapper.java"));
+        files.add(new File(UTIL_ROOT, "LoaderUtils.java"));
         files.add(new File(UTIL_ROOT, "regexp/Regexp.java"));
         files.add(new File(UTIL_ROOT, "regexp/RegexpMatcher.java"));
         files.add(new File(UTIL_ROOT, "regexp/RegexpFactory.java"));