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

[jvanzyl]

jvanzyl     2003/12/07 15:11:24

  Modified:    maven-project/src/java/org/apache/maven/project
                        DefaultProjectBuilder.java Project.java
  Log:
  o aligning with changes in maven-model
  
  Revision  Changes    Path
  1.6       +6 -7      
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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultProjectBuilder.java        12 Oct 2003 01:15:17 -0000      1.5
  +++ DefaultProjectBuilder.java        7 Dec 2003 23:11:24 -0000       1.6
  @@ -3,7 +3,6 @@
   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.model.Dependency;
   import org.apache.maven.model.Model;
   import org.apache.maven.model.ModelMarshaller;
   import org.apache.maven.model.ModelUnmarshaller;
  @@ -88,7 +87,7 @@
           {
               model = unmarshaller.parse( reader );
               
  -            model.setFile ( projectDescriptor );
  +            project.setModelSource( projectDescriptor.toURL() );
   
               project.setModel( model );
   
  @@ -113,7 +112,7 @@
           if ( mavenFinalName != null && mavenFinalName.indexOf( "${" ) >= 0 )
           {
               model.getId();
  -            properties.put( "maven.final.name", model.getArtifactId() + "-" + 
model.getCurrentVersion() );
  +            properties.put( "maven.final.name", model.getArtifactId() + "-" + 
model.getVersion() );
           }
   
           // 3)
  @@ -161,9 +160,9 @@
       private void setupModelInheritance( Model child, Model parent )
       {
           // Pom version
  -        if ( child.getPomVersion() == null )
  +        if ( child.getModelVersion() == null )
           {
  -            child.setPomVersion( parent.getPomVersion() );
  +            child.setModelVersion( parent.getModelVersion() );
           }
   
           // Group id
  @@ -185,9 +184,9 @@
           }
   
           // currentVersion
  -        if ( child.getCurrentVersion() == null )
  +        if ( child.getVersion() == null )
           {
  -            child.setCurrentVersion( parent.getCurrentVersion() );
  +            child.setVersion( parent.getVersion() );
           }
   
           // inceptionYear
  
  
  
  1.6       +18 -15    
maven-components/maven-project/src/java/org/apache/maven/project/Project.java
  
  Index: Project.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-project/src/java/org/apache/maven/project/Project.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Project.java      17 Sep 2003 11:31:04 -0000      1.5
  +++ Project.java      7 Dec 2003 23:11:24 -0000       1.6
  @@ -54,19 +54,19 @@
   
       /** Source of the model. */
       private URL modelSource;
  -    
   
  -    /** 
  +
  +    /**
        * @todo where does this belong?
        */
       private List repositories;
   
  -    /** 
  +    /**
        * @todo where does this belong?
        */
       private List artifacts;
   
  -    /** 
  +    /**
        * @todo where does this belong?
        * Rather not here :)
        */
  @@ -166,13 +166,16 @@
       {
           this.modelSource = modelSource;
       }
  -    
  +
       /**
        * Returnn base dir for this project
        */
  -    public File getBasedir( )
  +    public File getBasedir()
       {
  -       return getModel( ).getFile().getParentFile();
  +        // if the url is a file then we can return this.
  +
  +        return null;
  +        //return getModel().getFile().getParentFile();
       }
   
       // ----------------------------------------------------------------------
  @@ -345,12 +348,12 @@
       // pomVersion
       public void setPomVersion( String pomVersion )
       {
  -        getModel().setPomVersion( pomVersion );
  +        getModel().setModelVersion( pomVersion );
       }
   
       public String getPomVersion()
       {
  -        return getInterpolatedModel().getPomVersion();
  +        return getInterpolatedModel().getModelVersion();
       }
   
       // id
  @@ -395,7 +398,7 @@
       // currentVersion
       public void setCurrentVersion( String currentVersion )
       {
  -        getModel().setCurrentVersion( currentVersion );
  +        getModel().setVersion( currentVersion );
       }
   
       public void setInceptionYear( String inceptionYear )
  @@ -468,9 +471,9 @@
           return getInterpolatedModel().getDistributionDirectory();
       }
   
  -    public String getCurrentVersion()
  +    public String getVersion()
       {
  -        return getInterpolatedModel().getCurrentVersion();
  +        return getInterpolatedModel().getVersion();
       }
   
       // shortDescription
  @@ -724,7 +727,7 @@
       {
           getModel().addLicense( license );
       }
  -    
  +
       public void setRepositories( List repositories )
       {
           this.repositories = repositories;
  @@ -746,7 +749,7 @@
           return artifacts;
       }
   
  -   public void setOnline( boolean online )
  +    public void setOnline( boolean online )
       {
           this.online = online;
       }
  
  
  

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