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

[jvanzyl]

jvanzyl     2004/01/03 18:37:36

  Modified:    maven-project/src/java/org/apache/maven/project
                        DefaultProjectBuilder.java
  Log:
  o cleaning up default.properties where i have removed maven.final.name as it
    dependended on POM values in properties which will be a future no-no. The
    standard default value is created as per usual. Left alone if defined.
  
  Revision  Changes    Path
  1.29      +5 -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.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- DefaultProjectBuilder.java        2 Jan 2004 04:49:02 -0000       1.28
  +++ DefaultProjectBuilder.java        4 Jan 2004 02:37:36 -0000       1.29
  @@ -1,12 +1,10 @@
   package org.apache.maven.project;
   
   import org.apache.maven.artifact.Artifactory;
  +import org.apache.maven.model.Dependency;
   import org.apache.maven.model.Model;
   import org.apache.maven.model.ModelMarshaller;
   import org.apache.maven.model.ModelUnmarshaller;
  -import org.apache.maven.model.Dependency;
  -import org.apache.maven.model.Build;
  -import org.apache.maven.model.Resource;
   import org.apache.maven.util.CollectionUtils;
   import org.codehaus.plexus.logging.AbstractLogEnabled;
   import org.codehaus.plexus.util.StringUtils;
  @@ -21,12 +19,12 @@
   import java.io.InputStream;
   import java.io.StringReader;
   import java.io.StringWriter;
  +import java.util.ArrayList;
  +import java.util.HashMap;
   import java.util.Iterator;
  +import java.util.List;
   import java.util.Map;
   import java.util.Properties;
  -import java.util.List;
  -import java.util.HashMap;
  -import java.util.ArrayList;
   
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
  @@ -170,7 +168,7 @@
   
           String mavenFinalName = project.getProperty( "maven.final.name" );
   
  -        if ( mavenFinalName.indexOf( "${" ) >= 0 )
  +        if ( mavenFinalName == null || mavenFinalName.indexOf( "${" ) >= 0 )
           {
               if ( project.getArtifactId() != null )
               {
  
  
  

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