since Ant 1.8.0.
-Target-Groups are similar to targets in that they have a name and +
Extension-Points are similar to targets in that they have a name and a depends list and can be executed from the command line. Just like targets they represent a state during the build process.
@@ -237,18 +237,18 @@ is to collect targets that contribute to the desired state in their depends list. -Targets can add themselves to a target-group's depends list via - their group attribute. The targets that add themselves will be +
Targets can add themselves to an extension-points's depends list via + their extensionOf attribute. The targets that add themselves will be added after the targets of the explicit depends-attribute of the - target-group, if multiple targets add themselves, their relative + extension-point, if multiple targets add themselves, their relative order is not defined.
-The main purpose of a target-group is to act as an extension +
The main purpose of an extension-point is to act as an extension point for build files designed to be imported. In the imported - file a target-groups defines a state that must be reached and + file an extension-point defines a state that must be reached and targets from other build files can join the depends list of said - target-group in order to contribute to that state.
+ extension-point in order to contribute to that state.For example your imported build file may need to compile code, it might look like:
@@ -256,7 +256,7 @@ <target name="create-directory-layout"> ... </target> -<target-group name="ready-to-compile" +<extension-point name="ready-to-compile" depends="create-directory-layout"/> <target name="compile" depends="ready-to-compile"> ... @@ -270,7 +270,7 @@ your main build file you may use something like
<target name="generate-sources"
- group="ready-to-compile">
+ extensionOf="ready-to-compile">
...
</target>
"taskdef", "typedef",
* "property", "target",
- * "target-group"
+ * "extension-point"
* or a data type definition
*/
public AntHandler onStartChild(String uri, String name, String qname, Attributes attrs,
AntXMLContext context) throws SAXParseException {
- return (name.equals("target") || name.equals("target-group"))
+ return (name.equals("target") || name.equals("extension-point"))
&& (uri.equals("") || uri.equals(ANT_CORE_URI))
? ProjectHelper2.targetHandler : ProjectHelper2.elementHandler;
}
}
/**
- * Handler for "target" and "target-group" elements.
+ * Handler for "target" and "extension-point" elements.
*/
public static class TargetHandler extends AntHandler {
@@ -865,11 +865,11 @@ public class ProjectHelper2 extends ProjectHelper {
AntXMLContext context) throws SAXParseException {
String name = null;
String depends = "";
- String targetGroup = null;
+ String extensionPoint = null;
Project project = context.getProject();
Target target = "target".equals(tag)
- ? new Target() : new TargetGroup();
+ ? new Target() : new ExtensionPoint();
target.setProject(project);
target.setLocation(new Location(context.getLocator()));
context.addTarget(target);
@@ -899,8 +899,8 @@ public class ProjectHelper2 extends ProjectHelper {
}
} else if (key.equals("description")) {
target.setDescription(value);
- } else if (key.equals("target-group")) {
- targetGroup = value;
+ } else if (key.equals("extensionOf")) {
+ extensionPoint = value;
} else {
throw new SAXParseException("Unexpected attribute \"" + key + "\"", context
.getLocator());
@@ -969,9 +969,9 @@ public class ProjectHelper2 extends ProjectHelper {
context.getCurrentTargets().put(newName, newTarget);
project.addOrReplaceTarget(newName, newTarget);
}
- if (targetGroup != null) {
+ if (extensionPoint != null) {
for (Iterator iter =
- Target.parseDepends(targetGroup, name, "target-group")
+ Target.parseDepends(extensionPoint, name, "extensionOf")
.iterator();
iter.hasNext(); ) {
String tgName = (String) iter.next();
@@ -980,16 +980,16 @@ public class ProjectHelper2 extends ProjectHelper {
}
if (!projectTargets.containsKey(tgName)) {
throw new BuildException("can't add target "
- + name + " to target-group "
+ + name + " to extension-point "
+ tgName
- + " because the target-group"
+ + " because the extension-point"
+ " is unknown.");
}
Target t = (Target) projectTargets.get(tgName);
- if (!(t instanceof TargetGroup)) {
+ if (!(t instanceof ExtensionPoint)) {
throw new BuildException("referenced target "
+ tgName
- + " is not a target-group");
+ + " is not an extension-point");
}
t.addDependency(name);
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
index 5fa927644..5468305b0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AntStructure.java
@@ -229,7 +229,7 @@ public class AntStructure extends Task {
out.println("");
- out.print("");
out.println("");
printTargetAttrs(out, "target");
- out.println("");
+ out.println("");
out.println("");
- printTargetAttrs(out, "target-group");
+ printTargetAttrs(out, "extension-point");
}
/**
@@ -268,7 +268,7 @@ public class AntStructure extends Task {
out.println(" if CDATA #IMPLIED");
out.println(" unless CDATA #IMPLIED");
out.println(" depends CDATA #IMPLIED");
- out.println(" target-group CDATA #IMPLIED");
+ out.println(" extensionOf CDATA #IMPLIED");
out.println(" description CDATA #IMPLIED>");
out.println("");
}
diff --git a/src/tests/antunit/core/target-group-test.xml b/src/tests/antunit/core/extension-point-test.xml
similarity index 74%
rename from src/tests/antunit/core/target-group-test.xml
rename to src/tests/antunit/core/extension-point-test.xml
index b098c80bf..012375c09 100644
--- a/src/tests/antunit/core/target-group-test.xml
+++ b/src/tests/antunit/core/extension-point-test.xml
@@ -19,7 +19,7 @@