cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin MavenPluginDependency.java MavenPluginDiscoverer.java

[tr...@apache.org]

trygvis     2004/06/26 08:45:58

  Modified:    maven-core/src/main/java/org/apache/maven/plugin
                        MavenPluginDiscoverer.java
  Added:       maven-core/src/main/java/org/apache/maven/plugin
                        MavenPluginDependency.java
  Log:
  o Added reading of the dependencies of a component set.
  
  Revision  Changes    Path
  1.2       +28 -11    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MavenPluginDiscoverer.java	11 Jun 2004 15:11:54 -0000	1.1
  +++ MavenPluginDiscoverer.java	26 Jun 2004 15:45:58 -0000	1.2
  @@ -16,18 +16,22 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.plugin.descriptor.PluginDescriptor;
  -import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
  -import org.apache.maven.plugin.descriptor.MojoDescriptor;
  -import org.codehaus.plexus.component.discovery.AbstractComponentDiscoverer;
  -
   import java.io.Reader;
   import java.util.ArrayList;
  -import java.util.List;
   import java.util.Iterator;
  +import java.util.List;
  +
  +import org.apache.maven.plugin.descriptor.MojoDescriptor;
  +import org.apache.maven.plugin.descriptor.Dependency;
  +import org.apache.maven.plugin.descriptor.PluginDescriptor;
  +import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
  +
  +import org.codehaus.plexus.component.discovery.AbstractComponentDiscoverer;
  +import org.codehaus.plexus.component.repository.ComponentSetDescriptor;
   
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  + * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
    * @version $Id$
    */
   public class MavenPluginDiscoverer
  @@ -50,12 +54,12 @@
           return "maven-plugin";
       }
   
  -    public List createComponentDescriptors( Reader componentDescriptorConfiguration, String source )
  +    public ComponentSetDescriptor createComponentDescriptors( Reader componentDescriptorConfiguration, String source )
           throws Exception
       {
  -        List componentDescriptors = new ArrayList();
  +        ComponentSetDescriptor componentSet = new ComponentSetDescriptor();
   
  -        PluginDescriptor pluginDescriptor = null;
  +        PluginDescriptor pluginDescriptor;
   
           //!! If there is a defective plugin installed should we halt everything or
           // just not process that particular plugin
  @@ -69,11 +73,24 @@
               throw new Exception( "Cannot process plugin descriptor: " + source, e );
           }
   
  +        List dependencies = new ArrayList();
  +
  +        for ( Iterator it = pluginDescriptor.getDependencies().iterator(); it.hasNext() ; )
  +        {
  +            dependencies.add( new MavenPluginDependency( (Dependency) it.next() ) );
  +        }
  +
  +        componentSet.setDependencies( dependencies );
  +
  +        List componentDescriptors = new ArrayList();
  +
           for ( Iterator iterator = pluginDescriptor.getMojos().iterator(); iterator.hasNext(); )
           {
               componentDescriptors.add( new MavenPluginDescriptor( (MojoDescriptor)iterator.next() ) );
           }
   
  -        return componentDescriptors;
  +        componentSet.setComponents( componentDescriptors );
  +
  +        return componentSet;
       }
   }
  
  
  
  1.1                  maven-components/maven-core/src/main/java/org/apache/maven/plugin/MavenPluginDependency.java
  
  Index: MavenPluginDependency.java
  ===================================================================
  package org.apache.maven.plugin;
  
  import org.apache.maven.plugin.descriptor.Dependency;
  
  import org.codehaus.plexus.component.repository.ComponentDependency;
  
  /**
   * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
   * @version $Id: MavenPluginDependency.java,v 1.1 2004/06/26 15:45:58 trygvis Exp $
   */
  public class MavenPluginDependency
      extends ComponentDependency
  {
      public MavenPluginDependency( Dependency dependency )
      {
          setGroupId( dependency.getGroupId() );
  
          setArtifactId( dependency.getArtifactId() );
  
          setType( dependency.getType() );
  
          setVersion( dependency.getVersion() );
      }
  }