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 jd...@apache.org on 2004/09/22 02:23:35 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal MavenGoalExecutionContext.java
jdcasey 2004/09/21 17:23:35
Modified: maven-core/src/test/java/org/apache/maven MavenTestCase.java
maven-core/src/main/java/org/apache/maven/lifecycle/session/phase
GoalExecutionPhase.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal
MavenGoalExecutionContext.java
Log:
o removed the current mojo descriptor stuff from the goal execution context...doesn't seem to be used anywhere, and it'll cause problems if the current goal is from a plugin that has not been resolved yet.
Revision Changes Path
1.8 +2 -13 maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java
Index: MavenTestCase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/MavenTestCase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MavenTestCase.java 15 Sep 2004 12:30:05 -0000 1.7
+++ MavenTestCase.java 22 Sep 2004 00:23:35 -0000 1.8
@@ -126,18 +126,7 @@
pluginManager.setLocalRepository( localRepository );
- MojoDescriptor descriptor;
-
- if ( goal != null )
- {
- descriptor = pluginManager.getMojoDescriptor( goal );
- }
- else
- {
- descriptor = new MojoDescriptor();
- }
-
- MavenGoalExecutionContext context = new MavenGoalExecutionContext( session, descriptor );
+ MavenGoalExecutionContext context = new MavenGoalExecutionContext( session, goal );
return context;
}
1.4 +3 -3 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java
Index: GoalExecutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GoalExecutionPhase.java 26 Aug 2004 16:37:08 -0000 1.3
+++ GoalExecutionPhase.java 22 Sep 2004 00:23:35 -0000 1.4
@@ -43,7 +43,7 @@
MavenGoalExecutionContext context;
- context = new MavenGoalExecutionContext( session, session.getPluginManager().getMojoDescriptor( goal ) );
+ context = new MavenGoalExecutionContext( session, goal );
context.setGoalName( goal );
@@ -51,7 +51,7 @@
if ( context.isExecutionFailure() )
{
- response.setExecutionFailure( context.getMojoDescriptor().getId(), context.getFailureResponse() );
+ response.setExecutionFailure( context.getGoalName(), context.getFailureResponse() );
break;
}
1.3 +2 -19 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java
Index: MavenGoalExecutionContext.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/MavenGoalExecutionContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenGoalExecutionContext.java 26 Aug 2004 04:40:02 -0000 1.2
+++ MavenGoalExecutionContext.java 22 Sep 2004 00:23:35 -0000 1.3
@@ -23,19 +23,17 @@
private FailureResponse failureResponse;
- private MojoDescriptor mojoDescriptor;
-
private List resolvedGoals;
// private GoalDecoratorBindings goalDecoratorBindings;
private String goalName;
- public MavenGoalExecutionContext( MavenSession session, MojoDescriptor goal )
+ public MavenGoalExecutionContext( MavenSession session, String goalName )
{
this.session = session;
- this.mojoDescriptor = goal;
+ this.goalName = goalName;
}
public MavenSession getSession()
@@ -78,21 +76,6 @@
}
// ----------------------------------------------------------------------
-
- public boolean requiresDependencyResolution()
- {
- return mojoDescriptor.requiresDependencyResolution();
- }
-
- public MojoDescriptor getMojoDescriptor()
- {
- return mojoDescriptor;
- }
-
- public void setMojoDescriptor( MojoDescriptor mojoDescriptor )
- {
- this.mojoDescriptor = mojoDescriptor;
- }
public List getResolvedGoals()
{