You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by jv...@apache.org on 2004/12/28 20:32:54 UTC
cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/execution/manager MavenExecutionRequestHandlerManagerTest.java
jvanzyl 2004/12/28 11:32:54
Modified: maven-core/src/main/java/org/apache/maven/execution/initialize
MavenInitializingExecutionRequestHandler.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
PluginResolutionPhase.java
maven-core/src/main/java/org/apache/maven/util
GoalWalker.java
maven-core/src/main/resources/META-INF/plexus components.xml
maven-core/src/test/java/org/apache/maven/execution/manager
MavenExecutionRequestHandlerManagerTest.java
Log:
Revision Changes Path
1.3 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequestHandler.java
Index: MavenInitializingExecutionRequestHandler.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/execution/initialize/MavenInitializingExecutionRequestHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenInitializingExecutionRequestHandler.java 25 Dec 2004 16:26:24 -0000 1.2
+++ MavenInitializingExecutionRequestHandler.java 28 Dec 2004 19:32:54 -0000 1.3
@@ -20,6 +20,7 @@
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestHandler;
import org.apache.maven.execution.MavenExecutionResponse;
+import org.apache.maven.execution.AbstractMavenExecutionRequestHandler;
import org.apache.maven.execution.project.MavenProjectExecutionRequestHandler;
/**
@@ -27,7 +28,6 @@
* @version $Id$
*/
public class MavenInitializingExecutionRequestHandler
- extends MavenProjectExecutionRequestHandler
- implements MavenExecutionRequestHandler
+ extends AbstractMavenExecutionRequestHandler
{
}
1.6 +8 -8 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java
Index: PluginResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/PluginResolutionPhase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PluginResolutionPhase.java 25 Dec 2004 16:26:24 -0000 1.5
+++ PluginResolutionPhase.java 28 Dec 2004 19:32:54 -0000 1.6
@@ -35,8 +35,8 @@
public class PluginResolutionPhase
extends AbstractMavenGoalPhase
{
-
- public void execute( MavenGoalExecutionContext context ) throws GoalExecutionException
+ public void execute( MavenGoalExecutionContext context )
+ throws GoalExecutionException
{
PluginResolutionVisitor visitor = new PluginResolutionVisitor( context.getSession().getPluginManager() );
@@ -48,7 +48,6 @@
{
throw new GoalExecutionException( "Cannot resolve plugins required for goal execution chain", e );
}
-
}
public static final class PluginResolutionVisitor
@@ -86,21 +85,22 @@
return result;
}
- public void visitPostGoal( String goal, String postGoal, MavenSession session ) throws GraphTraversalException
+ public void visitPostGoal( String goal, String postGoal, MavenSession session )
+ throws GraphTraversalException
{
GoalWalker.walk( postGoal, session, this );
}
- public void visitPreGoal( String goal, String preGoal, MavenSession session ) throws GraphTraversalException
+ public void visitPreGoal( String goal, String preGoal, MavenSession session )
+ throws GraphTraversalException
{
GoalWalker.walk( preGoal, session, this );
}
- public void visitPrereq( String goal, String prereq, MavenSession session ) throws GraphTraversalException
+ public void visitPrereq( String goal, String prereq, MavenSession session )
+ throws GraphTraversalException
{
GoalWalker.walk( prereq, session, this );
}
-
}
-
}
1.6 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java
Index: GoalWalker.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/util/GoalWalker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GoalWalker.java 28 Dec 2004 18:59:06 -0000 1.5
+++ GoalWalker.java 28 Dec 2004 19:32:54 -0000 1.6
@@ -29,7 +29,7 @@
*/
public final class GoalWalker
{
- public static void walk( String goal, MavenSession session, GoalVisitor visitor )
+ public static void walk( String goal, MavenSession session, GoalVisitor visitor )
throws GraphTraversalException
{
if ( visitor.shouldVisit( goal, session ) )
1.7 +19 -0 maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- components.xml 23 Dec 2004 23:46:42 -0000 1.6
+++ components.xml 28 Dec 2004 19:32:54 -0000 1.7
@@ -70,6 +70,25 @@
</requirement>
</requirements>
</component>
+1 <component>
+ <role>org.apache.maven.execution.MavenExecutionRequestHandler</role>
+ <role-hint>initializing</role-hint>
+ <implementation>org.apache.maven.execution.initialize.MavenInitializingExecutionRequestHandler</implementation>
+ <requirements>
+ <requirement>
+ <role>org.codehaus.plexus.i18n.I18N</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.plugin.PluginManager</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.project.MavenProjectBuilder</role>
+ </requirement>
+ <requirement>
+ <role>org.apache.maven.lifecycle.session.MavenSessionPhaseManager</role>
+ </requirement>
+ </requirements>
+ </component>
<!--
|
|
1.2 +2 -2 maven-components/maven-core/src/test/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerManagerTest.java
Index: MavenExecutionRequestHandlerManagerTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/execution/manager/MavenExecutionRequestHandlerManagerTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenExecutionRequestHandlerManagerTest.java 23 Dec 2004 23:46:42 -0000 1.1
+++ MavenExecutionRequestHandlerManagerTest.java 28 Dec 2004 19:32:54 -0000 1.2
@@ -18,6 +18,6 @@
assertNotNull( manager );
- assertEquals( 2, manager.managedCount() );
+ assertEquals( 3, manager.managedCount() );
}
}