jvanzyl     2004/04/05 10:18:45

  Modified:    maven-project/src/main/java/org/apache/maven/project
                        DefaultMavenProjectBuilder.java
               maven-project/src/main/resources/META-INF/plexus
                        components.xml
  Log:
  o hook in the artifact collector to the project builder
  
  Revision  Changes    Path
  1.9       +3 -0      
maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
  
  Index: DefaultMavenProjectBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultMavenProjectBuilder.java   4 Apr 2004 17:09:03 -0000       1.8
  +++ DefaultMavenProjectBuilder.java   5 Apr 2004 17:18:44 -0000       1.9
  @@ -17,6 +17,7 @@
    */
   
   import org.apache.maven.artifact.factory.MavenArtifactFactory;
  +import org.apache.maven.artifact.collector.ArtifactCollector;
   import org.apache.maven.model.Dependency;
   import org.apache.maven.model.Model;
   import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
  @@ -53,6 +54,8 @@
       private MavenArtifactFactory artifactory;
   
       private ModelInheritanceAssembler modelInheritanceAssembler;
  +
  +    private ArtifactCollector artifactCollector;
   
       private Model superModel;
   
  
  
  
  1.4       +9 -2      
maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml
  
  Index: components.xml
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- components.xml    4 Apr 2004 17:09:03 -0000       1.3
  +++ components.xml    5 Apr 2004 17:18:45 -0000       1.4
  @@ -11,16 +11,23 @@
             <role>org.apache.maven.model.io.xpp3.MavenXpp3Writer</role>
           </requirement>
           <requirement>
  -          <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
  +          <role>org.apache.maven.project.ModelInheritanceAssembler</role>
           </requirement>
           <requirement>
  -          <role>org.apache.maven.project.ModelInheritanceAssembler</role>
  +          <role>org.apache.maven.artifact.collector.ArtifactCollector</role>
  +        </requirement>
  +        <requirement>
  +          <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
           </requirement>
         </requirements>
       </component>
       <component>
         <role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
         
<implementation>org.apache.maven.artifact.factory.DefaultMavenArtifactFactory</implementation>
  +    </component>
  +    <component>
  +      <role>org.apache.maven.artifact.collector.ArtifactCollector</role>
  +      
<implementation>org.apache.maven.artifact.collector.DefaultArtifactCollector</implementation>
       </component>
       <component>
         <role>org.apache.maven.project.ModelInheritanceAssembler</role>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to