jvanzyl 2004/04/02 10:33:13 Modified: maven-core/src/main/java/org/apache/maven/plugin/manager AbstractPluginManager.java DefaultPluginManagerManager.java PluginManagerManager.java Log: o allow information about goals and plugins to be accessed for help and integration purposes. Revision Changes Path 1.3 +2 -3 maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/AbstractPluginManager.java Index: AbstractPluginManager.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/AbstractPluginManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AbstractPluginManager.java 21 Mar 2004 00:33:17 -0000 1.2 +++ AbstractPluginManager.java 2 Apr 2004 18:33:13 -0000 1.3 @@ -16,7 +16,6 @@ * limitations under the License. */ -import org.apache.maven.MavenException; import org.apache.maven.artifact.MavenArtifact; import org.apache.maven.model.Dependency; import org.apache.maven.project.MavenProject; @@ -131,7 +130,7 @@ } catch ( IOException e ) { - throw new MavenException( "Unable to extract plugin: " + files[i], e ); + throw new Exception( "Unable to extract plugin: " + files[i], e ); } } } 1.7 +49 -20 maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java Index: DefaultPluginManagerManager.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DefaultPluginManagerManager.java 23 Mar 2004 23:44:59 -0000 1.6 +++ DefaultPluginManagerManager.java 2 Apr 2004 18:33:13 -0000 1.7 @@ -23,7 +23,6 @@ import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.project.MavenProject; -import org.apache.maven.verifier.DependencyVerifier; import org.codehaus.classworlds.ClassRealm; import org.codehaus.plexus.component.discovery.ComponentDiscoveryEvent; import org.codehaus.plexus.component.discovery.ComponentDiscoveryListener; @@ -50,8 +49,6 @@ // Components - protected DependencyVerifier dependencyVerifier; - protected Map pluginManagers; // Configuration @@ -81,6 +78,10 @@ pluginDescriptorBuilder = new PluginDescriptorBuilder(); } + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + public PluginExecutionResponse attainGoal( MavenProject project, String goal ) throws Exception { @@ -141,35 +142,34 @@ return response; } - private PluginDescriptor getPluginDescriptor( String goalName ) + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + + public Map getPluginDescriptors() { - return (PluginDescriptor) goalToPluginMap.get( goalName ); + return pluginDescriptors; } - private GoalDescriptor getGoalDescriptor( String name ) + public PluginDescriptor getPluginDescriptor( String goalName ) { - return (GoalDescriptor) goalDescriptors.get( name ); + return (PluginDescriptor) goalToPluginMap.get( goalName ); } - public void contextualize( Context context ) - throws Exception + public Map getGoalDescriptors() { - rootClassRealm = (ClassRealm) context.get( "rootClassRealm" ); + return goalDescriptors; } - public void initialize() - throws Exception + public GoalDescriptor getGoalDescriptor( String name ) { - for ( Iterator i = pluginManagers.values().iterator(); i.hasNext(); ) - { - PluginManager pluginManager = (PluginManager) i.next(); - - getLogger().info( "Initializing " + pluginManager.getId() + " plugin manager." ); - - pluginManager.initializePlugins( mavenHome, mavenLocalHome, rootClassRealm ); - } + return (GoalDescriptor) goalDescriptors.get( name ); } + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + public void processPluginDescriptor( PluginDescriptor pluginDescriptor ) throws CycleDetectedException { @@ -195,8 +195,14 @@ goalToPluginMap.put( goalDescriptor.getName(), pluginDescriptor ); } + + pluginDescriptors.put( pluginDescriptor.getId(), pluginDescriptor ); } + // ---------------------------------------------------------------------- + // + // ---------------------------------------------------------------------- + public void componentDiscovered( ComponentDiscoveryEvent event ) { if ( event.getComponentType().equals( MAVEN_PLUGIN ) ) @@ -211,6 +217,29 @@ { getLogger().error( "A cycle was detected in the goal graph: ", e ); } + } + } + + // ---------------------------------------------------------------------- + // Lifecycle + // ---------------------------------------------------------------------- + + public void contextualize( Context context ) + throws Exception + { + rootClassRealm = (ClassRealm) context.get( "rootClassRealm" ); + } + + public void initialize() + throws Exception + { + for ( Iterator i = pluginManagers.values().iterator(); i.hasNext(); ) + { + PluginManager pluginManager = (PluginManager) i.next(); + + getLogger().info( "Initializing " + pluginManager.getId() + " plugin manager." ); + + pluginManager.initializePlugins( mavenHome, mavenLocalHome, rootClassRealm ); } } } 1.5 +29 -2 maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/PluginManagerManager.java Index: PluginManagerManager.java =================================================================== RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/PluginManagerManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PluginManagerManager.java 21 Mar 2004 00:33:17 -0000 1.4 +++ PluginManagerManager.java 2 Apr 2004 18:33:13 -0000 1.5 @@ -17,10 +17,12 @@ */ import org.apache.maven.plugin.descriptor.PluginDescriptor; +import org.apache.maven.plugin.descriptor.GoalDescriptor; import org.apache.maven.plugin.PluginExecutionResponse; import org.apache.maven.project.MavenProject; import java.util.List; +import java.util.Map; /** * @@ -33,8 +35,33 @@ { String ROLE = PluginManagerManager.class.getName(); + // ---------------------------------------------------------------------- + // Plugin execution + // ---------------------------------------------------------------------- + PluginExecutionResponse attainGoal( MavenProject project, String goal ) throws Exception; - void processPluginDescriptor( PluginDescriptor pluginDescriptor ); + // ---------------------------------------------------------------------- + // Plugin processing + // ---------------------------------------------------------------------- + + void processPluginDescriptor( PluginDescriptor pluginDescriptor ) + throws Exception; + + // ---------------------------------------------------------------------- + // Plugin descriptors + // ---------------------------------------------------------------------- + + Map getPluginDescriptors(); + + PluginDescriptor getPluginDescriptor( String pluginId ); + + // ---------------------------------------------------------------------- + // Goal descriptors + // ---------------------------------------------------------------------- + + Map getGoalDescriptors(); + + GoalDescriptor getGoalDescriptor( String goalId ); }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]