You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2014/01/10 04:54:32 UTC
svn commit: r1557022 - in
/archiva/trunk/archiva-modules/plugins/maven2-repository/src:
main/java/org/apache/archiva/dependency/tree/maven2/
main/java/org/apache/archiva/metadata/repository/storage/maven2/
test/java/org/apache/archiva/metadata/reposito...
Author: olamy
Date: Fri Jan 10 03:54:32 2014
New Revision: 1557022
URL: http://svn.apache.org/r1557022
Log:
cleanup
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java?rev=1557022&r1=1557021&r2=1557022&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java Fri Jan 10 03:54:32 2014
@@ -146,13 +146,14 @@ public class Maven3DependencyTreeBuilder
return;
}
+ List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>();
+ Map<String, NetworkProxy> networkProxies = new HashMap<String, NetworkProxy>();
+
try
{
// MRM-1411
// TODO: this is a workaround for a lack of proxy capability in the resolvers - replace when it can all be
// handled there. It doesn't cache anything locally!
- List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>();
- Map<String, NetworkProxy> networkProxies = new HashMap<String, NetworkProxy>();
Map<String, List<ProxyConnector>> proxyConnectorsMap = proxyConnectorAdmin.getProxyConnectorAsMap();
List<ProxyConnector> proxyConnectors = proxyConnectorsMap.get( repository.getId() );
@@ -179,7 +180,15 @@ public class Maven3DependencyTreeBuilder
}
// FIXME take care of relative path
- resolve( repository.getLocation(), groupId, artifactId, version, dependencyVisitor );
+ ResolveRequest resolveRequest = new ResolveRequest();
+ resolveRequest.dependencyVisitor = dependencyVisitor;
+ resolveRequest.localRepoDir = repository.getLocation();
+ resolveRequest.groupId = groupId;
+ resolveRequest.artifactId = artifactId;
+ resolveRequest.version = version;
+ resolveRequest.remoteRepositories = remoteRepositories;
+ resolveRequest.networkProxies = networkProxies;
+ resolve( resolveRequest );
}
@@ -197,24 +206,39 @@ public class Maven3DependencyTreeBuilder
return treeEntries;
}
+ private static class ResolveRequest
+ {
+ String localRepoDir, groupId, artifactId, version;
+
+ DependencyVisitor dependencyVisitor;
- private void resolve( String localRepoDir, String groupId, String artifactId, String version,
- DependencyVisitor dependencyVisitor )
+ List<RemoteRepository> remoteRepositories;
+
+ Map<String, NetworkProxy> networkProxies;
+
+ }
+
+
+ private void resolve( ResolveRequest resolveRequest )
{
RepositorySystem system = newRepositorySystem();
- RepositorySystemSession session = newRepositorySystemSession( system, localRepoDir );
+ RepositorySystemSession session = newRepositorySystemSession( system, resolveRequest.localRepoDir );
- org.sonatype.aether.artifact.Artifact artifact =
- new DefaultArtifact( groupId + ":" + artifactId + ":" + version );
+ org.sonatype.aether.artifact.Artifact artifact = new DefaultArtifact(
+ resolveRequest.groupId + ":" + resolveRequest.artifactId + ":" + resolveRequest.version );
CollectRequest collectRequest = new CollectRequest();
collectRequest.setRoot( new Dependency( artifact, "" ) );
- // add remote repositories ?
- collectRequest.addRepository( new org.sonatype.aether.repository.RemoteRepository( "fake", "default", "http://maven.apache.org" ) );
-
+ // add remote repositories
+ for ( RemoteRepository remoteRepository : resolveRequest.remoteRepositories )
+ {
+ collectRequest.addRepository(
+ new org.sonatype.aether.repository.RemoteRepository( remoteRepository.getId(), "default",
+ remoteRepository.getUrl() ) );
+ }
collectRequest.setRequestContext( "project" );
//collectRequest.addRepository( repo );
@@ -222,7 +246,7 @@ public class Maven3DependencyTreeBuilder
try
{
CollectResult collectResult = system.collectDependencies( session, collectRequest );
- collectResult.getRoot().accept( dependencyVisitor );
+ collectResult.getRoot().accept( resolveRequest.dependencyVisitor );
log.debug( "test" );
}
catch ( DependencyCollectionException e )
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java?rev=1557022&r1=1557021&r2=1557022&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java Fri Jan 10 03:54:32 2014
@@ -223,7 +223,7 @@ public class Maven2RepositoryStorage
String id = readMetadataRequest.getProjectId() + "-" + artifactVersion + ".pom";
File file =
pathTranslator.toFile( basedir, readMetadataRequest.getNamespace(), readMetadataRequest.getProjectId(),
- artifactVersion, id );
+ readMetadataRequest.getProjectVersion(), id );
if ( !file.exists() )
{
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java?rev=1557022&r1=1557021&r2=1557022&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java Fri Jan 10 03:54:32 2014
@@ -342,7 +342,7 @@ public class Maven2RepositoryMetadataRes
{
ProjectVersionMetadata metadata = storage.readProjectVersionMetadata(
new ReadMetadataRequest( TEST_REPO_ID, "org.apache", "apache", "5-SNAPSHOT" ) );
- MavenProjectFacet facet = (MavenProjectFacet) metadata.getFacet( MavenProjectFacet.FACET_ID );
+ MavenProjectFacet facet = MavenProjectFacet.class.cast( metadata.getFacet( MavenProjectFacet.FACET_ID ) );
assertEquals( "pom", facet.getPackaging() );
assertEquals( "http://www.apache.org/", metadata.getUrl() );
assertNull( facet.getParent() );