You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/05/27 01:21:18 UTC
svn commit: r660334 - in /maven/sandbox/trunk/mercury/src:
main/java/org/apache/maven/mercury/
main/java/org/apache/maven/mercury/metadata/
main/java/org/apache/maven/mercury/retrieve/
test/java/org/apache/maven/mercury/metadata/
Author: jvanzyl
Date: Mon May 26 16:21:13 2008
New Revision: 660334
URL: http://svn.apache.org/viewvc?rev=660334&view=rev
Log: (empty)
Modified:
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java
maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java?rev=660334&r1=660333&r2=660334&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/DefaultArtifact.java Mon May 26 16:21:13 2008
@@ -79,6 +79,7 @@
this.inheritedScope = inheritedScope;
this.groupId = groupId;
this.artifactId = artifactId;
+ this.version = version;
//this.scope = scope;
this.type = type;
this.classifier = classifier;
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java?rev=660334&r1=660333&r2=660334&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/metadata/DefaultMetadataResolver.java Mon May 26 16:21:13 2008
@@ -26,14 +26,14 @@
//------------------------------------------------------------------------
/** @plexus.requirement */
- ArtifactRetriever artifactResolver;
+ ArtifactRetriever retriever;
/** @plexus.requirement */
MetadataSource metadataSource;
public DefaultMetadataResolver( ArtifactRetriever retriever, MetadataSource metadataSource )
{
- this.artifactResolver = artifactResolver;
+ this.retriever = retriever;
this.metadataSource = metadataSource;
}
@@ -60,7 +60,7 @@
ResolutionRequest request = new ResolutionRequest().setArtifact( pomArtifact ).setLocalRepository( localRepository ).setRemoteRepostories( remoteRepositories );
- ResolutionResult result = artifactResolver.retrieve( request );
+ ResolutionResult result = retriever.retrieve( request );
// Here we just need to deal with basic retrieval problems.
if ( result.hasExceptions() )
Modified: maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java?rev=660334&r1=660333&r2=660334&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java (original)
+++ maven/sandbox/trunk/mercury/src/main/java/org/apache/maven/mercury/retrieve/DefaultArtifactRetriever.java Mon May 26 16:21:13 2008
@@ -22,14 +22,12 @@
import java.io.File;
import org.apache.maven.mercury.repository.RemoteRepository;
-import org.apache.maven.mercury.repository.Repository;
import org.apache.maven.mercury.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.mercury.repository.layout.RepositoryLayout;
import org.apache.maven.mercury.spi.http.client.Binding;
import org.apache.maven.mercury.spi.http.client.MercuryException;
import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetrievalRequest;
import org.apache.maven.mercury.spi.http.client.retrieve.DefaultRetriever;
-import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalRequest;
import org.apache.maven.mercury.spi.http.client.retrieve.RetrievalResponse;
import org.apache.maven.mercury.spi.http.client.retrieve.Retriever;
@@ -45,8 +43,6 @@
public ResolutionResult retrieve( ResolutionRequest request )
{
ResolutionResult result = new ResolutionResult();
-
- // Setup the HTTP client
Retriever retriever;
@@ -63,10 +59,11 @@
for ( RemoteRepository remoteRepository : request.getRemoteRepostories() )
{
- RetrievalRequest rr = new DefaultRetrievalRequest();
+ DefaultRetrievalRequest rr = new DefaultRetrievalRequest();
String remoteUrl = remoteRepository.getUrl() + "/" + layout.pathOf( request.getArtifact() );
File localFile = new File( request.getLocalRepository().getDirectory(), layout.pathOf( request.getArtifact() ) );
- Binding binding = new Binding( remoteUrl, localFile, true );
+ Binding binding = new Binding( remoteUrl, localFile, true );
+ rr.addBinding( binding );
RetrievalResponse response = retriever.retrieve( rr );
// Not found versus an error. We need to know for each repository exactly what happened.
Modified: maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java?rev=660334&r1=660333&r2=660334&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java (original)
+++ maven/sandbox/trunk/mercury/src/test/java/org/apache/maven/mercury/metadata/MetadataResolverTest.java Mon May 26 16:21:13 2008
@@ -3,6 +3,8 @@
import java.io.File;
import java.util.Set;
+import junit.framework.TestCase;
+
import org.apache.maven.mercury.Artifact;
import org.apache.maven.mercury.repository.DefaultLocalRepository;
import org.apache.maven.mercury.repository.DefaultRemoteRepository;
@@ -14,14 +16,20 @@
import org.apache.maven.mercury.spi.http.server.SimpleTestServer;
public class MetadataResolverTest
+ extends TestCase
{
protected File localRepositoryDirectory;
+
protected String remoteRepository;
+
protected SimpleTestServer server;
+
protected File workDirectory;
-
+
protected String localPathFragment;
+
protected String remotePathFragment;
+
protected String remoteRepositoryHostUrl;
protected void setUp()
@@ -29,16 +37,16 @@
{
if ( System.getProperty( "basedir" ) != null )
{
- workDirectory = new File( System.getProperty( "basedir"), "target" );
+ workDirectory = new File( System.getProperty( "basedir" ), "target" );
}
else
{
- workDirectory = new File( "", "target" );
+ workDirectory = new File( "", "target" );
}
-
+
localRepositoryDirectory = new File( workDirectory, "repository" );
localPathFragment = "/repo/";
- remotePathFragment = "/repo/";
+ remotePathFragment = "/repo";
remoteRepositoryHostUrl = "http://localhost" + remotePathFragment;
server = new SimpleTestServer( localPathFragment, remotePathFragment );
}
@@ -55,7 +63,7 @@
RepositoryLayout layout = new DefaultRepositoryLayout();
MetadataResolver metadataResolver = new DefaultMetadataResolver( new DefaultArtifactRetriever(), source );
- ArtifactMetadata metadata = new ArtifactMetadata( "a", "a", "1.0" );
+ ArtifactMetadata metadata = new ArtifactMetadata( "a", "a", "1.0", "foo" );
LocalRepository localRepository = new DefaultLocalRepository( "local", layout, localRepositoryDirectory );
RemoteRepository remoteRepository = new DefaultRemoteRepository( "remote", layout, remoteRepositoryHostUrl );
@@ -63,7 +71,7 @@
MetadataResolutionRequest request = new MetadataResolutionRequest().setQuery( metadata ).setLocalRepository( localRepository ).addRemoteRepository( remoteRepository );
// Do we do this in memory, in which case the layout?
-
+
MetadataResolutionResult result = metadataResolver.resolve( request );
}