You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/11 02:11:47 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/repository AbstractArtifact.java
jvanzyl 2003/01/10 17:11:46
Modified: src/java/org/apache/maven/project Dependency.java
src/java/org/apache/maven/repository AbstractArtifact.java
Log:
o Was hasty in putting in my code for Michal and forgot all the code
I had changed. To boot I didn't bootstrap. My apologies.
Revision Changes Path
1.29 +4 -3 jakarta-turbine-maven/src/java/org/apache/maven/project/Dependency.java
Index: Dependency.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Dependency.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Dependency.java 10 Jan 2003 15:50:36 -0000 1.28
+++ Dependency.java 11 Jan 2003 01:11:46 -0000 1.29
@@ -170,12 +170,13 @@
*/
public String getArtifactDirectory()
{
- if ( getGroupId() != null )
+ if ( getGroupId() != null
+ && getGroupId().trim().equals("") == false )
{
return getGroupId();
}
- return getId();
+ return getProjectId();
}
/**
1.18 +4 -4 jakarta-turbine-maven/src/java/org/apache/maven/repository/AbstractArtifact.java
Index: AbstractArtifact.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/repository/AbstractArtifact.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractArtifact.java 3 Jan 2003 02:37:04 -0000 1.17
+++ AbstractArtifact.java 11 Jan 2003 01:11:46 -0000 1.18
@@ -123,7 +123,7 @@
/** @see Artifact#generatePath */
public String generatePath()
{
- return ps + getDependency().getGroupId()
+ return ps + getDependency().getArtifactDirectory()
+ ps + getDependency().getType() + "s"
+ ps + getDependency().getArtifact();
}
@@ -131,7 +131,7 @@
/** @see Artifact#getUrlPath */
public String getUrlPath()
{
- return "/" + getDependency().getGroupId()
+ return "/" + getDependency().getArtifactDirectory()
+ "/" + getDependency().getType() + "s"
+ "/" + getDependency().getArtifact();
}
@@ -139,7 +139,7 @@
/** @see Artifact#getChecksumUrl */
public String getChecksumUrl()
{
- return "/" + getDependency().getGroupId()
+ return "/" + getDependency().getArtifactDirectory()
+ "/" + getDependency().getType() + "s"
+ "/" + getDependency().getArtifact()
+ ".md5";