jvanzyl 2004/05/08 16:34:18
Modified: maven-core/src/main/java/org/apache/maven/plugin/descriptor
GoalDescriptor.java
maven-core/src/main/java/org/apache/maven/plugin/manager
DefaultPluginManager.java
maven-core/src/main/java/org/apache/maven/plugin/manager/executor
FieldPluginExecutor.java SetterPluginExecutor.java
Log:
o allow the method name to be configurable when executing field/setting
plugins.
Revision Changes Path
1.7 +8 -1
maven-components/maven-core/src/main/java/org/apache/maven/plugin/descriptor/GoalDescriptor.java
Index: GoalDescriptor.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/descriptor/GoalDescriptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GoalDescriptor.java 8 May 2004 02:23:48 -0000 1.6
+++ GoalDescriptor.java 8 May 2004 23:34:18 -0000 1.7
@@ -39,6 +39,8 @@
private boolean requiresProject = true;
+ private String method = "execute";
+
public String getName()
{
return name;
@@ -57,5 +59,10 @@
public List getParameters()
{
return parameters;
+ }
+
+ public String getMethod()
+ {
+ return method;
}
}
1.2 +2 -0
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultPluginManager.java 8 May 2004 21:11:17 -0000 1.1
+++ DefaultPluginManager.java 8 May 2004 23:34:18 -0000 1.2
@@ -105,6 +105,8 @@
request.addContextValue( "id", getPluginDescriptor( goal ).getId() );
+ request.addContextValue( "method", getGoalDescriptor( goal
).getMethod() );
+
request.addContextValue( "mode", getPluginDescriptor( goal ).getMode()
);
attainGoal( request, response );
1.2 +2 -2
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/executor/FieldPluginExecutor.java
Index: FieldPluginExecutor.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/executor/FieldPluginExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FieldPluginExecutor.java 8 May 2004 00:50:35 -0000 1.1
+++ FieldPluginExecutor.java 8 May 2004 23:34:18 -0000 1.2
@@ -59,7 +59,7 @@
try
{
- m = plugin.getClass().getMethod( "execute", new Class[0] );
+ m = plugin.getClass().getMethod( (String) request.getContextValue(
"method" ), new Class[0] );
m.invoke( plugin, new Object[0] );
}
1.2 +2 -2
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/executor/SetterPluginExecutor.java
Index: SetterPluginExecutor.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/executor/SetterPluginExecutor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SetterPluginExecutor.java 8 May 2004 00:50:35 -0000 1.1
+++ SetterPluginExecutor.java 8 May 2004 23:34:18 -0000 1.2
@@ -58,7 +58,7 @@
try
{
- m = plugin.getClass().getMethod( "execute", new Class[0] );
+ m = plugin.getClass().getMethod( (String) request.getContextValue(
"method" ), new Class[0] );
m.invoke( plugin, new Object[0] );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
