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/06/18 04:14:05 UTC
cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin DefaultPluginManager.java PluginManager.java
jvanzyl 2004/06/17 19:14:05
Modified: maven-core/src/main/java/org/apache/maven/artifact/installer
DefaultArtifactInstaller.java
maven-core/src/main/java/org/apache/maven/lifecycle
MavenLifecycleContext.java
maven-core/src/main/java/org/apache/maven/lifecycle/phase
GoalAttainmentPhase.java
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java PluginManager.java
Log:
o move the parameter creation to the goal attainment phase
Revision Changes Path
1.3 +2 -2 maven-components/maven-core/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java
Index: DefaultArtifactInstaller.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactInstaller.java 17 Jun 2004 22:04:37 -0000 1.2
+++ DefaultArtifactInstaller.java 18 Jun 2004 02:14:05 -0000 1.3
@@ -76,7 +76,7 @@
{
artifactDir.mkdirs();
}
-
+
FileUtils.fileCopy( file.getPath(), artifact.getPath() );
return artifact;
1.5 +3 -9 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleContext.java
Index: MavenLifecycleContext.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MavenLifecycleContext.java 17 Jun 2004 14:45:47 -0000 1.4
+++ MavenLifecycleContext.java 18 Jun 2004 02:14:05 -0000 1.5
@@ -1,14 +1,13 @@
package org.apache.maven.lifecycle;
+import org.apache.maven.plugin.PluginManager;
+import org.apache.maven.plugin.descriptor.Goal;
import org.apache.maven.project.MavenProject;
import org.apache.maven.script.MavenScript;
-import org.apache.maven.plugin.descriptor.Goal;
-import org.apache.maven.plugin.PluginManager;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import java.util.List;
-import java.util.Map;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -120,11 +119,6 @@
public Goal getGoal( String goalName )
{
return pluginManager.getGoal( goalName );
- }
-
- public Map createParameters( Goal goal )
- {
- return pluginManager.createParameters( goal, project );
}
public String getPluginId( Goal goal )
1.6 +37 -5 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java
Index: GoalAttainmentPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/phase/GoalAttainmentPhase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GoalAttainmentPhase.java 17 Jun 2004 15:16:57 -0000 1.5
+++ GoalAttainmentPhase.java 18 Jun 2004 02:14:05 -0000 1.6
@@ -1,17 +1,20 @@
package org.apache.maven.lifecycle.phase;
-import org.apache.maven.artifact.collector.ArtifactCollectionResult;
-import org.apache.maven.artifact.collector.ArtifactCollector;
import org.apache.maven.lifecycle.AbstractMavenLifecyclePhase;
import org.apache.maven.lifecycle.MavenLifecycleContext;
+import org.apache.maven.plugin.OgnlProjectValueExtractor;
import org.apache.maven.plugin.Plugin;
import org.apache.maven.plugin.PluginExecutionRequest;
import org.apache.maven.plugin.PluginExecutionResponse;
import org.apache.maven.plugin.descriptor.Goal;
+import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MavenProjectBuilder;
+import org.codehaus.plexus.PlexusContainer;
+import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -35,7 +38,7 @@
System.out.println( "[" + goal.getName() + "]" );
- request = new PluginExecutionRequest( context.createParameters( goal ) );
+ request = new PluginExecutionRequest( createParameters( goal, context.getProject(), context.getContainer() ) );
response = new PluginExecutionResponse();
@@ -47,10 +50,39 @@
}
catch ( Exception e )
{
+ e.printStackTrace();
+
response.setException( e );
break;
}
}
+ }
+
+ private Map createParameters( Goal goal, MavenProject project, PlexusContainer container )
+ {
+ Map map = null;
+
+ List parameters = goal.getParameters();
+
+ if ( parameters != null )
+ {
+ map = new HashMap();
+
+ for ( int i = 0; i < parameters.size(); i++ )
+ {
+ Parameter c = (Parameter) parameters.get( i );
+
+ String key = c.getName();
+
+ String expression = c.getExpression();
+
+ Object value = OgnlProjectValueExtractor.evaluate( expression, project, container );
+
+ map.put( key, value );
+ }
+ }
+
+ return map;
}
}
1.7 +0 -31 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultPluginManager.java 17 Jun 2004 01:16:03 -0000 1.6
+++ DefaultPluginManager.java 18 Jun 2004 02:14:05 -0000 1.7
@@ -80,37 +80,6 @@
}
// ----------------------------------------------------------------------
- // Create parameters for plugin execution
- // ----------------------------------------------------------------------
-
- public Map createParameters( Goal goalDescriptor, MavenProject project )
- {
- Map map = null;
-
- List parameters = goalDescriptor.getParameters();
-
- if ( parameters != null )
- {
- map = new HashMap();
-
- for ( int i = 0; i < parameters.size(); i++ )
- {
- Parameter c = (Parameter) parameters.get( i );
-
- String key = c.getName();
-
- String expression = c.getExpression();
-
- Object value = OgnlProjectValueExtractor.evaluate( expression, project, container );
-
- map.put( key, value );
- }
- }
-
- return map;
- }
-
- // ----------------------------------------------------------------------
// Plugin descriptors
// ----------------------------------------------------------------------
1.4 +1 -3 maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PluginManager.java 17 Jun 2004 01:16:03 -0000 1.3
+++ PluginManager.java 18 Jun 2004 02:14:05 -0000 1.4
@@ -61,7 +61,5 @@
//
// ----------------------------------------------------------------------
- Map createParameters( Goal goalDescriptor, MavenProject project );
-
List getGoals( String goal );
}