maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-components/maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin PluginInstallMojo.java
Date Tue, 15 Mar 2005 02:50:58 GMT
brett       2005/03/14 18:50:58

  Modified:    maven-core/src/main/java/org/apache/maven/lifecycle
                        DefaultLifecycleExecutor.java
               maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
                        MavenPluginDiscoverer.java
  Removed:     maven-artifact/src/main/java/org/apache/maven/artifact/handler
                        TestHandler.java
               maven-plugins/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin
                        PluginInstallMojo.java
  Log:
  some clean up
  
  Revision  Changes    Path
  1.23      +1 -6      maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
  
  Index: DefaultLifecycleExecutor.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- DefaultLifecycleExecutor.java	13 Mar 2005 23:52:43 -0000	1.22
  +++ DefaultLifecycleExecutor.java	15 Mar 2005 02:50:58 -0000	1.23
  @@ -21,9 +21,9 @@
   import org.apache.maven.artifact.resolver.ArtifactResolver;
   import org.apache.maven.execution.MavenExecutionResponse;
   import org.apache.maven.execution.MavenSession;
  +import org.apache.maven.model.Goal;
   import org.apache.maven.model.Plugin;
   import org.apache.maven.model.PluginManagement;
  -import org.apache.maven.model.Goal;
   import org.apache.maven.monitor.event.EventDispatcher;
   import org.apache.maven.monitor.event.MavenEvents;
   import org.apache.maven.plugin.PluginExecutionResponse;
  @@ -85,15 +85,10 @@
           {
               MavenProject project = session.getProject();
               
  -            // TODO: should enrich this with the type artifactHandler, but for now just
  -            // use "type" as is
               ArtifactHandler artifactHandler = artifactHandlerManager.getArtifactHandler(
project.getPackaging() );
   
               if ( artifactHandler != null )
               {
  -                // TODO: perhaps each type should define their own lifecycle
  -                // completely, using the base as a default?
  -                // If so, remove both of these goals from type artifactHandler
                   if ( artifactHandler.packageGoal() != null )
                   {
                       verifyMojoPhase( artifactHandler.packageGoal(), session );
  
  
  
  1.50      +1 -5      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.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- DefaultPluginManager.java	13 Mar 2005 01:45:38 -0000	1.49
  +++ DefaultPluginManager.java	15 Mar 2005 02:50:58 -0000	1.50
  @@ -211,9 +211,6 @@
       {
           if ( !isPluginInstalled( groupId, artifactId ) )
           {
  -            //!! This is entirely crappy. We need a better naming for plugin
  -            // artifact ids and
  -
               ArtifactFactory artifactFactory = null;
               try
               {
  @@ -247,7 +244,7 @@
                       }
                   }
   
  -                // TODO: Default over to a sensible value (is 1.0-SNAPSHOT right?)
  +                // TODO: Default over to a sensible value (is 1.0-SNAPSHOT right?) Hardcoging
of group ID also
                   if ( StringUtils.isEmpty( version ) )
                   {
                       version = "1.0-SNAPSHOT";
  @@ -337,7 +334,6 @@
                   ArtifactResolver artifactResolver = null;
                   MavenProjectBuilder mavenProjectBuilder = null;
   
  -                // TODO: should these be released
                   try
                   {
                       artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE
);
  
  
  
  1.5       +2 -4      maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java
  
  Index: MavenPluginDiscoverer.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDiscoverer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MavenPluginDiscoverer.java	10 Mar 2005 01:35:14 -0000	1.4
  +++ MavenPluginDiscoverer.java	15 Mar 2005 02:50:58 -0000	1.5
  @@ -55,15 +55,13 @@
       {
           PluginDescriptor pluginDescriptor;
   
  -        //!! If there is a defective plugin installed should we halt everything or
  -        // just not process that particular plugin
  -
           try
           {
               pluginDescriptor = builder.build( componentDescriptorConfiguration );
           }
           catch ( Exception e )
           {
  +            // If the plugin is not valid, we cannot continue as it may make the lifecycle
ebhave differently than expected 
               throw new Exception( "Cannot process plugin descriptor: " + source, e );
           }
   
  
  
  

Mime
View raw message