maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject cvs commit: maven-components/maven-mboot2/src/main/java MBoot.java
Date Wed, 02 Mar 2005 13:40:00 GMT
evenisse    2005/03/02 05:40:00

  Modified:    maven-mboot2/src/main/java MBoot.java
  Log:
  Fix artifact download for artifact type different of jar
  
  Revision  Changes    Path
  1.53      +15 -3     maven-components/maven-mboot2/src/main/java/MBoot.java
  
  Index: MBoot.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-mboot2/src/main/java/MBoot.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- MBoot.java	28 Feb 2005 18:29:47 -0000	1.52
  +++ MBoot.java	2 Mar 2005 13:40:00 -0000	1.53
  @@ -937,7 +937,7 @@
   
       private String getArtifactPath( Dependency d, String pathSeparator )
       {
  -        return d.getArtifactDirectory() + pathSeparator + "jars" + pathSeparator + d.getArtifact();
  +        return d.getArtifactDirectory() + pathSeparator + d.getType() + "s" + pathSeparator
+ d.getArtifact();
       }
   
       class ModelReader
  @@ -1344,14 +1344,26 @@
                   return jar;
               }
   
  +            String artifact;
  +
               if ( isValid( getArtifactId() ) )
               {
  -                return getArtifactId() + "-" + getVersion() + "." + getType();
  +                artifact = getArtifactId() + "-" + getVersion() + ".";
  +            }
  +            else
  +            {
  +                artifact = getId() + "-" + getVersion() + ".";
  +            }
  +
  +            if ( "jar".equals( getType() ) || "plugin".equals( getType() ) )
  +            {
  +                artifact += "jar";
               }
               else
               {
  -                return getId() + "-" + getVersion() + "." + getType();
  +                artifact += getType();
               }
  +            return artifact;
           }
   
           public void setVersion( String version )
  
  
  

Mime
View raw message