cvs commit: maven-components/maven-project/src/java/org/apache/maven/project DefaultProjectBuilder.java

[jvanzyl]

jvanzyl     2003/12/26 20:37:55

  Modified:    maven-project/src/java/org/apache/maven/project
                        DefaultProjectBuilder.java
  Log:
  o use File not URL
  
  Revision  Changes    Path
  1.21      +7 -20     
maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java
  
  Index: DefaultProjectBuilder.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/DefaultProjectBuilder.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DefaultProjectBuilder.java        10 Dec 2003 05:37:36 -0000      1.20
  +++ DefaultProjectBuilder.java        27 Dec 2003 04:37:55 -0000      1.21
  @@ -1,8 +1,6 @@
   package org.apache.maven.project;
   
  -import org.apache.avalon.framework.service.ServiceException;
  -import org.apache.avalon.framework.service.ServiceManager;
  -import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.maven.artifact.Artifactory;
   import org.apache.maven.model.Model;
   import org.apache.maven.model.ModelMarshaller;
   import org.apache.maven.model.ModelUnmarshaller;
  @@ -27,26 +25,13 @@
    */
   public class DefaultProjectBuilder
       extends AbstractLogEnabled
  -    implements ProjectBuilder, Serviceable
  +    implements ProjectBuilder
   {
  -    /** Project marshaller. */
       private ModelMarshaller marshaller;
   
  -    /** Project unmarshaller. */
       private ModelUnmarshaller unmarshaller;
   
  -    // ----------------------------------------------------------------------
  -    // Lifecylce Management
  -    // ----------------------------------------------------------------------
  -
  -    /** @see org.apache.avalon.framework.service.Serviceable#service */
  -    public void service( ServiceManager serviceManager )
  -        throws ServiceException
  -    {
  -        unmarshaller = (ModelUnmarshaller) serviceManager.lookup( 
ModelUnmarshaller.ROLE );
  -
  -        marshaller = (ModelMarshaller) serviceManager.lookup( ModelMarshaller.ROLE 
);
  -    }
  +    private Artifactory artifactory;
   
       // ----------------------------------------------------------------------
       // Protected methods to be used by the Maven facade.
  @@ -73,7 +58,7 @@
           {
               model = unmarshaller.parse( reader );
   
  -            project.setModelSource( projectDescriptor.toURL() );
  +            project.setFile( projectDescriptor );
   
               project.setModel( model );
   
  @@ -108,7 +93,9 @@
   
           project.setProperties( properties );
   
  -        project.setModelSource( projectDescriptor.toURL() );
  +        project.setFile( projectDescriptor );
  +
  +        project.setArtifacts( artifactory.createArtifacts( project ) );
   
           return project;
       }
  
  
  

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