jvanzyl 2004/05/20 14:51:02
Modified: maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java
maven-core/src/main/java/org/apache/maven/script
MavenScript.java
maven-core/src/main/java/org/apache/maven/script/taglib
AbstractGoalDecoratorTag.java
maven-core/src/main/resources/META-INF/plexus components.xml
maven-core/src/test/java/org/apache/maven/lifecycle
MavenLifecycleManagerTest.java
Added: maven-core/src/main/java/org/apache/maven/lifecycle/phase
GoalResolutionPhase.java
Log:
o adding another stub phase for line up some work for mr casey :-)
Revision Changes Path
1.1
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalResolutionPhase.java
Index: GoalResolutionPhase.java
===================================================================
package org.apache.maven.lifecycle.phase;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
import org.apache.maven.lifecycle.MavenLifecycleContext;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @version $Id: GoalResolutionPhase.java,v 1.1 2004/05/20 21:51:02 jvanzyl Exp $
*/
public class GoalResolutionPhase
extends AbstractMavenLifecyclePhase
{
public void execute( MavenLifecycleContext context )
throws Exception
{
}
}
1.3 +0 -4
maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultPluginManager.java 20 May 2004 20:32:59 -0000 1.2
+++ DefaultPluginManager.java 20 May 2004 21:51:02 -0000 1.3
@@ -129,10 +129,6 @@
request.addContextValue( "id", getPluginDescriptor( goal ).getId() );
- request.addContextValue( "method", getGoalDescriptor( goal
).getMethod() );
-
- request.addContextValue( "mode", getPluginDescriptor( goal ).getMode()
);
-
if ( context.getScript() != null )
{
List preGoals = context.getScript().getPreGoals( goal );
1.3 +2 -0
maven-components/maven-core/src/main/java/org/apache/maven/script/MavenScript.java
Index: MavenScript.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/script/MavenScript.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenScript.java 20 May 2004 20:26:31 -0000 1.2
+++ MavenScript.java 20 May 2004 21:51:02 -0000 1.3
@@ -78,9 +78,11 @@
String goal = decorator.getGoal();
List decorators = (List) decoratorMap.get( goal );
+
if ( decorators == null )
{
decorators = new ArrayList();
+
decoratorMap.put( goal, decorators );
}
1.3 +2 -1
maven-components/maven-core/src/main/java/org/apache/maven/script/taglib/AbstractGoalDecoratorTag.java
Index: AbstractGoalDecoratorTag.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/script/taglib/AbstractGoalDecoratorTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractGoalDecoratorTag.java 20 May 2004 20:26:31 -0000 1.2
+++ AbstractGoalDecoratorTag.java 20 May 2004 21:51:02 -0000 1.3
@@ -70,7 +70,8 @@
aggregator.child( child );
}
- public static final class MarmaladeScriptAggregator extends AbstractMarmaladeTag
+ public static final class MarmaladeScriptAggregator
+ extends AbstractMarmaladeTag
{
MarmaladeScriptAggregator()
{
1.7 +1 -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 20 May 2004 20:41:22 -0000 1.6
+++ components.xml 20 May 2004 21:51:02 -0000 1.7
@@ -31,6 +31,7 @@
<configuration>
<lifecycle-phases>
<lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalDecorationPhase"/>
+ <lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.GoalResolutionPhase"/>
<lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.DependencyResolutionPhase"/>
<lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.PluginDownloadPhase"/>
<lifecycle-phase
implementation="org.apache.maven.lifecycle.phase.ArtifactDownloadPhase"/>
1.3 +2 -2
maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java
Index: MavenLifecycleManagerTest.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/MavenLifecycleManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MavenLifecycleManagerTest.java 8 May 2004 17:13:40 -0000 1.2
+++ MavenLifecycleManagerTest.java 20 May 2004 21:51:02 -0000 1.3
@@ -23,6 +23,6 @@
List lifecyclePhases = mlm.getLifecyclePhases();
- assertEquals( 3, lifecyclePhases.size() );
+ assertEquals( 5, lifecyclePhases.size() );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
