diff --git a/docs/manual/CoreTasks/macrodef.html b/docs/manual/CoreTasks/macrodef.html index e4d81f665..2e462d805 100644 --- a/docs/manual/CoreTasks/macrodef.html +++ b/docs/manual/CoreTasks/macrodef.html @@ -10,11 +10,11 @@

MacroDef

Description

- This defines a new task using a <sequential> or <parallel> + This defines a new task using a <sequential> nested task as a template. Nested elements <attribute> and <element> are used to specify attributes and elements of the new task. These get substituted into the <sequential> - or <parallel> task when the new task is run. + task when the new task is run.

since Ant 1.6 diff --git a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java index 61548a619..ee35c5513 100644 --- a/src/main/org/apache/tools/ant/taskdefs/MacroDef.java +++ b/src/main/org/apache/tools/ant/taskdefs/MacroDef.java @@ -96,12 +96,11 @@ public class MacroDef extends AntlibDefinition implements TaskContainer { */ public void addTask(Task nestedTask) { if (this.nestedTask != null) { - throw new BuildException("Only one sequential/Parallel allowed"); + throw new BuildException("Only one sequential allowed"); } UnknownElement ue = (UnknownElement) nestedTask; if (!ue.getNamespace().equals("") - || (!ue.getTag().equals("sequential") - && !ue.getTag().equals("parallel"))) { + || !ue.getTag().equals("sequential")) { throw new BuildException("Unsupported tag " + ue.getQName()); } this.nestedTask = ue;