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/03/12 21:08:39 UTC
svn commit: r1299868 - in /incubator/easyant/core/trunk/src:
main/java/org/apache/easyant/core/
main/java/org/apache/easyant/core/descriptor/
main/java/org/apache/easyant/core/parser/
main/java/org/apache/easyant/core/report/ main/java/org/apache/easya...
Author: jlboudart
Date: Mon Mar 12 21:08:38 2012
New Revision: 1299868
URL: http://svn.apache.org/viewvc?rev=1299868&view=rev
Log:
Cleaning easyant core : phaseless implementation (first pass)
Added:
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/ExtensionPointMappingDescriptor.java
- copied, changed from r1299864, incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/PhaseMappingDescriptor.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java
- copied, changed from r1299864, incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/PhaseReport.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java
- copied, changed from r1299864, incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPhases.java
Removed:
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/PhaseMappingDescriptor.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/PhaseReport.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPhases.java
Modified:
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/EasyAntReport.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ParameterType.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/TargetReport.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.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/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/LoadModule.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/main/java/org/apache/easyant/core/EasyAntEngine.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntEngine.java Mon Mar 12 21:08:38 2012
@@ -453,14 +453,6 @@ public class EasyAntEngine {
helper.getImportStack().addElement(mainscript);
project.addReference(ProjectHelper.PROJECTHELPER_REFERENCE, helper);
- // Validate Phase is used by several system plugin so we should
- // initialize it
- Phase validatePhase = new Phase();
- validatePhase.setName("validate");
- validatePhase
- .setDescription("validate the project is correct and all necessary information is available");
- project.addTarget("validate", validatePhase);
-
Ivy easyantIvyInstance = configureEasyAntIvyInstance(project);
configurePluginService(project, easyantIvyInstance);
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/EasyAntMain.java Mon Mar 12 21:08:38 2012
@@ -44,13 +44,14 @@ import org.apache.easyant.core.ant.Phase
import org.apache.easyant.core.factory.EasyantConfigurationFactory;
import org.apache.easyant.man.Describe;
import org.apache.easyant.man.EasyantOption;
-import org.apache.easyant.man.ListPhases;
+import org.apache.easyant.man.ListExtensionPoints;
import org.apache.easyant.man.ListPlugins;
import org.apache.easyant.man.ListProps;
import org.apache.easyant.man.ListTargets;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Diagnostics;
import org.apache.tools.ant.ExitStatusException;
+import org.apache.tools.ant.ExtensionPoint;
import org.apache.tools.ant.Main;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Target;
@@ -632,7 +633,7 @@ public class EasyAntMain implements AntM
int pos = findTargetPosition(subNames, targetName);
subNames.insertElementAt(targetName, pos);
} else {
- if (currentTarget instanceof Phase) {
+ if (currentTarget instanceof ExtensionPoint) {
int pos = findTargetPosition(phases, targetName);
phases.insertElementAt(targetName, pos);
phasesDescriptions.insertElementAt(targetDescription, pos);
@@ -792,7 +793,7 @@ public class EasyAntMain implements AntM
options.addOption("o", "offline", false,
"turns EasyAnt in offline mode");
options.addOption(new Describe());
- options.addOption(new ListPhases());
+ options.addOption(new ListExtensionPoints());
options.addOption(new ListTargets());
options.addOption(new ListProps());
options.addOption(new ListPlugins());
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/DefaultEasyAntDescriptor.java Mon Mar 12 21:08:38 2012
@@ -34,7 +34,7 @@ public class DefaultEasyAntDescriptor im
properties = new HashMap<String,PropertyDescriptor>();
plugins = new ArrayList<PluginDescriptor>();
buildConfigurations = new ArrayList<String>();
- phaseMappings = new ArrayList<PhaseMappingDescriptor>();
+ extensionPointsMappings = new ArrayList<ExtensionPointMappingDescriptor>();
}
private ModuleDescriptor ivyModuleDescriptor;
@@ -43,7 +43,7 @@ public class DefaultEasyAntDescriptor im
private List<PluginDescriptor> plugins;
private List<String> buildConfigurations;
- private List<PhaseMappingDescriptor> phaseMappings;
+ private List<ExtensionPointMappingDescriptor> extensionPointsMappings;
public String getBuildType() {
return buildType;
@@ -99,12 +99,12 @@ public class DefaultEasyAntDescriptor im
return getIvyModuleDescriptor().getDescription();
}
- public List<PhaseMappingDescriptor> getPhaseMappings() {
- return phaseMappings;
+ public List<ExtensionPointMappingDescriptor> getExtensionPointsMappings() {
+ return extensionPointsMappings;
}
- public void addPhaseMapping(PhaseMappingDescriptor phaseMappingDescriptor) {
- this.phaseMappings.add(phaseMappingDescriptor);
+ public void addExtensionPointMapping(ExtensionPointMappingDescriptor extensionPointMappingDescriptor) {
+ this.extensionPointsMappings.add(extensionPointMappingDescriptor);
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/EasyAntModuleDescriptor.java Mon Mar 12 21:08:38 2012
@@ -104,15 +104,15 @@ public interface EasyAntModuleDescriptor
String getDescription();
/**
- * Get all registered phase mappings
- * @return a list of {@link PhaseMappingDescriptor}
+ * Get all registered extension points mappings
+ * @return a list of {@link ExtensionPointMappingDescriptor}
*/
- public List<PhaseMappingDescriptor> getPhaseMappings();
+ public List<ExtensionPointMappingDescriptor> getExtensionPointsMappings();
/**
- * Add a {@link PhaseMappingDescriptor} to the list of all registered phase mappings
- * @param phaseMappingDescriptor a {@link PhaseMappingDescriptor}
+ * Add a {@link ExtensionPointMappingDescriptor} to the list of all registered extension points mappings
+ * @param extensionPointMappingDescriptor a {@link ExtensionPointMappingDescriptor}
*/
- public void addPhaseMapping(PhaseMappingDescriptor phaseMappingDescriptor);
+ public void addExtensionPointMapping(ExtensionPointMappingDescriptor extensionPointMappingDescriptor);
}
Copied: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/ExtensionPointMappingDescriptor.java (from r1299864, incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/PhaseMappingDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/ExtensionPointMappingDescriptor.java?p2=incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/ExtensionPointMappingDescriptor.java&p1=incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/PhaseMappingDescriptor.java&r1=1299864&r2=1299868&rev=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/PhaseMappingDescriptor.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/descriptor/ExtensionPointMappingDescriptor.java Mon Mar 12 21:08:38 2012
@@ -17,10 +17,10 @@
*/
package org.apache.easyant.core.descriptor;
-public class PhaseMappingDescriptor {
+public class ExtensionPointMappingDescriptor {
private String target;
- private String toPhase;
+ private String extensionPoint;
private String buildConfigurations;
public String getTarget() {
return target;
@@ -29,12 +29,11 @@ public class PhaseMappingDescriptor {
this.target = target;
}
- public String getToPhase() {
- return toPhase;
+ public String getExtensionPoint() {
+ return extensionPoint;
}
-
- public void setToPhase(String toPhase) {
- this.toPhase = toPhase;
+ public void setExtensionPoint(String extensionPoint) {
+ this.extensionPoint = extensionPoint;
}
/**
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/parser/DefaultEasyAntXmlModuleDescriptorParser.java Mon Mar 12 21:08:38 2012
@@ -33,7 +33,7 @@ import org.apache.easyant.core.EasyAntCo
import org.apache.easyant.core.descriptor.AdvancedInheritableItem;
import org.apache.easyant.core.descriptor.DefaultEasyAntDescriptor;
import org.apache.easyant.core.descriptor.EasyAntModuleDescriptor;
-import org.apache.easyant.core.descriptor.PhaseMappingDescriptor;
+import org.apache.easyant.core.descriptor.ExtensionPointMappingDescriptor;
import org.apache.easyant.core.descriptor.PluginDescriptor;
import org.apache.easyant.core.descriptor.PropertyDescriptor;
import org.apache.easyant.core.ivy.InheritableScope;
@@ -392,8 +392,8 @@ public class DefaultEasyAntXmlModuleDesc
protected void bindTargetStarted(Attributes attributes) {
String target = getSettings().substitute(
attributes.getValue("target"));
- String toPhase = getSettings().substitute(
- attributes.getValue("tophase"));
+ String toExtensionPoint = getSettings().substitute(
+ attributes.getValue("extensionOf"));
String conf = getSettings().substitute(attributes.getValue("conf"));
if (EasyAntState.PLUGIN == easyAntState && conf == null) {
conf = currentPluginDescriptor.getBuildConfigurations();
@@ -413,13 +413,13 @@ public class DefaultEasyAntXmlModuleDesc
}
// put this variable on the context
- PhaseMappingDescriptor phaseMappingDescriptor = new PhaseMappingDescriptor();
- phaseMappingDescriptor.setBuildConfigurations(conf);
+ ExtensionPointMappingDescriptor extensionPointMappingDescriptor = new ExtensionPointMappingDescriptor();
+ extensionPointMappingDescriptor.setBuildConfigurations(conf);
// TODO: add a facility to get plugin alias if this is a
// declared as a subelement
- phaseMappingDescriptor.setTarget(target);
- phaseMappingDescriptor.setToPhase(toPhase);
- easyAntModuleDescriptor.addPhaseMapping(phaseMappingDescriptor);
+ extensionPointMappingDescriptor.setTarget(target);
+ extensionPointMappingDescriptor.setExtensionPoint(toExtensionPoint);
+ easyAntModuleDescriptor.addExtensionPointMapping(extensionPointMappingDescriptor);
}
}
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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -34,7 +34,7 @@ import org.apache.ivy.core.report.Resolv
public class EasyAntReport {
private List<TargetReport> targetReports;
- private List<PhaseReport> phaseReports;
+ private List<ExtensionPointReport> extensionPointReports;
private List<ParameterReport> parameterReports;
private List<ImportedModuleReport> importedModuleReports;
private Map<String, PropertyDescriptor> propertyReports;
@@ -46,7 +46,7 @@ public class EasyAntReport {
public EasyAntReport() {
super();
targetReports = new ArrayList<TargetReport>();
- phaseReports = new ArrayList<PhaseReport>();
+ extensionPointReports = new ArrayList<ExtensionPointReport>();
parameterReports = new ArrayList<ParameterReport>();
importedModuleReports = new ArrayList<ImportedModuleReport>();
propertyReports = new HashMap<String, PropertyDescriptor>();
@@ -100,43 +100,43 @@ public class EasyAntReport {
}
/**
- * Get a phase by its name Return null if no phaseReport where found with
+ * Get an extension point by its name Return null if no extensionPointReport where found with
* this name
*
* @param name
- * represent the phase name
- * @return a phase report
+ * represent the extension point name
+ * @return an extension point report
*/
- public PhaseReport getPhaseReport(String name) {
+ public ExtensionPointReport getExtensionPointReport(String name) {
if (name == null || name.equals("")) {
- throw new IllegalArgumentException("phase name cannot be null");
+ throw new IllegalArgumentException("extension point name cannot be null");
}
- for (PhaseReport phase : phaseReports) {
- if (phase.getName().equals(name)) {
- return phase;
+ for (ExtensionPointReport extensionPointReport : extensionPointReports) {
+ if (extensionPointReport.getName().equals(name)) {
+ return extensionPointReport;
}
}
return null;
}
/**
- * Get a phase by its name Return null if no phaseReport where found with
+ * Get an extension point by its name Return null if no extensionPointReport where found with
* this name. The includeImports parameters can be additionally used to
* extend the search to include imports by the current module.
*
* @param name
- * represent the phase name
+ * represent the extensionPoint name
* @param includeImports
* should the method search included modules
- * @return a phase report
+ * @return an extension point report
*/
- public PhaseReport getPhaseReport(String name, boolean includeImports) {
- PhaseReport retVal = getPhaseReport(name);
+ public ExtensionPointReport getExtensionPointReport(String name, boolean includeImports) {
+ ExtensionPointReport retVal = getExtensionPointReport(name);
if(includeImports && retVal == null) {
- List<PhaseReport> phases = getAvailablePhases();
- for(PhaseReport phase : phases) {
- if (phase.getName().equals(name)) {
- retVal = phase;
+ List<ExtensionPointReport> extensionPoints = getAvailableExtensionPoints();
+ for(ExtensionPointReport extensionPoint : extensionPoints) {
+ if (extensionPoint.getName().equals(name)) {
+ retVal = extensionPoint;
}
}
}
@@ -144,25 +144,25 @@ public class EasyAntReport {
}
/**
- * Get a list of phases available in this module
+ * Get a list of extension points available in this module
*
- * @return a list of phases
+ * @return a list of extension points
*/
- public List<PhaseReport> getPhaseReports() {
- return Collections.unmodifiableList(phaseReports);
+ public List<ExtensionPointReport> getExtensionPointReports() {
+ return Collections.unmodifiableList(extensionPointReports);
}
/**
- * Add a given phaseReport
+ * Add a given extensionPointReport
*
- * @param phaseReport
- * a given phaseReport
+ * @param extensionPointReport
+ * a given extensionPointReport
*/
- public void addPhaseReport(PhaseReport phaseReport) {
- if (phaseReport == null) {
- throw new IllegalArgumentException("phaseReport cannot be null");
+ public void addExtensionPointReport(ExtensionPointReport extensionPointReport) {
+ if (extensionPointReport == null) {
+ throw new IllegalArgumentException("extensionPointReport cannot be null");
}
- phaseReports.add(phaseReport);
+ extensionPointReports.add(extensionPointReport);
}
/**
@@ -373,7 +373,7 @@ public class EasyAntReport {
target.setDepends(targetReport.getDepends());
target.setIfCase(targetReport.getIfCase());
target.setUnlessCase(targetReport.getUnlessCase());
- target.setPhase(targetReport.getPhase());
+ target.setExtensionPoint(targetReport.getExtensionPoint());
targets.add(target);
}
}
@@ -390,50 +390,50 @@ public class EasyAntReport {
public List<TargetReport> getUnboundTargets() {
List<TargetReport> targets = new ArrayList<TargetReport>();
for (TargetReport targetReport : getAvailableTargets()) {
- if (targetReport.getPhase() == null) {
+ if (targetReport.getExtensionPoint() == null) {
targets.add(targetReport);
}
}
return targets;
}
- private List<PhaseReport> getAvailablePhasesWithoutTarget() {
- List<PhaseReport> phases = new ArrayList<PhaseReport>();
+ private List<ExtensionPointReport> getAvailableExtensionPointsWithoutTarget() {
+ List<ExtensionPointReport> extensionPoints = new ArrayList<ExtensionPointReport>();
- phases.addAll(phaseReports);
+ extensionPoints.addAll(extensionPointReports);
for (ImportedModuleReport importedModuleReport : importedModuleReports) {
if (importedModuleReport.getEasyantReport() != null) {
- phases.addAll(importedModuleReport.getEasyantReport()
- .getAvailablePhasesWithoutTarget());
+ extensionPoints.addAll(importedModuleReport.getEasyantReport()
+ .getAvailableExtensionPointsWithoutTarget());
}
}
- return phases;
+ return extensionPoints;
}
/**
- * This utilitary function allow us to retrieve a list of all phaseReport
+ * This utilitary function allow us to retrieve a list of all ExtensionPointReport
* available in this module and in all imported subModules
*
- * @return a list of all PhaseReport available in the module or in its
+ * @return a list of all ExtensionPointReport available in the module or in its
* submodules
*/
- public List<PhaseReport> getAvailablePhases() {
- List<PhaseReport> phases = getAvailablePhasesWithoutTarget();
+ public List<ExtensionPointReport> getAvailableExtensionPoints() {
+ List<ExtensionPointReport> extensionPoints = getAvailableExtensionPointsWithoutTarget();
// associate target to the phase
List<TargetReport> targets = getAvailableTargets();
- for (int i = 0; i < phases.size(); i++) {
- PhaseReport phase = phases.get(i);
+ for (int i = 0; i < extensionPoints.size(); i++) {
+ ExtensionPointReport extensionPoint = extensionPoints.get(i);
for (TargetReport target : targets) {
- if (target.getPhase() != null
- && target.getPhase().equals(phase.getName())) {
- phase.addTargetReport(target);
- phases.set(i, phase);
+ if (target.getExtensionPoint() != null
+ && target.getExtensionPoint().equals(extensionPoint.getName())) {
+ extensionPoint.addTargetReport(target);
+ extensionPoints.set(i, extensionPoint);
}
}
}
- return phases;
+ return extensionPoints;
}
}
Copied: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java (from r1299864, incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/PhaseReport.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java?p2=incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java&p1=incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/PhaseReport.java&r1=1299864&r2=1299868&rev=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/PhaseReport.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ExtensionPointReport.java Mon Mar 12 21:08:38 2012
@@ -21,14 +21,14 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-public class PhaseReport {
+public class ExtensionPointReport {
private final String name;
private String description;
private String depends;
private List<TargetReport> targetReports;
- public PhaseReport(String name) {
+ public ExtensionPointReport(String name) {
super();
this.name = name;
targetReports = new ArrayList<TargetReport>();
@@ -80,7 +80,7 @@ public class PhaseReport {
return false;
if (getClass() != obj.getClass())
return false;
- PhaseReport other = (PhaseReport) obj;
+ ExtensionPointReport other = (ExtensionPointReport) obj;
if (name == null) {
if (other.name != null)
return false;
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ParameterType.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ParameterType.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ParameterType.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/ParameterType.java Mon Mar 12 21:08:38 2012
@@ -20,7 +20,5 @@ package org.apache.easyant.core.report;
public enum ParameterType {
PROPERTY,
- PATH,
- PHASE
-
+ PATH
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/TargetReport.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/TargetReport.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/TargetReport.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/TargetReport.java Mon Mar 12 21:08:38 2012
@@ -23,7 +23,7 @@ public class TargetReport {
private String ifCase = null;
private String unlessCase = null;
private String description = null;
- private String phase = null;
+ private String extensionPoint = null;
public String getName() {
return name;
@@ -65,12 +65,12 @@ public class TargetReport {
this.description = description;
}
- public String getPhase() {
- return phase;
+ public String getExtensionPoint() {
+ return extensionPoint;
}
- public void setPhase(String phase) {
- this.phase = phase;
+ public void setExtensionPoint(String extensionPoint) {
+ this.extensionPoint = extensionPoint;
}
}
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/report/XMLEasyAntReportWriter.java Mon Mar 12 21:08:38 2012
@@ -223,7 +223,7 @@ public class XMLEasyAntReportWriter {
out.println(" <easyant>");
// targets
outputTargets(report, out, dep, easyAntReport);
- outputPhases(report, out, dep, easyAntReport);
+ outputExtensionPoints(report, out, dep, easyAntReport);
outputImportedModules(report, out, dep, easyAntReport);
outputParameters(report, out, dep, easyAntReport);
outputProperties(report, out, dep, easyAntReport);
@@ -278,17 +278,7 @@ public class XMLEasyAntReportWriter {
for (ParameterReport paramReport : easyAntReport.getParameterReports()) {
StringBuffer param = new StringBuffer();
- if (ParameterType.PHASE.equals(paramReport.getType())) {
- param.append(" <phase name=\"");
- param.append(paramReport.getName());
- param.append("\"");
- if (paramReport.getDescription() != null) {
- param.append(" description=\"");
- param.append(paramReport.getDescription());
- param.append("\"");
- }
- param.append("/>");
- } else if (ParameterType.PATH.equals(paramReport.getType())) {
+ if (ParameterType.PATH.equals(paramReport.getType())) {
param.append(" <path name=\"");
param.append(paramReport.getName());
param.append("\"");
@@ -356,25 +346,25 @@ public class XMLEasyAntReportWriter {
}
- private void outputPhases(ConfigurationResolveReport report,
+ private void outputExtensionPoints(ConfigurationResolveReport report,
PrintWriter out, IvyNode dep, EasyAntReport easyAntReport) {
- out.println(" <phases>");
- for (PhaseReport phaseReport : easyAntReport.getPhaseReports()) {
- StringBuffer phase = new StringBuffer();
- phase.append(" <phase name=\"").append(
- phaseReport.getName()).append("\"");
- if (phaseReport.getDescription() != null) {
- phase.append(" description=\"");
- phase.append(phaseReport.getDescription());
- phase.append("\"");
- }
- if (phaseReport.getDepends() != null) {
- phase.append(" depends=\"");
- phase.append(phaseReport.getDepends());
- phase.append("\"");
+ out.println(" <extension-points>");
+ for (ExtensionPointReport extensionPointReport : easyAntReport.getExtensionPointReports()) {
+ StringBuffer extensionPoint = new StringBuffer();
+ extensionPoint.append(" <extension-point name=\"").append(
+ extensionPointReport.getName()).append("\"");
+ if (extensionPointReport.getDescription() != null) {
+ extensionPoint.append(" description=\"");
+ extensionPoint.append(extensionPointReport.getDescription());
+ extensionPoint.append("\"");
+ }
+ if (extensionPointReport.getDepends() != null) {
+ extensionPoint.append(" depends=\"");
+ extensionPoint.append(extensionPointReport.getDepends());
+ extensionPoint.append("\"");
}
- phase.append("/>");
- out.println(phase.toString());
+ extensionPoint.append("/>");
+ out.println(extensionPoint.toString());
}
out.println(" </phases>");
}
@@ -401,9 +391,9 @@ public class XMLEasyAntReportWriter {
target.append(targetReport.getIfCase());
target.append("\"");
}
- if (targetReport.getPhase() != null) {
+ if (targetReport.getExtensionPoint() != null) {
target.append(" phase=\"");
- target.append(targetReport.getPhase());
+ target.append(targetReport.getExtensionPoint());
target.append("\"");
}
if (targetReport.getUnlessCase() != null) {
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java?rev=1299868&r1=1299867&r2=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/services/impl/DefaultPluginServiceImpl.java Mon Mar 12 21:08:38 2012
@@ -30,17 +30,16 @@ import java.util.Properties;
import org.apache.easyant.core.EasyAntConstants;
import org.apache.easyant.core.EasyAntEngine;
import org.apache.easyant.core.EasyAntMagicNames;
-import org.apache.easyant.core.ant.Phase;
import org.apache.easyant.core.descriptor.EasyAntModuleDescriptor;
import org.apache.easyant.core.descriptor.PluginDescriptor;
import org.apache.easyant.core.descriptor.PropertyDescriptor;
import org.apache.easyant.core.parser.DefaultEasyAntXmlModuleDescriptorParser;
import org.apache.easyant.core.parser.EasyAntModuleDescriptorParser;
import org.apache.easyant.core.report.EasyAntReport;
+import org.apache.easyant.core.report.ExtensionPointReport;
import org.apache.easyant.core.report.ImportedModuleReport;
import org.apache.easyant.core.report.ParameterReport;
import org.apache.easyant.core.report.ParameterType;
-import org.apache.easyant.core.report.PhaseReport;
import org.apache.easyant.core.report.TargetReport;
import org.apache.easyant.core.services.PluginService;
import org.apache.easyant.tasks.Import;
@@ -328,8 +327,7 @@ public class DefaultPluginServiceImpl im
*/
private void handleTarget(EasyAntReport eaReport, Target target) {
if (!"".equals(target.getName())) {
- boolean isExtensionPoint = target instanceof ExtensionPoint
- || target instanceof Phase;
+ boolean isExtensionPoint = target instanceof ExtensionPoint;
if (!isExtensionPoint) {
TargetReport targetReport = new TargetReport();
targetReport.setName(target.getName());
@@ -349,14 +347,13 @@ public class DefaultPluginServiceImpl im
for (Iterator iterator = target.getProject().getTargets()
.values().iterator(); iterator.hasNext();) {
Target currentTarget = (Target) iterator.next();
- if (currentTarget instanceof ExtensionPoint
- || currentTarget instanceof Phase) {
+ if (currentTarget instanceof ExtensionPoint) {
Enumeration dependencies = currentTarget
.getDependencies();
while (dependencies.hasMoreElements()) {
String dep = (String) dependencies.nextElement();
if (dep.equals(target.getName())) {
- targetReport.setPhase(currentTarget.getName());
+ targetReport.setExtensionPoint(currentTarget.getName());
}
}
@@ -368,7 +365,7 @@ public class DefaultPluginServiceImpl im
Message.debug("Ant file has a target called : "
+ targetReport.getName());
} else {
- PhaseReport extensionPoint = new PhaseReport(target.getName());
+ ExtensionPointReport extensionPoint = new ExtensionPointReport(target.getName());
StringBuilder sb = new StringBuilder();
Enumeration targetDeps = target.getDependencies();
while (targetDeps.hasMoreElements()) {
@@ -380,7 +377,7 @@ public class DefaultPluginServiceImpl im
}
extensionPoint.setDepends(sb.toString());
extensionPoint.setDescription(target.getDescription());
- eaReport.addPhaseReport(extensionPoint);
+ eaReport.addExtensionPointReport(extensionPoint);
Message.debug("Ant file has an extensionPoint called : "
+ extensionPoint.getName());
}
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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -18,20 +18,20 @@
package org.apache.easyant.man;
import org.apache.easyant.core.descriptor.PropertyDescriptor;
-import org.apache.easyant.core.report.PhaseReport;
+import org.apache.easyant.core.report.ExtensionPointReport;
import org.apache.easyant.core.report.TargetReport;
/**
* Implements support for -describe easyant switch.
*
- * This command searches for a phase, target, and properties by the
+ * 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 {
public Describe()
throws IllegalArgumentException {
- super("describe", true, "Describes the phase / target / property specified by the argument");
+ super("describe", true, "Describes extension points / target / property specified by the argument");
setStopBuild(true);
}
// convenient string constants
@@ -47,28 +47,28 @@ public class Describe extends EasyantOpt
" in current project: " + getProject()
.getName() + " ---" + LINE_SEP);
- PhaseReport phaseRep = getEareport().getPhaseReport(target, true);
- if(phaseRep != null) {
+ ExtensionPointReport extensionPointRep = getEareport().getExtensionPointReport(target, true);
+ if(extensionPointRep != null) {
getProject()
- .log("\tPhase: " + target);
+ .log("\tExtension Point: " + target);
getProject()
- .log("\t\tDescription: " + (phaseRep.getDescription() == null ? NONE : phaseRep.getDescription()));
+ .log("\t\tDescription: " + (extensionPointRep.getDescription() == null ? NONE : extensionPointRep.getDescription()));
getProject()
- .log("\t\tDepends: " + (phaseRep.getDepends() == null ? NONE : phaseRep.getDepends()));
+ .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);
} else {
getProject()
- .log("\tNo Phase found for name: " + target);
+ .log("\tNo extrnsion point found for name: " + target);
}
TargetReport targetRep = getEareport().getTargetReport(target, true);
if(targetRep != null) {
getProject()
.log("\tTarget: " + target);
getProject()
- .log("\t\tPhase: " + (targetRep.getPhase() == null ? NONE : targetRep.getPhase()));
+ .log("\t\tExtension Point: " + (targetRep.getExtensionPoint() == null ? NONE : targetRep.getExtensionPoint()));
getProject()
.log("\t\tDescription: " + (targetRep.getDescription() == null ? NONE : targetRep.getDescription()));
getProject()
Copied: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java (from r1299864, incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPhases.java)
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java?p2=incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java&p1=incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPhases.java&r1=1299864&r2=1299868&rev=1299868&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPhases.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListExtensionPoints.java Mon Mar 12 21:08:38 2012
@@ -19,33 +19,33 @@ package org.apache.easyant.man;
import java.util.List;
-import org.apache.easyant.core.report.PhaseReport;
+import org.apache.easyant.core.report.ExtensionPointReport;
/**
- * ManCommand implementation to list all phases associated with specified
+ * ManCommand implementation to list all extension points associated with specified
* build module.
*
- * Supports the -listPhases switch.
+ * Supports the -listExtensionPoints switch.
*/
-public class ListPhases extends EasyantOption{
+public class ListExtensionPoints extends EasyantOption{
- public ListPhases()
+ public ListExtensionPoints()
throws IllegalArgumentException {
- super("listPhases", false, "List all phases available");
+ super("listExtensionPoints", false, "List all phases available");
setOptionalArg(true);
setStopBuild(true);
}
public void execute() {
- getProject().log(LINE_SEP+ "--- Available Phases for current project: " + getProject().getName() + " ---" + LINE_SEP);
+ getProject().log(LINE_SEP+ "--- Available ExtensionPoints for current project: " + getProject().getName() + " ---" + LINE_SEP);
- List<PhaseReport> phases = getEareport().getAvailablePhases();
- for(int i = 0; i<phases.size(); i++) {
- getProject().log("\t" + phases.get(i).getName());
+ List<ExtensionPointReport> extensionPoints = getEareport().getAvailableExtensionPoints();
+ 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 a Phase, run:" + LINE_SEP + "\t easyant -describe <PHASE>");
- getProject().log(LINE_SEP+ "--- End Of (Phases 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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -19,8 +19,8 @@ package org.apache.easyant.man;
import java.util.List;
+import org.apache.easyant.core.report.ExtensionPointReport;
import org.apache.easyant.core.report.ImportedModuleReport;
-import org.apache.easyant.core.report.PhaseReport;
import org.apache.easyant.core.report.TargetReport;
import org.apache.tools.ant.Project;
@@ -30,7 +30,7 @@ import org.apache.tools.ant.Project;
* This command lists all targets belonging to the specified
* phase / plugin.
*
- * If no phase / plugin name is specified, then this command
+ * 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 {
@@ -49,8 +49,8 @@ public class ListTargets extends Easyant
private static final String NONE = "NONE";
/*
- * simply look up for all targets belonging to a phase named <container>, is such
- * a phase exists. then list all targets listed in a module named <container>, is
+ * 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
@@ -61,19 +61,19 @@ public class ListTargets extends Easyant
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 Phase / Plugin specified. Listing all targets available in the project.");
+ getProject().log(LINE_SEP+ "No ExtensionPoint / Plugin specified. Listing all targets available in the project.");
List<TargetReport> targets = getEareport().getAvailableTargets();
printTargets(targets, getProject());
} else {
- PhaseReport phase = getEareport().getPhaseReport(container, true);
+ ExtensionPointReport extensionPointRep = getEareport().getExtensionPointReport(container, true);
- if(phase != null) {
- getProject().log("Targets for Phase: " + container);
- List<TargetReport> targets = phase.getTargetReports();
+ if(extensionPointRep != null) {
+ getProject().log("Targets for ExtensionPoint: " + container);
+ List<TargetReport> targets = extensionPointRep.getTargetReports();
printTargets(targets, getProject());
} else {
- getProject().log("\tNo Phase found by name: " + container);
+ getProject().log("\tNo ExtensionPoint found by name: " + container);
}
List<ImportedModuleReport> modules = getEareport().getImportedModuleReports();
@@ -92,9 +92,9 @@ public class ListTargets extends Easyant
getProject().log(LINE_SEP + "\tNo Module / Plugin found by name: " + container);
}
- getProject().log(LINE_SEP+LINE_SEP+ "For more information on a Phase, run:" + LINE_SEP + "\t easyant -describe <PHASE>");
+ 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 (Phases Listing) ---");
+ getProject().log(LINE_SEP + "--- End Of (Targets Listing) ---");
}
/*
@@ -110,7 +110,7 @@ public class ListTargets extends Easyant
for(int i = 0; i<targets.size(); i++) {
TargetReport targetRep = targets.get(i);
project.log("\tTarget: " + targetRep.getName());
- project.log("\t\tPhase: " + (targetRep.getPhase() == null ? NONE : targetRep.getPhase()));
+ project.log("\t\tPhase: " + (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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -23,6 +23,7 @@ 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;
import org.apache.tools.ant.Target;
import org.apache.tools.ant.Task;
@@ -54,14 +55,14 @@ public class BindTarget extends Task {
for (Iterator iterator = getProject().getTargets().values().iterator(); iterator
.hasNext();) {
Target current = (Target) iterator.next();
- if (current instanceof Phase) {
+ if (current instanceof ExtensionPoint) {
Enumeration dependencies = current.getDependencies();
StringBuilder dependsOn = new StringBuilder();
boolean requiresUpdates = false;
while (dependencies.hasMoreElements()) {
String dep = (String) dependencies.nextElement();
if (dep.equals(getTarget())) {
- log("target" + getTarget() + " is registred in phase"
+ log("target" + getTarget() + " is registred in extensionPoint"
+ current.getName(), Project.MSG_VERBOSE);
requiresUpdates = true;
} else {
@@ -112,7 +113,7 @@ public class BindTarget extends Task {
return toPhase;
}
- public void setToPhase(String toPhase) {
+ public void setExtensionOf(String toPhase) {
this.toPhase = toPhase;
}
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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -30,7 +30,7 @@ import org.apache.easyant.core.EasyAntCo
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.easyant.core.descriptor.AdvancedInheritableItem;
import org.apache.easyant.core.descriptor.EasyAntModuleDescriptor;
-import org.apache.easyant.core.descriptor.PhaseMappingDescriptor;
+import org.apache.easyant.core.descriptor.ExtensionPointMappingDescriptor;
import org.apache.easyant.core.descriptor.PluginDescriptor;
import org.apache.easyant.core.descriptor.PropertyDescriptor;
import org.apache.easyant.core.ivy.InheritableScope;
@@ -306,11 +306,11 @@ public class LoadModule extends Abstract
}
}
// Apply PhaseMapping
- for (PhaseMappingDescriptor phaseMapping : md.getPhaseMappings()) {
+ for (ExtensionPointMappingDescriptor epMapping : md.getExtensionPointsMappings()) {
BindTarget bindTarget = new BindTarget();
- bindTarget.setTarget(phaseMapping.getTarget());
- bindTarget.setToPhase(phaseMapping.getToPhase());
- bindTarget.setBuildConfigurations(phaseMapping
+ bindTarget.setTarget(epMapping.getTarget());
+ bindTarget.setExtensionOf(epMapping.getExtensionPoint());
+ bindTarget.setBuildConfigurations(epMapping
.getBuildConfigurations());
initTask(bindTarget).execute();
}
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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -43,7 +43,7 @@
<xsl:variable name="easyant" select="$revisions/easyant" />
<xsl:variable name="targets" select="$easyant/targets" />
- <xsl:variable name="phases" select="$easyant/phases" />
+ <xsl:variable name="extensionPoints" select="$easyant/extension-points" />
<xsl:variable name="imports" select="$easyant/imports" />
@@ -706,7 +706,7 @@
<tr>
<th>target name</th>
<th>description</th>
- <th>phase</th>
+ <th>extension point</th>
<th>depends</th>
</tr>
</thead>
@@ -715,7 +715,7 @@
</tbody>
</table>
- <h2>Available phases</h2>
+ <h2>Available extension points</h2>
<table>
<thead>
<tr>
@@ -725,7 +725,7 @@
</tr>
</thead>
<tbody>
- <xsl:apply-templates select="phases/phase" />
+ <xsl:apply-templates select="extension-points/extension-point" />
</tbody>
</table>
@@ -766,24 +766,6 @@
</tbody>
</table>
- <h3>Phases</h3>
- <table>
- <thead>
- <tr>
- <th>phase</th>
- <th>description</th>
- </tr>
- </thead>
- <tbody>
- <xsl:for-each select="parameters/phase">
- <tr>
- <td><xsl:value-of select="@name"/></td>
- <td><xsl:value-of select="@description"/></td>
- </tr>
- </xsl:for-each>
- </tbody>
- </table>
-
<h3>Paths</h3>
<table>
<thead>
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=1299868&r1=1299867&r2=1299868&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 Mar 12 21:08:38 2012
@@ -31,6 +31,7 @@ import org.apache.easyant.core.EasyAntEn
import org.apache.easyant.core.EasyAntMagicNames;
import org.apache.easyant.core.descriptor.PropertyDescriptor;
import org.apache.easyant.core.report.EasyAntReport;
+import org.apache.easyant.core.report.ExtensionPointReport;
import org.apache.easyant.core.report.ImportedModuleReport;
import org.apache.easyant.core.report.PhaseReport;
import org.apache.easyant.core.report.TargetReport;
@@ -140,24 +141,24 @@ public class PluginServiceTest {
Assert.assertEquals("org.apache.easyant.example.Example",
property.getValue());
- // check that package phase exists and that jar:jar target is bound to
+ // check that package ExtensionPoint exists and that jar:jar target is bound to
// this phase
- PhaseReport packagePhase = null;
- for (PhaseReport phase : eaReport.getAvailablePhases()) {
- if ("package".equals(phase.getName())) {
- packagePhase = phase;
+ ExtensionPointReport packageEP = null;
+ for (ExtensionPointReport extensionPoint : eaReport.getAvailableExtensionPoints()) {
+ if ("package".equals(extensionPoint.getName())) {
+ packageEP = extensionPoint;
break;
}
}
- Assert.assertNotNull(packagePhase);
- List<TargetReport> targets = packagePhase.getTargetReports();
+ Assert.assertNotNull(packageEP);
+ List<TargetReport> targets = packageEP.getTargetReports();
Set<String> expectedTargets = new HashSet<String>(Arrays.asList(
"jar:jar", "test-jar:jar"));
Assert.assertEquals("test and main jars included in package phase",
expectedTargets.size(), targets.size());
- for (TargetReport target : packagePhase.getTargetReports()) {
+ for (TargetReport target : packageEP.getTargetReports()) {
Assert.assertTrue("expected to find " + target.getName(),
expectedTargets.remove(target.getName()));
}
@@ -171,7 +172,7 @@ public class PluginServiceTest {
for (TargetReport targetReport : eaReport.getAvailableTargets()) {
if ("hello-world".equals(targetReport.getName())) {
Assert.assertTrue("process-sources".equals(targetReport
- .getPhase()));
+ .getExtensionPoint()));
hasHelloWorldTarget = true;
break;
}