You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by mi...@apache.org on 2004/05/10 21:26:22 UTC
cvs commit: maven-components/maven-project/src/main/java/org/apache/maven/artifact/resolver DefaultArtifactResolver.java
michal 2004/05/10 12:26:22
Modified: maven-project/src/main/java/org/apache/maven/artifact
AbstractMavenArtifact.java
maven-project/src/main/resources/META-INF/plexus
components.xml
maven-project/src/test/java/org/apache/maven/artifact/resolver
DefaultArtifactResolverTest.java
maven-project/src/main/java/org/apache/maven/artifact/factory
MavenArtifactFactory.java
DefaultMavenArtifactFactory.java
maven-project/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
Log:
Fixed failing unit tests. The realtion between artifact factory and artifact is highly bizzare :)
Revision Changes Path
1.6 +1 -1 maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java
Index: AbstractMavenArtifact.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/AbstractMavenArtifact.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMavenArtifact.java 10 May 2004 19:06:29 -0000 1.5
+++ AbstractMavenArtifact.java 10 May 2004 19:26:22 -0000 1.6
@@ -142,7 +142,7 @@
public boolean isSnapshot()
{
- return getDependency().getArtifact().indexOf( "SNAPSHOT" ) > 0;
+ return getDependency().getVersion().indexOf( "SNAPSHOT" ) > 0;
}
public File getFile()
1.9 +1 -1 maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml
Index: components.xml
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/resources/META-INF/plexus/components.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- components.xml 10 May 2004 19:06:29 -0000 1.8
+++ components.xml 10 May 2004 19:26:22 -0000 1.9
@@ -45,7 +45,7 @@
<role>org.apache.maven.artifact.factory.MavenArtifactFactory</role>
</requirement>
<requirement>
- <role>org.apache.maven.artifact.downloader.ArtifactDownloader</role>
+ <role>org.apache.maven.artifact.download.ArtifactDownloader</role>
</requirement>
</requirements>
</component>
1.2 +2 -2 maven-components/maven-project/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
Index: DefaultArtifactResolverTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultArtifactResolverTest.java 8 May 2004 12:19:23 -0000 1.1
+++ DefaultArtifactResolverTest.java 10 May 2004 19:26:22 -0000 1.2
@@ -82,7 +82,7 @@
MavenArtifact a_1 = artifactResolver.getArtifact( dependency, project );
- assertNotNull( "Artifact " + dependency.toString() + " should exists" , a_1 );
+ assertNotNull( "Artifact should exists" , a_1 );
dependency.setType( "foo" );
1.2 +2 -0 maven-components/maven-project/src/main/java/org/apache/maven/artifact/factory/MavenArtifactFactory.java
Index: MavenArtifactFactory.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/factory/MavenArtifactFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MavenArtifactFactory.java 4 Apr 2004 17:20:14 -0000 1.1
+++ MavenArtifactFactory.java 10 May 2004 19:26:22 -0000 1.2
@@ -29,4 +29,6 @@
List createArtifacts( MavenProject project );
MavenArtifact createArtifact( Dependency dependency );
+
+ MavenArtifact createArtifact( Dependency dependency, String localRepository );
}
1.3 +23 -0 maven-components/maven-project/src/main/java/org/apache/maven/artifact/factory/DefaultMavenArtifactFactory.java
Index: DefaultMavenArtifactFactory.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/factory/DefaultMavenArtifactFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultMavenArtifactFactory.java 8 May 2004 12:19:23 -0000 1.2
+++ DefaultMavenArtifactFactory.java 10 May 2004 19:26:22 -0000 1.3
@@ -94,4 +94,27 @@
return new GenericMavenArtifact( dependency );
}
}
+
+ public MavenArtifact createArtifact( Dependency dependency, String mavenRepoLocal )
+ {
+
+ MavenArtifact retValue = null;
+
+ if ( dependency.getType() == null
+ || dependency.getType().trim().length() == 0
+ || dependency.getType().equals( "jar" )
+ || dependency.getType().equals( "test" ) )
+ {
+ dependency.setType( "jar" );
+ retValue = new GenericMavenArtifact( dependency );
+ }
+ else
+ {
+ retValue = new GenericMavenArtifact( dependency );
+ }
+
+ retValue.setPath( mavenRepoLocal + retValue.generatePath() );
+
+ return retValue;
+ }
}
1.3 +5 -3 maven-components/maven-project/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Index: DefaultArtifactResolver.java
===================================================================
RCS file: /home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultArtifactResolver.java 10 May 2004 19:06:29 -0000 1.2
+++ DefaultArtifactResolver.java 10 May 2004 19:26:22 -0000 1.3
@@ -28,7 +28,9 @@
public MavenArtifact getArtifact( Dependency dependency, MavenProject project )
{
- MavenArtifact retValue = artifactFactory.createArtifact( dependency );
+ MavenArtifact retValue = artifactFactory.createArtifact( dependency, project.getLocalRepository() );
+
+ System.out.println( "Checking: " + retValue.getPath() );
if ( retValue.isSnapshot() )
@@ -36,7 +38,7 @@
// for snapshots artifact we always have to try to check if newer version exists
}
- else if ( !retValue.getFile().exists() )
+ else if ( !retValue.exists() )
{
boolean downloaded = artifactDownloader.getRemoteArtifact( retValue, project.getRepositories() );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org