You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by jl...@apache.org on 2013/04/15 08:13:15 UTC
svn commit: r1467858 - in
/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man:
ListParameters.java ListPlugins.java ListProps.java ListTargets.java
Author: jlboudart
Date: Mon Apr 15 06:13:15 2013
New Revision: 1467858
URL: http://svn.apache.org/r1467858
Log:
describe switch on CLI was not referenced correctly on ProjectMan commands
Modified:
ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListParameters.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java
ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListParameters.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListParameters.java?rev=1467858&r1=1467857&r2=1467858&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListParameters.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListParameters.java Mon Apr 15 06:13:15 2013
@@ -66,15 +66,14 @@ public class ListParameters extends Easy
List<ParameterReport> parameterReports = moduleRep.getEasyantReport().getParameterReports();
if (parameterReports.size() > 0) {
printParameters(parameterReports);
-
- getProject().log(
- LINE_SEP + LINE_SEP + "For more information on a parameter, run:" + LINE_SEP
- + "\t easyant -describe <parameter name>");
} else {
getProject().log(LINE_SEP + "No parameter found in the plugin: " + plugin);
}
}
}
+ getProject().log(
+ LINE_SEP + LINE_SEP + "For more information on a parameter, run:" + LINE_SEP
+ + "\t easyant -describe <parameter name>");
getProject().log(LINE_SEP + "--- End Of (Parameter Listing) ---");
}
@@ -83,4 +82,4 @@ public class ListParameters extends Easy
getProject().log("\tParameter (type=" + parameterReport.getType() + "): " + parameterReport.getName());
}
}
-}
\ No newline at end of file
+}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java?rev=1467858&r1=1467857&r2=1467858&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListPlugins.java Mon Apr 15 06:13:15 2013
@@ -22,29 +22,30 @@ import java.util.List;
import org.apache.easyant.core.report.ImportedModuleReport;
/**
- * Lists all available plugins (imported modules) for the specified
- * build module.
+ * Lists all available plugins (imported modules) for the specified build module.
*/
public class ListPlugins extends EasyantOption {
private static final long serialVersionUID = 1L;
-
-
- public ListPlugins()
- throws IllegalArgumentException {
- super("listPlugins",false,"List all plugins used by the project");
+
+ public ListPlugins() throws IllegalArgumentException {
+ super("listPlugins", false, "List all plugins used by the project");
setStopBuild(true);
}
public void execute() {
- getProject().log(LINE_SEP + "--- Available Plugins for current project: " + getProject().getName() + " ---" + LINE_SEP);
-
+ getProject().log(
+ LINE_SEP + "--- Available Plugins for current project: " + getProject().getName() + " ---" + LINE_SEP);
+
List<ImportedModuleReport> moduleReps = getEareport().getImportedModuleReports();
- for(int i = 0; i<moduleReps.size(); i++) {
- getProject().log("\t" + moduleReps.get(i).getModuleMrid() + (moduleReps.get(i).getAs() == null ?
- "" : ": Known as " + moduleReps.get(i).getAs()));
+ for (int i = 0; i < moduleReps.size(); i++) {
+ getProject().log(
+ "\t" + moduleReps.get(i).getModuleMrid()
+ + (moduleReps.get(i).getAs() == null ? "" : ": Known as " + moduleReps.get(i).getAs()));
}
-
- getProject().log(LINE_SEP + LINE_SEP + "For more information on a Plugin, run:" + LINE_SEP + "\t easyant -describe <PLUGIN>");
+
+ getProject().log(
+ LINE_SEP + LINE_SEP + "For more information on a Plugin, run:" + LINE_SEP
+ + "\t easyant -describe <PLUGIN>");
getProject().log(LINE_SEP + "--- End Of (Plugins Listing) ---");
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java?rev=1467858&r1=1467857&r2=1467858&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListProps.java Mon Apr 15 06:13:15 2013
@@ -30,7 +30,7 @@ import org.apache.easyant.core.report.Im
public class ListProps extends EasyantOption {
private static final long serialVersionUID = 1L;
-
+
public ListProps() throws IllegalArgumentException {
super("listProps", true, "List all properties available or specified in a given plugin as argument");
setOptionalArg(true);
@@ -39,29 +39,29 @@ public class ListProps extends EasyantOp
public void execute() {
getProject().log(
- LINE_SEP + "--- Available Properties for current project: " + getProject().getName() + " ---" + LINE_SEP);
+ LINE_SEP + "--- Available Properties for current project: " + getProject().getName() + " ---"
+ + LINE_SEP);
/*
* the plugin specified to this class through the addParam method needs to be searched for all properties, and
* those properties will be displayed by this class.
*/
String plugin = getValue();
if (plugin == null || plugin.trim().length() == 0) {
-
- getProject().log(
- LINE_SEP + "No plugin specified. Listing all properties available in the project.");
-
- Map<String, PropertyDescriptor> allProjectProps =getEareport().getPropertyDescriptors();
+
+ getProject().log(LINE_SEP + "No plugin specified. Listing all properties available in the project.");
+
+ Map<String, PropertyDescriptor> allProjectProps = getEareport().getPropertyDescriptors();
if (allProjectProps.size() > 0) {
printProperties(allProjectProps);
} else {
getProject().log(LINE_SEP + "No property found in current project");
}
-
+
} else {
getProject().log(
- LINE_SEP + "--- Filtering properties declared in the following plugin: "
- + plugin + " ---" + LINE_SEP);
+ LINE_SEP + "--- Filtering properties declared in the following plugin: " + plugin + " ---"
+ + LINE_SEP);
ImportedModuleReport moduleRep = getEareport().getImportedModuleReport(plugin);
if (moduleRep == null) {
getProject().log("\tNo Module / Plugin found by given name: " + plugin);
@@ -70,15 +70,14 @@ public class ListProps extends EasyantOp
if (allprops.size() > 0) {
printProperties(allprops);
-
- getProject().log(
- LINE_SEP + LINE_SEP + "For more information on a Property, run:" + LINE_SEP
- + "\t easyant -describe <PROPERTY>");
} else {
getProject().log(LINE_SEP + "No property found in the plugin: " + plugin);
}
}
}
+ getProject().log(
+ LINE_SEP + LINE_SEP + "For more information on a Property, run:" + LINE_SEP
+ + "\t easyant -describe <PROPERTY>");
getProject().log(LINE_SEP + "--- End Of (Properties Listing) ---");
}
@@ -86,8 +85,8 @@ public class ListProps extends EasyantOp
for (Iterator<Entry<String, PropertyDescriptor>> it = allProjectProps.entrySet().iterator(); it.hasNext();) {
Entry<String, PropertyDescriptor> entry = it.next();
PropertyDescriptor prop = entry.getValue();
- getProject().log("\tProperty: " + prop.getName() );
-
+ getProject().log("\tProperty: " + prop.getName());
+
}
}
Modified: ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java
URL: http://svn.apache.org/viewvc/ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java?rev=1467858&r1=1467857&r2=1467858&view=diff
==============================================================================
--- ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java (original)
+++ ant/easyant/core/trunk/src/main/java/org/apache/easyant/man/ListTargets.java Mon Apr 15 06:13:15 2013
@@ -85,11 +85,10 @@ public class ListTargets extends Easyant
} else {
getProject().log(LINE_SEP + "\tNo Module / Plugin found by name: " + container);
}
-
- getProject().log(
- LINE_SEP + LINE_SEP + "For more information on an target, run:" + LINE_SEP
- + "\t easyant -describe <TARGET>");
}
+ getProject().log(
+ LINE_SEP + LINE_SEP + "For more information on an target, run:" + LINE_SEP
+ + "\t easyant -describe <TARGET>");
getProject().log(LINE_SEP + "--- End Of (Targets Listing) ---");
}