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 2002/12/09 07:51:14 UTC
cvs commit: jakarta-turbine-maven/src/java/org/apache/maven/repository AbstractArtifact.java Artifact.java DefaultJarArtifact.java
jvanzyl 2002/12/08 22:51:14
Modified: src/java/org/apache/maven/repository AbstractArtifact.java
Artifact.java DefaultJarArtifact.java
Log:
o Generalized the existence check for all types of artifacts.
Revision Changes Path
1.12 +12 -2 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AbstractArtifact.java 9 Dec 2002 06:11:33 -0000 1.11
+++ AbstractArtifact.java 9 Dec 2002 06:51:14 -0000 1.12
@@ -61,6 +61,7 @@
*/
import org.apache.maven.project.Dependency;
+import org.apache.maven.MavenConstants;
/**
* Base class from which all artifact subclasses are derived.
@@ -135,7 +136,16 @@
/** @see Artifact#exists */
public boolean exists()
{
- return getFile().exists();
+ if ( getFile().exists() == false
+ ||
+ getDependency().getArtifact().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0)
+ {
+ return false;
+ }
+ else
+ {
+ return true;
+ }
}
/** @see Artifact#getFile */
1.11 +6 -1 jakarta-turbine-maven/src/java/org/apache/maven/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/repository/Artifact.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Artifact.java 9 Dec 2002 06:08:57 -0000 1.10
+++ Artifact.java 9 Dec 2002 06:51:14 -0000 1.11
@@ -100,6 +100,11 @@
*/
String getPath();
+ /**
+ * Generate the path for this artifact given its dependency attributes.
+ *
+ * @return The generated path of the artifact based on the dependency attributes.
+ */
String generatePath();
/**
1.14 +4 -20 jakarta-turbine-maven/src/java/org/apache/maven/repository/DefaultJarArtifact.java
Index: DefaultJarArtifact.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/repository/DefaultJarArtifact.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultJarArtifact.java 9 Dec 2002 06:41:06 -0000 1.13
+++ DefaultJarArtifact.java 9 Dec 2002 06:51:14 -0000 1.14
@@ -57,14 +57,12 @@
*/
import org.apache.maven.project.Dependency;
-import org.apache.maven.MavenConstants;
-
-import java.io.File;
/**
* The default JAR artifact type.
*
* @author <a href="jason@zenplex.com">Jason van Zyl</a>
+ *
* @version $Id$
*/
public class DefaultJarArtifact
@@ -77,8 +75,9 @@
}
/**
+ * Generate the path to a JAR artifact.
*
- * @return
+ * @return The path to this JAR artifact.
*/
public String generatePath()
{
@@ -93,20 +92,5 @@
public String getUrlPath()
{
return "/" + getDependency().getGroupId() + "/" + "jars" + "/" + getDependency().getArtifact();
- }
-
- /** @see Artifact#exists */
- public boolean exists()
- {
- if ( getFile().exists() == false
- ||
- getDependency().getArtifact().indexOf( MavenConstants.SNAPSHOT_SIGNIFIER ) > 0)
- {
- return false;
- }
- else
- {
- return true;
- }
}
}