You are viewing a plain text version of this content. The canonical link for it is here.
Posted to m2-dev@maven.apache.org by br...@apache.org on 2005/02/08 04:26:06 UTC
cvs commit: maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver ArtifactResolverTest.java
brett 2005/02/07 19:26:06
Modified: maven-core/src/main/java/org/apache/maven/artifact
MavenMetadataSource.java
maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase
DependencyResolutionPhase.java
maven-core/src/main/java/org/apache/maven/plugin
DefaultPluginManager.java
maven-core/src/main/java/org/apache/maven/project
DefaultMavenProjectBuilder.java
maven-artifact/src/main/java/org/apache/maven/artifact/metadata
ArtifactMetadataSource.java
maven-artifact/src/main/java/org/apache/maven/artifact/resolver
DefaultArtifactResolver.java
maven-artifact/src/test/java/org/apache/maven/artifact/resolver
ArtifactResolverTest.java
Log:
cleanup: remove the remote repository list from the MavenMetadataSource as it was only used in retrieve(), and the equivalent list can be passed directly
Revision Changes Path
1.8 +10 -31 maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java
Index: MavenMetadataSource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/artifact/MavenMetadataSource.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MavenMetadataSource.java 4 Feb 2005 04:02:10 -0000 1.7
+++ MavenMetadataSource.java 8 Feb 2005 03:26:05 -0000 1.8
@@ -1,7 +1,7 @@
package org.apache.maven.artifact;
/* ====================================================================
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,13 +23,9 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.model.Dependency;
-//import org.apache.maven.model.Model;
-//import org.apache.maven.model.Parent;
-//import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
-//import java.io.FileReader;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -42,50 +38,39 @@
public class MavenMetadataSource
implements ArtifactMetadataSource
{
-
private MavenProjectBuilder mavenProjectBuilder;
-
-// private MavenXpp3Reader reader = new MavenXpp3Reader();
- private ArtifactRepository localRepository;
-
- private Set remoteRepositories;
+ // private MavenXpp3Reader reader = new MavenXpp3Reader();
+ private ArtifactRepository localRepository;
private ArtifactResolver artifactResolver;
- public MavenMetadataSource( Set remoteRepositories,
- ArtifactRepository localRepository,
+ public MavenMetadataSource( ArtifactRepository localRepository,
ArtifactResolver artifactResolver,
MavenProjectBuilder projectBuilder )
{
this.localRepository = localRepository;
-
this.artifactResolver = artifactResolver;
-
this.mavenProjectBuilder = projectBuilder;
-
- this.remoteRepositories = remoteRepositories;
}
- public Set retrieve( Artifact artifact )
+ public Set retrieve( Artifact artifact, Set remoteRepositories )
throws ArtifactMetadataRetrievalException
{
Set artifacts;
-
Artifact metadataArtifact = new DefaultArtifact( artifact.getGroupId(),
artifact.getArtifactId(),
artifact.getVersion(),
"pom" );
-
try
- {
+ {
artifactResolver.resolve( metadataArtifact, remoteRepositories, localRepository );
// [jdcasey/03-Feb-2005]: Replacing with ProjectBuilder, to enable
// post-processing and inheritance calculation before retrieving the
// associated artifacts. This should improve consistency.
MavenProject project = mavenProjectBuilder.build( metadataArtifact.getFile(), localRepository );
-// Model model = reader.read( new FileReader( metadataArtifact.getFile() ) );
+ // Model model = reader.read( new FileReader( metadataArtifact.getFile() ) );
artifacts = createArtifacts( project.getDependencies(), localRepository );
}
@@ -95,25 +80,21 @@
}
catch ( Exception e )
{
- throw new ArtifactMetadataRetrievalException( "Cannot read artifact source: " + metadataArtifact.getFile(), e );
+ throw new ArtifactMetadataRetrievalException( "Cannot read artifact source: " + metadataArtifact.getFile(),
+ e );
}
-
return artifacts;
}
public Set createArtifacts( List dependencies, ArtifactRepository localRepository )
{
Set projectArtifacts = new HashSet();
-
for ( Iterator i = dependencies.iterator(); i.hasNext(); )
{
Dependency d = (Dependency) i.next();
-
Artifact artifact = createArtifact( d, localRepository );
-
projectArtifacts.add( artifact );
}
-
return projectArtifacts;
}
@@ -123,8 +104,6 @@
dependency.getArtifactId(),
dependency.getVersion(),
dependency.getType() );
-
return artifact;
}
-
}
1.9 +5 -6 maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java
Index: DependencyResolutionPhase.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/goal/phase/DependencyResolutionPhase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DependencyResolutionPhase.java 4 Feb 2005 04:02:10 -0000 1.8
+++ DependencyResolutionPhase.java 8 Feb 2005 03:26:05 -0000 1.9
@@ -71,7 +71,7 @@
throws Exception
{
ArtifactResolver artifactResolver = null;
-
+
MavenProjectBuilder projectBuilder = null;
try
@@ -79,11 +79,10 @@
MavenProject project = context.getProject();
artifactResolver = (ArtifactResolver) context.lookup( ArtifactResolver.ROLE );
-
+
projectBuilder = (MavenProjectBuilder) context.lookup( MavenProjectBuilder.ROLE );
- MavenMetadataSource sourceReader = new MavenMetadataSource( context.getRemoteRepositories(),
- context.getLocalRepository(),
+ MavenMetadataSource sourceReader = new MavenMetadataSource( context.getLocalRepository(),
artifactResolver,
projectBuilder );
@@ -97,7 +96,7 @@
finally
{
context.release( artifactResolver );
-
+
context.release( projectBuilder );
}
}
1.25 +3 -4 maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Index: DefaultPluginManager.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- DefaultPluginManager.java 4 Feb 2005 04:02:10 -0000 1.24
+++ DefaultPluginManager.java 8 Feb 2005 03:26:05 -0000 1.25
@@ -71,7 +71,7 @@
protected Set remotePluginRepositories;
protected ArtifactFilter artifactFilter;
-
+
protected MavenProjectBuilder mavenProjectBuilder;
public DefaultPluginManager()
@@ -211,11 +211,10 @@
throws Exception
{
artifactResolver = (ArtifactResolver) container.lookup( ArtifactResolver.ROLE );
-
+
mavenProjectBuilder = (MavenProjectBuilder) container.lookup( MavenProjectBuilder.ROLE );
- MavenMetadataSource metadataSource = new MavenMetadataSource( remotePluginRepositories,
- session.getLocalRepository(),
+ MavenMetadataSource metadataSource = new MavenMetadataSource( session.getLocalRepository(),
artifactResolver,
mavenProjectBuilder );
1.28 +1 -1 maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Index: DefaultMavenProjectBuilder.java
===================================================================
RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- DefaultMavenProjectBuilder.java 4 Feb 2005 04:02:10 -0000 1.27
+++ DefaultMavenProjectBuilder.java 8 Feb 2005 03:26:05 -0000 1.28
@@ -142,7 +142,7 @@
{
Set repos = RepositoryUtils.mavenToWagon( project.getRepositories() );
- MavenMetadataSource sourceReader = new MavenMetadataSource( repos, localRepository,
+ MavenMetadataSource sourceReader = new MavenMetadataSource( localRepository,
artifactResolver, this );
ArtifactResolutionResult result = artifactResolver.resolveTransitively( project
1.2 +2 -3 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java
Index: ArtifactMetadataSource.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadataSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArtifactMetadataSource.java 9 Aug 2004 18:37:34 -0000 1.1
+++ ArtifactMetadataSource.java 8 Feb 2005 03:26:06 -0000 1.2
@@ -2,7 +2,6 @@
import org.apache.maven.artifact.Artifact;
-import java.io.Reader;
import java.util.Set;
/*
@@ -32,6 +31,6 @@
*/
public interface ArtifactMetadataSource
{
- Set retrieve( Artifact artifact )
+ Set retrieve( Artifact artifact, Set remoteRepositories )
throws ArtifactMetadataRetrievalException;
}
1.8 +2 -2 maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Index: DefaultArtifactResolver.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultArtifactResolver.java 27 Jan 2005 08:09:40 -0000 1.7
+++ DefaultArtifactResolver.java 8 Feb 2005 03:26:06 -0000 1.8
@@ -2,12 +2,12 @@
import org.apache.maven.artifact.AbstractArtifactComponent;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerNotFoundException;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.wagon.TransferFailedException;
import java.util.HashMap;
@@ -227,7 +227,7 @@
try
{
- referencedDependencies = source.retrieve( newArtifact );
+ referencedDependencies = source.retrieve( newArtifact, remoteRepositories );
}
catch ( ArtifactMetadataRetrievalException e )
{
1.5 +6 -11 maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java
Index: ArtifactResolverTest.java
===================================================================
RCS file: /home/cvs/maven-components/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ArtifactResolverTest.java 2 Sep 2004 12:34:17 -0000 1.4
+++ ArtifactResolverTest.java 8 Feb 2005 03:26:06 -0000 1.5
@@ -16,19 +16,14 @@
* limitations under the License.
*/
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactComponentTestCase;
import org.apache.maven.artifact.DefaultArtifact;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
-import java.io.File;
-import java.io.Writer;
-import java.io.FileWriter;
-import java.util.Set;
import java.util.HashSet;
+import java.util.Set;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -142,7 +137,7 @@
ArtifactMetadataSource mds = new ArtifactMetadataSource()
{
- public Set retrieve( Artifact artifact )
+ public Set retrieve( Artifact artifact, Set remoteRepositories )
throws ArtifactMetadataRetrievalException
{
Set dependencies = new HashSet();
@@ -190,7 +185,7 @@
ArtifactMetadataSource mds = new ArtifactMetadataSource()
{
- public Set retrieve( Artifact artifact )
+ public Set retrieve( Artifact artifact, Set remoteRepositories )
throws ArtifactMetadataRetrievalException
{
Set dependencies = new HashSet();