From d0630078b82e7df5da3a8a009d6b6cb2a14286d8 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Mon, 25 Mar 2002 13:27:18 +0000
Subject: [PATCH] Sync up with Ant1

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272023 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/mutant/build/ant1compat.xml             | 16 ++++++++++++++++
 .../ant1compat/org/apache/tools/ant/Task.java    | 11 +++++++++++
 .../mutant/src/java/antlibs/system/antlib.xml    |  4 ++--
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/proposal/mutant/build/ant1compat.xml b/proposal/mutant/build/ant1compat.xml
index 84b11ae99..8bdec3194 100644
--- a/proposal/mutant/build/ant1compat.xml
+++ b/proposal/mutant/build/ant1compat.xml
@@ -122,6 +122,8 @@
   <patternset id="needs.sun.b64">
     <exclude name="${ant.package}/taskdefs/Get.java"
              unless="base64.present" />
+    <exclude name="${optional.package}/splash/SplashTask.java"
+             unless="base64.present" />
   </patternset>
 
   <!-- depends on external libraries -->
@@ -248,6 +250,9 @@
   <patternset id="onlinetests">
     <exclude name="**/GetTest.java" if="offline" />
   </patternset>
+  <patternset id="needs.swing">
+    <exclude name="${optional.package}/splash/*.java" unless="swing.present" />
+  </patternset>
 
   <!--
        ===================================================================
@@ -372,6 +377,16 @@
 
     <available property="base64.present" classname="sun.misc.BASE64Encoder" />
 
+    <condition property="jasper.present">
+      <and>
+        <available classname="org.apache.jasper.compiler.Compiler" />
+        <available classname="org.apache.jasper.JasperException" />
+      </and>
+    </condition>
+    
+    <available property="swing.present"
+               classname="javax.swing.ImageIcon"
+               classpathref="classpath"/>
   </target>
 
   <target name="ant1compat" depends="check_for_optional_packages">
@@ -417,6 +432,7 @@
       <patternset refid="needs.sun.tools" />
       <patternset refid="needs.sun.b64" />
       <patternset refid="needs.jakarta.bcel" />
+      <patternset refid="needs.swing" />
      </javac>
     <copy todir="${bin.dir}/ant1compat">
       <fileset dir="${bin.dir}/ant1src" excludes="**/*.java"/>
diff --git a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
index 05071ceea..e79e76c36 100644
--- a/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
+++ b/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
@@ -74,6 +74,17 @@ public abstract class Task extends ProjectComponent
     /** The description of this task */
     protected String description = null;
 
+    /**
+     * Called by the project to let the task do its work. This method may be 
+     * called more than once, if the task is invoked more than once. 
+     * For example, 
+     * if target1 and target2 both depend on target3, then running 
+     * "ant target1 target2" will run all tasks in target3 twice.
+     *
+     * @exception BuildException if something goes wrong with the build
+     */
+    public void execute() throws BuildException {}
+
     /**
      * Set the name to use in logging messages.
      *
diff --git a/proposal/mutant/src/java/antlibs/system/antlib.xml b/proposal/mutant/src/java/antlibs/system/antlib.xml
index 48e84c58f..ab38325ea 100644
--- a/proposal/mutant/src/java/antlibs/system/antlib.xml
+++ b/proposal/mutant/src/java/antlibs/system/antlib.xml
@@ -8,8 +8,8 @@
   <taskdef name="ant" classname="org.apache.ant.antlib.system.Ant"/>
   <taskdef name="antcall" classname="org.apache.ant.antlib.system.AntCall"/>
  
-<!--  <taskdef name="parallel" classname="org.apache.ant.antlib.system.Parallel"/>
-  <taskdef name="sequential" classname="org.apache.ant.antlib.system.Sequential"/> -->
+  <taskdef name="parallel" classname="org.apache.ant.antlib.system.Parallel"/>
+  <taskdef name="sequential" classname="org.apache.ant.antlib.system.Sequential"/>
   
   <converter classname="org.apache.ant.antlib.system.FileConverter"/>          
   <converter classname="org.apache.ant.antlib.system.URLConverter"/>