jvanzyl 2004/03/20 16:03:50
Modified: maven-core/src/main/java/org/apache/maven/plugin/manager
DefaultPluginManagerManager.java
Log:
Revision Changes Path
1.4 +27 -12
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java
Index: DefaultPluginManagerManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultPluginManagerManager.java 20 Mar 2004 23:20:17 -0000 1.3
+++ DefaultPluginManagerManager.java 21 Mar 2004 00:03:50 -0000 1.4
@@ -126,26 +126,20 @@
{
PluginManager pluginManager = (PluginManager) pluginManagers.get( "plexus"
);
- PluginExecutionResponse response = new PluginExecutionResponse();
+ PluginExecutionResponse response = null;
if ( !goalDescriptors.containsKey( goal ) )
{
+ response = new PluginExecutionResponse();
+
response.setException( new UnknownGoalException( goal ) );
return response;
}
- GoalDescriptor goalDescriptor = getGoalDescriptor( goal );
-
- PluginDescriptor pluginDescriptor = getPluginDescriptor( goal );
-
- PluginExecutionRequest request = new PluginExecutionRequest(
pluginDescriptor, goalDescriptor, project );
-
if ( dag.getChildLabels( goal ).size() == 0 && dag.getParentLabels( goal
).size() == 0 )
{
- System.out.println( "[" + goal + "]" );
-
- pluginManager.attainGoal( request, response );
+ response = attainGoal( pluginManager, project, goal );
}
else
{
@@ -157,11 +151,32 @@
{
String goalName = (String) goals.get( j );
- System.out.println( "[" + goalName + "]" );
+ response = attainGoal( pluginManager, project, goalName );
- pluginManager.attainGoal( request, response );
+ if ( response.exceptionOccurred() )
+ {
+ return response;
+ }
}
}
+
+ return response;
+ }
+
+ private PluginExecutionResponse attainGoal( PluginManager pluginManager,
MavenProject project, String goal )
+ throws Exception
+ {
+ System.out.println( "[" + goal + "]" );
+
+ GoalDescriptor goalDescriptor = getGoalDescriptor( goal );
+
+ PluginDescriptor pluginDescriptor = getPluginDescriptor( goal );
+
+ PluginExecutionRequest request = new PluginExecutionRequest(
pluginDescriptor, goalDescriptor, project );
+
+ PluginExecutionResponse response = new PluginExecutionResponse();
+
+ pluginManager.attainGoal( request, response );
return response;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
