Author: jvanzyl Date: Wed Feb 25 18:10:02 2009 New Revision: 747877 URL: http://svn.apache.org/viewvc?rev=747877&view=rev Log: o adding a separate module for the repository system so that oleg can start a mercury implementation
Added: maven/components/trunk/maven-repository/ maven/components/trunk/maven-repository/src/ maven/components/trunk/maven-repository/src/main/ maven/components/trunk/maven-repository/src/main/java/ maven/components/trunk/maven-repository/src/main/java/org/ maven/components/trunk/maven-repository/src/main/java/org/apache/ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java - copied, changed from r747665, maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java - copied, changed from r747665, maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java Copied: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (from r747665, maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?p2=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java&r1=747665&r2=747877&rev=747877&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original) +++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java Wed Feb 25 18:10:02 2009 @@ -31,7 +31,6 @@ import org.apache.maven.artifact.ArtifactUtils; import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.factory.ArtifactFactory; -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.metadata.ResolutionGroup; @@ -73,6 +72,9 @@ implements MavenRepositorySystem { @Requirement + private Logger logger; + + @Requirement private ArtifactFactory artifactFactory; @Requirement @@ -85,14 +87,8 @@ private ArtifactRepositoryLayout defaultArtifactRepositoryLayout; @Requirement - private WagonManager wagonManager; - - @Requirement private ArtifactMetadataSource artifactMetadataSource; - @Requirement - private Logger logger; - private static HashMap<String, Artifact> cache = new HashMap<String, Artifact>(); // Artifact Creation Copied: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java (from r747665, maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java) URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?p2=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java&p1=maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java&r1=747665&r2=747877&rev=747877&view=diff ============================================================================== --- maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java (original) +++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java Wed Feb 25 18:10:02 2009 @@ -49,6 +49,9 @@ public interface MavenRepositorySystem extends ArtifactMetadataSource // This needs to be removed { + // More then one "local" repository is required, could be layered locals or workspaces + // Remove ResolutionGroup + // Only have one resolve() method // Artifact creation: This needs to be reduced to fewer, if not one, method. Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type ); @@ -68,7 +71,7 @@ Artifact createDependencyArtifact( String groupId, String artifactId, String version, String type, String classifier, String scope, boolean optional ); Artifact createDependencyArtifact( String groupId, String artifactId, String version, String type, String classifier, String scope, String inheritedScope ); - + Set<Artifact> createArtifacts( List<Dependency> dependencies, String inheritedScope, ArtifactFilter dependencyFilter, MavenProject project ) throws InvalidDependencyVersionException; @@ -81,7 +84,8 @@ // maven model ArtifactRepository buildArtifactRepository( Repository repository ) throws InvalidRepositoryException; - + + // Just use a File here ArtifactRepository createLocalRepository( String url, String repositoryId ) throws IOException; @@ -109,14 +113,14 @@ List<ArtifactVersion> retrieveAvailableVersions( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) throws ArtifactMetadataRetrievalException; - + // These are only showing up in tests, not called from anywhere else in the core public List<ArtifactVersion> retrieveAvailableVersionsFromDeploymentRepository( Artifact artifact, ArtifactRepository localRepository, ArtifactRepository remoteRepository ) throws ArtifactMetadataRetrievalException; public Artifact retrieveRelocatedArtifact( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) throws ArtifactMetadataRetrievalException; - + // Mirrors ArtifactRepository getMirrorRepository( ArtifactRepository repository ); @@ -130,11 +134,11 @@ void addMirror( String id, String mirrorOf, String url ); // Network enablement - + void setOnline( boolean online ); boolean isOnline(); - + // This doesn't belong here void setInteractive( boolean interactive );