You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/12/19 05:27:31 UTC
svn commit: r357626 - in
/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven:
lifecycle/DefaultLifecycleExecutor.java lifecycle/LifecycleExecutor.java
plugin/DefaultPluginManager.java plugin/PluginManager.java
Author: brett
Date: Sun Dec 18 20:27:20 2005
New Revision: 357626
URL: http://svn.apache.org/viewcvs?rev=357626&view=rev
Log:
revert previous change that introduced an unnecessary public API, and use verifyPlugin method to ensure the plugin is always initialised, avoiding an NPE
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=357626&r1=357625&r2=357626&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Sun Dec 18 20:27:20 2005
@@ -482,7 +482,8 @@
{
// guaranteed to come from the CLI and not be part of a phase
MojoDescriptor mojoDescriptor = getMojoDescriptor( task, session, project, task, true );
- executeGoals( Collections.singletonList( new MojoExecution( mojoDescriptor ) ), forkEntryPoints, session, project );
+ executeGoals( Collections.singletonList( new MojoExecution( mojoDescriptor ) ), forkEntryPoints, session,
+ project );
}
private void executeGoals( List goals, Stack forkEntryPoints, MavenSession session, MavenProject project )
@@ -703,7 +704,8 @@
return reports;
}
- private void forkLifecycle( MojoDescriptor mojoDescriptor, Stack ancestorLifecycleForkers, MavenSession session, MavenProject project )
+ private void forkLifecycle( MojoDescriptor mojoDescriptor, Stack ancestorLifecycleForkers, MavenSession session,
+ MavenProject project )
throws LifecycleExecutionException, BuildFailureException, PluginNotFoundException
{
PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
@@ -730,7 +732,8 @@
}
}
- private void forkProjectLifecycle( MojoDescriptor mojoDescriptor, Stack forkEntryPoints, MavenSession session, MavenProject project )
+ private void forkProjectLifecycle( MojoDescriptor mojoDescriptor, Stack forkEntryPoints, MavenSession session,
+ MavenProject project )
throws LifecycleExecutionException, BuildFailureException, PluginNotFoundException
{
forkEntryPoints.push( mojoDescriptor );
@@ -776,9 +779,9 @@
Phase phase = (Phase) i.next();
for ( Iterator j = phase.getExecutions().iterator(); j.hasNext(); )
{
- Execution e = (Execution) j.next();
+ Execution exec = (Execution) j.next();
- for ( Iterator k = e.getGoals().iterator(); k.hasNext(); )
+ for ( Iterator k = exec.getGoals().iterator(); k.hasNext(); )
{
String goal = (String) k.next();
@@ -817,20 +820,17 @@
String groupId = s[0];
String artifactId = s[1];
- String externalGoal = s[2];
- lifecycleGoal = externalGoal;
+ lifecycleGoal = s[2];
- try
+ Plugin plugin = new Plugin();
+ plugin.setGroupId( groupId );
+ plugin.setArtifactId( artifactId );
+ lifecyclePluginDescriptor = verifyPlugin( plugin, project, session.getSettings(),
+ session.getLocalRepository() );
+ if ( lifecyclePluginDescriptor == null )
{
- lifecyclePluginDescriptor = pluginManager.getPluginDescriptor( groupId,
- artifactId,
- project,
- session.getSettings(),
- session.getLocalRepository() );
- }
- catch ( Exception ex )
- {
- throw new LifecycleExecutionException( ex );
+ throw new LifecycleExecutionException(
+ "Unable to find plugin " + groupId + ":" + artifactId );
}
}
else
@@ -840,8 +840,9 @@
}
MojoDescriptor desc = getMojoDescriptor( lifecyclePluginDescriptor, lifecycleGoal );
- MojoExecution mojoExecution = new MojoExecution( desc, (Xpp3Dom) e.getConfiguration() );
- addToLifecycleMappings( lifecycleMappings, phase.getId(), mojoExecution, session.getSettings() );
+ MojoExecution mojoExecution = new MojoExecution( desc, (Xpp3Dom) exec.getConfiguration() );
+ addToLifecycleMappings( lifecycleMappings, phase.getId(), mojoExecution,
+ session.getSettings() );
}
}
}
@@ -855,13 +856,15 @@
{
Lifecycle lifecycle = getLifecycleForPhase( targetPhase );
- executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, lifecycleMappings, executionProject, lifecycle );
+ executeGoalWithLifecycle( targetPhase, forkEntryPoints, session, lifecycleMappings, executionProject,
+ lifecycle );
}
else
{
String goal = mojoDescriptor.getExecuteGoal();
MojoDescriptor desc = getMojoDescriptor( pluginDescriptor, goal );
- executeGoals( Collections.singletonList( new MojoExecution( desc ) ), forkEntryPoints, session, executionProject );
+ executeGoals( Collections.singletonList( new MojoExecution( desc ) ), forkEntryPoints, session,
+ executionProject );
}
project.setExecutionProject( executionProject );
}
@@ -925,9 +928,8 @@
if ( removed )
{
- getLogger().warn(
- "Removing: " + mojoDescriptor.getGoal()
- + " from forked lifecycle, to prevent recursive invocation." );
+ getLogger().warn( "Removing: " + mojoDescriptor.getGoal() +
+ " from forked lifecycle, to prevent recursive invocation." );
}
}
}
@@ -1133,10 +1135,10 @@
private void bindPluginToLifecycle( Plugin plugin, MavenSession session, Map phaseMap, MavenProject project )
throws LifecycleExecutionException, PluginNotFoundException
{
- PluginDescriptor pluginDescriptor;
Settings settings = session.getSettings();
- pluginDescriptor = verifyPlugin( plugin, project, session.getSettings(), session.getLocalRepository() );
+ PluginDescriptor pluginDescriptor =
+ verifyPlugin( plugin, project, session.getSettings(), session.getLocalRepository() );
if ( pluginDescriptor.getMojos() != null && !pluginDescriptor.getMojos().isEmpty() )
{
@@ -1287,7 +1289,8 @@
}
}
- private void addToLifecycleMappings( Map lifecycleMappings, String phase, MojoExecution mojoExecution, Settings settings )
+ private void addToLifecycleMappings( Map lifecycleMappings, String phase, MojoExecution mojoExecution,
+ Settings settings )
{
List goals = (List) lifecycleMappings.get( phase );
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=357626&r1=357625&r2=357626&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java Sun Dec 18 20:27:20 2005
@@ -29,7 +29,7 @@
{
String ROLE = LifecycleExecutor.class.getName();
- void execute( MavenSession session, ReactorManager rpm, EventDispatcher dispatcher )
+ void execute( MavenSession session, ReactorManager rm, EventDispatcher dispatcher )
throws LifecycleExecutionException, BuildFailureException;
}
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=357626&r1=357625&r2=357626&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Dec 18 20:27:20 2005
@@ -137,24 +137,6 @@
return pluginCollector.getPluginDescriptorForPrefix( prefix );
}
- public PluginDescriptor getPluginDescriptor( String groupId,
- String artifactId,
- MavenProject project,
- Settings settings,
- ArtifactRepository localRepository )
- throws PluginVersionResolutionException, InvalidPluginException, PluginVersionNotFoundException
- {
- Plugin plugin = new Plugin();
-
- plugin.setGroupId( groupId );
-
- plugin.setArtifactId( artifactId );
-
- String version = pluginVersionManager.resolvePluginVersion( groupId, artifactId, project, settings, localRepository );
-
- return pluginCollector.getPluginDescriptor( plugin );
- }
-
public Plugin getPluginDefinitionForPrefix( String prefix, MavenSession session, MavenProject project )
{
// TODO: since this is only used in the lifecycle executor, maybe it should be moved there? There is no other
Modified: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=357626&r1=357625&r2=357626&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Sun Dec 18 20:27:20 2005
@@ -52,14 +52,6 @@
PluginDescriptor getPluginDescriptorForPrefix( String prefix );
- PluginDescriptor getPluginDescriptor( String groupId,
- String artifactId,
- MavenProject project,
- Settings settings,
- ArtifactRepository localRepository )
- throws PluginVersionResolutionException, InvalidPluginException, PluginVersionNotFoundException;
-
-
Plugin getPluginDefinitionForPrefix( String prefix, MavenSession session, MavenProject project );
PluginDescriptor verifyPlugin( Plugin plugin, MavenProject project, Settings settings,