You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by jl...@apache.org on 2012/10/01 18:30:31 UTC
svn commit: r1392500 - in /incubator/easyant/core/trunk/src:
documentation/howto/ main/java/org/apache/easyant/core/report/
main/java/org/apache/easyant/man/ main/java/org/apache/easyant/tasks/
main/resources/org/apache/easyant/core/report/ test/java/o...
Author: jlboudart
Date: Mon Oct 1 18:30:31 2012
New Revision: 1392500
URL: http://svn.apache.org/viewvc?rev=1392500&view=rev
Log:
Removing remaining references to phases in code and documentation
Modified:
incubator/easyant/core/trunk/src/documentation/howto/multimodules.html
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ParameterTask.java
incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.xsl
incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
Modified: incubator/easyant/core/trunk/src/documentation/howto/multimodules.html
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/howto/multimodules.html?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/howto/multimodules.html (original)
+++ incubator/easyant/core/trunk/src/documentation/howto/multimodules.html Mon Oct 1 18:30:31 2012
@@ -103,9 +103,9 @@
<h2>Building</h2>
-<p>Building a multi-module project is the same as building a single-module project: type "easyant [target]", where [target] is a build phase or target that you want to execute. [target] is then executed on all of your sub-modules, ordered so that dependencies are built before the modules that need them. Type easyant -p from the project root directory to see a full list of available build targets. The following phases are typical of any easyant build:
+<p>Building a multi-module project is the same as building a single-module project: type "easyant [target]", where [target] is a highlevel target or target that you want to execute. [target] is then executed on all of your sub-modules, ordered so that dependencies are built before the modules that need them. Type easyant -p from the project root directory to see a full list of available build targets. The following highlevel targets (also named phases) are typical of any easyant build:
<ul>
- <li><code>> easyant clean</code> execute the <a href="plugins/phases-std.html">clean phase</a> of the build on each submodule. This deletes any artifacts produced by prior builds.</li>
+ <li><code>> easyant clean</code> execute the clean phase of the build on each submodule. This deletes any artifacts produced by prior builds.</li>
<li><code>> easyant verify</code> compile and test all modules</li>
<li><code>> easyant package</code> package all modules for distribution</li>
<li><code>> easyant publish-local</code> publish all project modules to your workstation Ivy repository.</li>
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java Mon Oct 1 18:30:31 2012
@@ -360,7 +360,7 @@ public class EasyAntReport {
}
/**
- * Return a list of target that are not bound to any phases
+ * Return a list of target that are not bound to any extension-points
*/
public List<TargetReport> getUnboundTargets() {
List<TargetReport> targets = new ArrayList<TargetReport>();
@@ -394,7 +394,7 @@ public class EasyAntReport {
public List<ExtensionPointReport> getAvailableExtensionPoints() {
List<ExtensionPointReport> extensionPoints = getAvailableExtensionPointsWithoutTarget();
- // associate target to the phase
+ // associate target to extension-points
List<TargetReport> targets = getAvailableTargets();
for (int i = 0; i < extensionPoints.size(); i++) {
ExtensionPointReport extensionPoint = extensionPoints.get(i);
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/Describe.java Mon Oct 1 18:30:31 2012
@@ -24,86 +24,72 @@ import org.apache.easyant.core.report.Ta
/**
* Implements support for -describe easyant switch.
*
- * This command searches for extension point, target, and properties by the
- * supplied search name and returns result for each of these sequentially.
+ * This command searches for extension point, target, and properties by the supplied search name and returns result for
+ * each of these sequentially.
*/
public class Describe extends EasyantOption {
-
+
private static final long serialVersionUID = 1L;
-
- public Describe()
- throws IllegalArgumentException {
+
+ public Describe() throws IllegalArgumentException {
super("describe", true, "Describes extension points / target / property specified by the argument");
setStopBuild(true);
}
+
// convenient string constants
private static final String NONE = "NONE";
+
public void execute() {
String target = getValue();
- if(target == null || target.length() == 0) {
+ if (target == null || target.length() == 0) {
throw new IllegalArgumentException("No parameter specified for -describe parameter.");
}
-
- getProject()
- .log(LINE_SEP + "--- Available references for: " + target +
- " in current project: " + getProject()
- .getName() + " ---" + LINE_SEP);
-
+
+ getProject().log(
+ LINE_SEP + "--- Available references for: " + target + " in current project: " + getProject().getName()
+ + " ---" + LINE_SEP);
+
ExtensionPointReport extensionPointRep = getEareport().getExtensionPointReport(target, true);
- if(extensionPointRep != null) {
- getProject()
- .log("\tExtension Point: " + target);
- getProject()
- .log("\t\tDescription: " + (extensionPointRep.getDescription() == null ? NONE : extensionPointRep.getDescription()));
- getProject()
- .log("\t\tDepends: " + (extensionPointRep.getDepends() == null ? NONE : extensionPointRep.getDepends()));
- getProject()
- .log(LINE_SEP+ "\t\tFor information on targets attached to this phase, run:");
- getProject()
- .log("\t\teasyant -listTargets " + target);
+ if (extensionPointRep != null) {
+ getProject().log("\tExtension Point: " + target);
+ getProject().log(
+ "\t\tDescription: "
+ + (extensionPointRep.getDescription() == null ? NONE : extensionPointRep.getDescription()));
+ getProject().log(
+ "\t\tDepends: " + (extensionPointRep.getDepends() == null ? NONE : extensionPointRep.getDepends()));
+ getProject().log(LINE_SEP + "\t\tFor information on targets attached to this extension-point, run:");
+ getProject().log("\t\teasyant -listTargets " + target);
} else {
- getProject()
- .log("\tNo extrnsion point found for name: " + target);
+ getProject().log("\tNo extrnsion point found for name: " + target);
}
TargetReport targetRep = getEareport().getTargetReport(target, true);
- if(targetRep != null) {
- getProject()
- .log("\tTarget: " + target);
- getProject()
- .log("\t\tExtension Point: " + (targetRep.getExtensionPoint() == null ? NONE : targetRep.getExtensionPoint()));
- getProject()
- .log("\t\tDescription: " + (targetRep.getDescription() == null ? NONE : targetRep.getDescription()));
- getProject()
- .log("\t\tDepends: " + (targetRep.getDepends() == null ? NONE : targetRep.getDepends()));
- getProject()
- .log("\t\tIF: " + (targetRep.getIfCase() == null ? NONE : targetRep.getIfCase()));
- getProject()
- .log("\t\tUNLESS: " + (targetRep.getUnlessCase() == null ? NONE : targetRep.getUnlessCase()));
+ if (targetRep != null) {
+ getProject().log("\tTarget: " + target);
+ getProject().log(
+ "\t\tExtension Point: "
+ + (targetRep.getExtensionPoint() == null ? NONE : targetRep.getExtensionPoint()));
+ getProject().log(
+ "\t\tDescription: " + (targetRep.getDescription() == null ? NONE : targetRep.getDescription()));
+ getProject().log("\t\tDepends: " + (targetRep.getDepends() == null ? NONE : targetRep.getDepends()));
+ getProject().log("\t\tIF: " + (targetRep.getIfCase() == null ? NONE : targetRep.getIfCase()));
+ getProject().log("\t\tUNLESS: " + (targetRep.getUnlessCase() == null ? NONE : targetRep.getUnlessCase()));
} else {
- getProject()
- .log("\tNo Target found for name: " + target);
+ getProject().log("\tNo Target found for name: " + target);
}
PropertyDescriptor prop = getEareport().getAvailableProperties().get(target);
- if(prop != null) {
- getProject()
- .log("\tProperty: " + target);
- getProject()
- .log("\t\tDescription: " + (prop.getDescription() == null ? NONE : prop.getDescription()));
+ if (prop != null) {
+ getProject().log("\tProperty: " + target);
+ getProject().log("\t\tDescription: " + (prop.getDescription() == null ? NONE : prop.getDescription()));
String defaultValue = prop.getDefaultValue() == null ? NONE : prop.getDefaultValue();
- getProject()
- .log("\t\tDefault: " + defaultValue);
- getProject()
- .log("\t\tRequired: " + prop.isRequired());
+ getProject().log("\t\tDefault: " + defaultValue);
+ getProject().log("\t\tRequired: " + prop.isRequired());
String currentValue = prop.getValue() == null ? defaultValue : prop.getValue();
- getProject()
- .log("\t\tCurrent value: " + currentValue);
+ getProject().log("\t\tCurrent value: " + currentValue);
} else {
- getProject()
- .log("\tNo Property found for name: " + target);
+ getProject().log("\tNo Property found for name: " + target);
}
-
- getProject()
- .log(LINE_SEP + "--- End Of (Describe) ---");
+
+ getProject().log(LINE_SEP + "--- End Of (Describe) ---");
}
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java Mon Oct 1 18:30:31 2012
@@ -22,32 +22,33 @@ import java.util.List;
import org.apache.easyant.core.report.ExtensionPointReport;
/**
- * ManCommand implementation to list all extension points associated with specified
- * build module.
+ * ManCommand implementation to list all extension points associated with specified build module.
*
* Supports the -listExtensionPoints switch.
*/
-public class ListExtensionPoints extends EasyantOption{
-
+public class ListExtensionPoints extends EasyantOption {
+
private static final long serialVersionUID = 1L;
-
-
- public ListExtensionPoints()
- throws IllegalArgumentException {
- super("listExtensionPoints", false, "List all phases available");
+
+ public ListExtensionPoints() throws IllegalArgumentException {
+ super("listExtensionPoints", false, "List all extension-points available");
setStopBuild(true);
}
public void execute() {
- getProject().log(LINE_SEP+ "--- Available ExtensionPoints for current project: " + getProject().getName() + " ---" + LINE_SEP);
-
+ getProject().log(
+ LINE_SEP + "--- Available ExtensionPoints for current project: " + getProject().getName() + " ---"
+ + LINE_SEP);
+
List<ExtensionPointReport> extensionPoints = getEareport().getAvailableExtensionPoints();
- for(int i = 0; i<extensionPoints.size(); i++) {
+ for (int i = 0; i < extensionPoints.size(); i++) {
getProject().log("\t" + extensionPoints.get(i).getName());
}
-
- getProject().log(LINE_SEP+ LINE_SEP+ "For more information on an ExtensionPoint, run:" + LINE_SEP + "\t easyant -describe <EXTENSION POINT>");
- getProject().log(LINE_SEP+ "--- End Of (ExtensionPoints Listing) ---");
+
+ getProject().log(
+ LINE_SEP + LINE_SEP + "For more information on an ExtensionPoint, run:" + LINE_SEP
+ + "\t easyant -describe <EXTENSION POINT>");
+ getProject().log(LINE_SEP + "--- End Of (ExtensionPoints Listing) ---");
}
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java Mon Oct 1 18:30:31 2012
@@ -27,73 +27,75 @@ import org.apache.tools.ant.Project;
/**
* Implements the '-listTargets' switch for project Manual.
*
- * This command lists all targets belonging to the specified
- * phase / plugin.
+ * This command lists all targets belonging to the specified extension-point / plugin.
*
- * If no extension point / plugin name is specified, then this command
- * lists all targets available in the project (module.ivy)
+ * If no extension point / plugin name is specified, then this command lists all targets available in the project
+ * (module.ivy)
*/
public class ListTargets extends EasyantOption {
-
+
private static final long serialVersionUID = 1L;
-
+
public ListTargets() {
- super("listTargets", true, "List all targets available or associated with a given phase or plugin as argument");
+ super("listTargets", true,
+ "List all targets available or associated with a given extension-point or plugin as argument");
setOptionalArg(true);
setStopBuild(true);
}
-
/*
* defining some convenient string constants
*/
private static final String NONE = "NONE";
-
+
/*
- * simply look up for all targets belonging to a extension point named <container>, is such
- * an extension point exists. then list all targets listed in a module named <container>, is
- * such a module exists.
+ * simply look up for all targets belonging to a extension point named <container>, is such an extension point
+ * exists. then list all targets listed in a module named <container>, is such a module exists.
*
- * however, if the this.container variable has not been initialized then simply list
- * down all targets in the current module and all imported sub-modules.
+ * however, if the this.container variable has not been initialized then simply list down all targets in the current
+ * module and all imported sub-modules.
*/
public void execute() {
-
- getProject().log(LINE_SEP + "--- Available Targets for current project: " + getProject().getName() + " ---" + LINE_SEP);
+
+ getProject().log(
+ LINE_SEP + "--- Available Targets for current project: " + getProject().getName() + " ---" + LINE_SEP);
String container = getValue();
- if(container == null || container.trim().length() == 0) {
- getProject().log(LINE_SEP+ "No ExtensionPoint / Plugin specified. Listing all targets available in the project.");
-
+ if (container == null || container.trim().length() == 0) {
+ getProject().log(
+ LINE_SEP + "No ExtensionPoint / Plugin specified. Listing all targets available in the project.");
+
List<TargetReport> targets = getEareport().getAvailableTargets();
printTargets(targets, getProject());
} else {
ExtensionPointReport extensionPointRep = getEareport().getExtensionPointReport(container, true);
-
- if(extensionPointRep != null) {
+
+ if (extensionPointRep != null) {
getProject().log("Targets for ExtensionPoint: " + container);
List<TargetReport> targets = extensionPointRep.getTargetReports();
printTargets(targets, getProject());
} else {
getProject().log("\tNo ExtensionPoint found by name: " + container);
}
-
+
List<ImportedModuleReport> modules = getEareport().getImportedModuleReports();
ImportedModuleReport selected = null;
- for(int i = 0; i<modules.size(); i++) {
+ for (int i = 0; i < modules.size(); i++) {
selected = modules.get(i);
- if(container.equals(selected.getModuleMrid())) {
+ if (container.equals(selected.getModuleMrid())) {
break;
}
}
- if(selected != null) {
+ if (selected != null) {
getProject().log(LINE_SEP + "Targets for Module: " + container);
List<TargetReport> targets = selected.getEasyantReport().getTargetReports();
printTargets(targets, getProject());
} else {
getProject().log(LINE_SEP + "\tNo Module / Plugin found by name: " + container);
}
-
- getProject().log(LINE_SEP+LINE_SEP+ "For more information on an ExtensionPoint, run:" + LINE_SEP + "\t easyant -describe <EXTENSION POINT>");
+
+ getProject().log(
+ LINE_SEP + LINE_SEP + "For more information on an ExtensionPoint, run:" + LINE_SEP
+ + "\t easyant -describe <EXTENSION POINT>");
}
getProject().log(LINE_SEP + "--- End Of (Targets Listing) ---");
}
@@ -104,14 +106,15 @@ public class ListTargets extends Easyant
* re-used multiple times in this class.
*/
private void printTargets(List<TargetReport> targets, Project project) {
- if(targets.size() == 0) {
+ if (targets.size() == 0) {
project.log("\tNo targets found.");
return;
}
- for(int i = 0; i<targets.size(); i++) {
+ for (int i = 0; i < targets.size(); i++) {
TargetReport targetRep = targets.get(i);
project.log("\tTarget: " + targetRep.getName());
- project.log("\t\tPhase: " + (targetRep.getExtensionPoint() == null ? NONE : targetRep.getExtensionPoint()));
+ project.log("\t\tExtension-Point: "
+ + (targetRep.getExtensionPoint() == null ? NONE : targetRep.getExtensionPoint()));
project.log("\t\tDescription: " + (targetRep.getDescription() == null ? NONE : targetRep.getDescription()));
project.log("\t\tDepends: " + (targetRep.getDepends() == null ? NONE : targetRep.getDepends()));
project.log("\t\tIF: " + (targetRep.getIfCase() == null ? NONE : targetRep.getIfCase()));
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/BindTarget.java Mon Oct 1 18:30:31 2012
@@ -21,7 +21,6 @@ import java.util.Enumeration;
import java.util.Iterator;
import org.apache.easyant.core.BuildConfigurationHelper;
-import org.apache.easyant.core.ant.Phase;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ExtensionPoint;
import org.apache.tools.ant.Project;
@@ -37,12 +36,10 @@ public class BindTarget extends Task {
public void execute() throws BuildException {
StringBuilder message = new StringBuilder();
- message.append("Phase mapping for target ").append(getTarget()).append(
- " ");
- if (!BuildConfigurationHelper.isBuildConfigurationActive(
- getBuildConfigurations(), getProject(), message.toString())) {
- log(
- "no matching build configuration for this phase mapping, this mapping will be ignored",
+ message.append("extension-point mapping for target ").append(getTarget()).append(" ");
+ if (!BuildConfigurationHelper.isBuildConfigurationActive(getBuildConfigurations(), getProject(),
+ message.toString())) {
+ log("no matching build configuration for this extension-point mapping, this mapping will be ignored",
Project.MSG_DEBUG);
return;
}
@@ -52,8 +49,7 @@ public class BindTarget extends Task {
}
// unbind current mapping
- for (Iterator<?> iterator = getProject().getTargets().values().iterator(); iterator
- .hasNext();) {
+ for (Iterator<?> iterator = getProject().getTargets().values().iterator(); iterator.hasNext();) {
Target current = (Target) iterator.next();
if (current instanceof ExtensionPoint) {
Enumeration<?> dependencies = current.getDependencies();
@@ -62,8 +58,8 @@ public class BindTarget extends Task {
while (dependencies.hasMoreElements()) {
String dep = (String) dependencies.nextElement();
if (dep.equals(getTarget())) {
- log("target" + getTarget() + " is registred in extensionPoint"
- + current.getName(), Project.MSG_VERBOSE);
+ log("target" + getTarget() + " is registred in extensionPoint" + current.getName(),
+ Project.MSG_VERBOSE);
requiresUpdates = true;
} else {
dependsOn.append(dep);
@@ -71,22 +67,22 @@ public class BindTarget extends Task {
}
}
if (requiresUpdates) {
- log("removing target" + getTarget() + " from phase"
- + current.getName(), Project.MSG_VERBOSE);
+ log("removing target" + getTarget() + " from extension-point" + current.getName(),
+ Project.MSG_VERBOSE);
- Phase p = new Phase();
- p.setDescription(current.getDescription());
- p.setIf(current.getIf());
- p.setLocation(current.getLocation());
- p.setName(current.getName());
- p.setProject(current.getProject());
- p.setUnless(current.getUnless());
+ ExtensionPoint ep = new ExtensionPoint();
+ ep.setDescription(current.getDescription());
+ ep.setIf(current.getIf());
+ ep.setLocation(current.getLocation());
+ ep.setName(current.getName());
+ ep.setProject(current.getProject());
+ ep.setUnless(current.getUnless());
String depends = dependsOn.toString();
if (depends.endsWith(",")) {
depends = depends.substring(0, depends.length() - 1);
}
- p.setDepends(depends);
- getProject().addOrReplaceTarget(p);
+ ep.setDepends(depends);
+ getProject().addOrReplaceTarget(ep);
}
}
@@ -94,15 +90,13 @@ public class BindTarget extends Task {
if (getExtensionOf() != null && !getExtensionOf().equals("")) {
if (!getProject().getTargets().containsKey(getExtensionOf())) {
- throw new BuildException("can't add target " + getTarget()
- + " to phase " + getExtensionOf() + " because the phase"
- + " is unknown.");
+ throw new BuildException("can't add target " + getTarget() + " to extension-point " + getExtensionOf()
+ + " because the extension-point" + " is unknown.");
}
Target p = (Target) getProject().getTargets().get(getExtensionOf());
- if (!(p instanceof Phase)) {
- throw new BuildException("referenced target " + getExtensionOf()
- + " is not a phase");
+ if (!(p instanceof ExtensionPoint)) {
+ throw new BuildException("referenced target " + getExtensionOf() + " is not a extension-point");
}
p.addDependency(getTarget());
}
@@ -113,8 +107,8 @@ public class BindTarget extends Task {
return extensionOf;
}
- public void setExtensionOf(String toPhase) {
- this.extensionOf = toPhase;
+ public void setExtensionOf(String toExtensionPoint) {
+ this.extensionOf = toExtensionPoint;
}
public String getTarget() {
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/CheckResolver.java Mon Oct 1 18:30:31 2012
@@ -22,21 +22,21 @@ import org.apache.tools.ant.BuildExcepti
/**
* This task is responsible of checking existance of a resolver in a given ivy instance
- *
+ *
*/
public class CheckResolver extends IvyTask {
-
+
private String resolver;
-
+
private String description;
@Override
public void doExecute() throws BuildException {
- if (resolver ==null || resolver.equals("")) {
+ if (resolver == null || resolver.equals("")) {
throw new BuildException("resolver attribute is mandatory");
}
String resolverProperty = getProject().getProperty(resolver);
- if (resolverProperty==null) {
+ if (resolverProperty == null) {
throw new BuildException("Can't check resolvers :Unknown property " + resolver);
}
if (!getSettings().getResolverNames().contains(resolverProperty)) {
@@ -54,12 +54,13 @@ public class CheckResolver extends IvyTa
sb.append(getSettings().getResolverNames().toString());
throw new BuildException(sb.toString());
}
-
+
}
/**
* Get property resolver name to check
- * @return the property name representing the resolver
+ *
+ * @return the property name representing the resolver
*/
public String getResolver() {
return resolver;
@@ -67,14 +68,17 @@ public class CheckResolver extends IvyTa
/**
* Set the property resolver name to check
- * @param resolver a property name representing the resolver
+ *
+ * @param resolver
+ * a property name representing the resolver
*/
public void setResolver(String resolver) {
this.resolver = resolver;
}
-
+
/**
- * Get a description to the property / path / phase
+ * Get a description to the property / path / extension-point
+ *
* @return the description
*/
public String getDescription() {
@@ -82,15 +86,18 @@ public class CheckResolver extends IvyTa
}
/**
- * set a description to the property / path / phase
- * @param description the description
+ * set a description to the property / path / extension-point
+ *
+ * @param description
+ * the description
*/
public void setDescription(String description) {
this.description = description;
}
-
+
/**
* Appends CDATA text inside the Ant task to description
+ *
* @see #setDescription(String)
*/
public void addText(String descriptionText) {
@@ -99,12 +106,9 @@ public class CheckResolver extends IvyTa
if (getDescription() == null) {
setDescription(descriptionText);
} else {
- setDescription(getDescription()+descriptionText);
+ setDescription(getDescription() + descriptionText);
}
}
}
-
-
-
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/LoadModule.java Mon Oct 1 18:30:31 2012
@@ -115,7 +115,7 @@ public class LoadModule extends Abstract
System.out.println("What? buildModule: " + buildModule + " is a dir!");
throw new BuildException("Build failed");
}
- // load override buildFile before buildModule to allow target/phase
+ // load override buildFile before buildModule to allow target/extension-point
// override
File f = new File(buildModule.getParent(), EasyAntConstants.DEFAULT_OVERRIDE_BUILD_FILE);
if (f.exists()) {
@@ -127,7 +127,6 @@ public class LoadModule extends Abstract
loadBuildModule(buildModule);
}
- // load buildFile before buildModule to allow target/phase override
if (buildFile != null && buildFile.exists()) {
// make sure it's not a directory (this falls into the ultra
// paranoid lets check everything category
@@ -307,7 +306,7 @@ public class LoadModule extends Abstract
initTask(importTask).execute();
}
}
- // Apply PhaseMapping
+ // Apply ExtensionPointMapping
for (ExtensionPointMappingDescriptor epMapping : md.getExtensionPointsMappings()) {
BindTarget bindTarget = new BindTarget();
bindTarget.setTarget(epMapping.getTarget());
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ParameterTask.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ParameterTask.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ParameterTask.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/ParameterTask.java Mon Oct 1 18:30:31 2012
@@ -18,10 +18,8 @@
package org.apache.easyant.tasks;
import org.apache.easyant.core.EasyAntMagicNames;
-import org.apache.easyant.core.ant.Phase;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.taskdefs.Property;
import org.apache.tools.ant.types.Path;
@@ -29,24 +27,22 @@ import org.apache.tools.ant.types.Path;
/**
* parameter tasks is used to :
*
- * document properties / paths / phases check if properties /paths / phases are required set default values if
- * properties are not set
+ * document properties / paths check if properties /paths are required set default values if properties are not set
*
- * This could be usefull in precondition of each modules, to check if property/phase/path are set. And much more usefull
- * to document our modules.
+ * This could be usefull in precondition of each modules, to check if property/path are set. And much more usefull to
+ * document our modules.
*
*/
public class ParameterTask extends Task {
private String property;
private String path;
- private String phase;
private String description;
private String defaultValue;
private boolean required;
/**
- * Get a description to the property / path / phase
+ * Get a description to the property / path
*
* @return the description
*/
@@ -55,7 +51,7 @@ public class ParameterTask extends Task
}
/**
- * set a description to the property / path / phase
+ * set a description to the property / path
*
* @param description
* the description
@@ -118,25 +114,6 @@ public class ParameterTask extends Task
}
/**
- * Get a phase to check
- *
- * @return a phase name
- */
- public String getPhase() {
- return phase;
- }
-
- /**
- * Set the path to check
- *
- * @param phase
- * a phase name
- */
- public void setPhase(String phase) {
- this.phase = phase;
- }
-
- /**
* Get the default value (only available for property)
*
* @return a string that represents the default value
@@ -191,13 +168,6 @@ public class ParameterTask extends Task
propTask.setValue(defaultValue);
propTask.execute();
}
- } else if (phase != null) {
- Target p = (Target) getProject().getTargets().get(phase);
- if (p == null) {
- throw new BuildException("expected phase '" + phase + "': " + description);
- } else if (!(p instanceof Phase)) {
- throw new BuildException("target '" + phase + "' must be a phase rather than a target");
- }
} else if (path != null) {
Object p = getProject().getReference(path);
if (isRequired() && p == null) {
@@ -206,7 +176,7 @@ public class ParameterTask extends Task
throw new BuildException("reference '" + path + "' must be a path");
}
} else {
- throw new BuildException("at least one of these attributes is required: property, path, phase");
+ throw new BuildException("at least one of these attributes is required: property, path");
}
}
}
Modified: incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.xsl
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.xsl?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.xsl (original)
+++ incubator/easyant/core/trunk/src/main/resources/org/apache/easyant/core/report/easyant-report.xsl Mon Oct 1 18:30:31 2012
@@ -735,7 +735,7 @@
<xsl:value-of select="@description" />
</td>
<td>
- <xsl:value-of select="@phase" />
+ <xsl:value-of select="@extensionOf" />
</td>
<td>
<xsl:value-of select="@depends" />
Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java?rev=1392500&r1=1392499&r2=1392500&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/services/PluginServiceTest.java Mon Oct 1 18:30:31 2012
@@ -125,7 +125,7 @@ public class PluginServiceTest {
Assert.assertEquals("org.apache.easyant.example.Example", property.getValue());
// check that package ExtensionPoint exists and that jar:jar target is bound to
- // this phase
+ // this extension-point
ExtensionPointReport packageEP = null;
for (ExtensionPointReport extensionPoint : eaReport.getAvailableExtensionPoints()) {
if ("package".equals(extensionPoint.getName())) {