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 2009/03/07 06:08:46 UTC
svn commit: r751196 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/plugin/
maven-embedder/src/main/java/org/apache/maven/embedder/
maven-embedder/src/main/java/org/apache/maven/embedder/execution/
maven-project/src/main/java/or...
Author: jvanzyl
Date: Sat Mar 7 05:08:43 2009
New Revision: 751196
URL: http://svn.apache.org/viewvc?rev=751196&view=rev
Log:
o shortening the interface name for the repository system
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
- copied, changed from r751159, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
- copied, changed from r751159, maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Removed:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sat Mar 7 05:08:43 2009
@@ -79,7 +79,7 @@
import org.apache.maven.realm.RealmManagementException;
import org.apache.maven.realm.RealmScanningUtils;
import org.apache.maven.reporting.MavenReport;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.VersionNotFoundException;
import org.apache.maven.shared.model.InterpolatorProperty;
import org.apache.maven.shared.model.ModelMarshaller;
@@ -139,7 +139,7 @@
protected MavenPluginCollector pluginCollector;
@Requirement
- protected MavenRepositorySystem repositorySystem;
+ protected RepositorySystem repositorySystem;
@Requirement
private ResolutionErrorHandler resolutionErrorHandler;
@@ -1327,7 +1327,7 @@
// Artifact resolution
// ----------------------------------------------------------------------
- protected void resolveTransitiveDependencies( MavenSession context, MavenRepositorySystem repositorySystem, String scope, MavenProject project, boolean isAggregator )
+ protected void resolveTransitiveDependencies( MavenSession context, RepositorySystem repositorySystem, String scope, MavenProject project, boolean isAggregator )
throws ArtifactResolutionException, ArtifactNotFoundException, InvalidDependencyVersionException
{
// TODO: such a call in MavenMetadataSource too - packaging not really the intention of type
@@ -1430,7 +1430,7 @@
// Artifact downloading
// ----------------------------------------------------------------------
- private void downloadDependencies( MavenProject project, MavenSession context, MavenRepositorySystem repositorySystem )
+ private void downloadDependencies( MavenProject project, MavenSession context, RepositorySystem repositorySystem )
throws ArtifactResolutionException, ArtifactNotFoundException
{
ArtifactRepository localRepository = context.getLocalRepository();
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sat Mar 7 05:08:43 2009
@@ -64,7 +64,7 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
@@ -127,7 +127,7 @@
private MavenProjectBuilder mavenProjectBuilder;
- private MavenRepositorySystem repositorySystem;
+ private RepositorySystem repositorySystem;
private MavenXpp3Reader modelReader;
@@ -540,7 +540,7 @@
populator = container.lookup( MavenExecutionRequestPopulator.class );
- repositorySystem = container.lookup( MavenRepositorySystem.class );
+ repositorySystem = container.lookup( RepositorySystem.class );
// This is temporary as we can probably cache a single request and use it for default values and
// simply cascade values in from requests used for individual executions.
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Sat Mar 7 05:08:43 2009
@@ -40,7 +40,7 @@
import org.apache.maven.profiles.ProfileActivationContext;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.realm.DefaultMavenRealmManager;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
@@ -75,7 +75,7 @@
private MavenSettingsBuilder settingsBuilder;
@Requirement
- private MavenRepositorySystem repositorySystem;
+ private RepositorySystem repositorySystem;
// 2009-03-05 Oleg: this component is defined sub-classed in this package
@Requirement(hint = "maven")
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Sat Mar 7 05:08:43 2009
@@ -61,7 +61,7 @@
import org.apache.maven.project.builder.profile.ProfileContext;
import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.VersionNotFoundException;
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.InterpolatorProperty;
@@ -97,7 +97,7 @@
private ModelValidator validator;
@Requirement
- private MavenRepositorySystem repositorySystem;
+ private RepositorySystem repositorySystem;
@Requirement
private PlexusContainer container;
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Sat Mar 7 05:08:43 2009
@@ -69,7 +69,7 @@
import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
import org.apache.maven.project.artifact.ActiveProjectArtifact;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.MavenRepositoryWrapper;
import org.apache.maven.repository.VersionNotFoundException;
import org.codehaus.plexus.util.StringUtils;
@@ -165,7 +165,7 @@
private ProjectBuilderConfiguration projectBuilderConfiguration;
- private MavenRepositorySystem repositorySystem;
+ private RepositorySystem repositorySystem;
//
private File parentFile;
@@ -210,7 +210,7 @@
* @param projectBuilderConfiguration
* @throws InvalidRepositoryException
*/
- public MavenProject( Model model, MavenRepositorySystem repositorySystem, MavenProjectBuilder mavenProjectBuilder, ProjectBuilderConfiguration projectBuilderConfiguration )
+ public MavenProject( Model model, RepositorySystem repositorySystem, MavenProjectBuilder mavenProjectBuilder, ProjectBuilderConfiguration projectBuilderConfiguration )
throws InvalidRepositoryException
{
if ( model == null )
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java Sat Mar 7 05:08:43 2009
@@ -48,7 +48,7 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.validation.ModelValidationResult;
-import org.apache.maven.repository.LegacyMavenRepositorySystem;
+import org.apache.maven.repository.LegacyRepositorySystem;
import org.apache.maven.repository.VersionNotFoundException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
@@ -459,7 +459,7 @@
{
try
{
- return LegacyMavenRepositorySystem.createArtifacts( artifactFactory, dependencies, inheritedScope,
+ return LegacyRepositorySystem.createArtifacts( artifactFactory, dependencies, inheritedScope,
dependencyFilter, project );
}
catch ( VersionNotFoundException e )
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Sat Mar 7 05:08:43 2009
@@ -20,24 +20,25 @@
*/
import java.io.File;
-import java.io.IOException;
import java.io.FileInputStream;
-import java.util.*;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
-import org.apache.maven.profiles.DefaultProfileManager;
-import org.apache.maven.profiles.ProfileActivationContext;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.profiles.DefaultProfileManager;
+import org.apache.maven.profiles.ProfileActivationContext;
import org.apache.maven.project.harness.PomTestWrapper;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
public class PomConstructionTest
extends PlexusTestCase
{
-
private static String BASE_DIR = "src/test";
private static String BASE_POM_DIR = BASE_DIR + "/resources-project-builder";
@@ -46,6 +47,8 @@
private DefaultMavenProjectBuilder mavenProjectBuilder;
+ private RepositorySystem mavenTools;
+
private File testDirectory;
private File testMixinDirectory;
@@ -56,6 +59,7 @@
testDirectory = new File( getBasedir(), BASE_POM_DIR );
testMixinDirectory = new File( getBasedir(), BASE_MIXIN_DIR );
mavenProjectBuilder = (DefaultMavenProjectBuilder) lookup( MavenProjectBuilder.class );
+ mavenTools = lookup( RepositorySystem.class );
}
/**
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestMavenRepositorySystem.java Sat Mar 7 05:08:43 2009
@@ -13,16 +13,16 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.repository.LegacyMavenRepositorySystem;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.LegacyRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.VersionNotFoundException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-@Component(role = MavenRepositorySystem.class, hint = "test")
+@Component(role = RepositorySystem.class, hint = "test")
public class TestMavenRepositorySystem
- extends LegacyMavenRepositorySystem
+ extends LegacyRepositorySystem
{
public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws ArtifactMetadataRetrievalException
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java Sat Mar 7 05:08:43 2009
@@ -29,7 +29,7 @@
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import java.util.ArrayList;
@@ -41,13 +41,13 @@
public class MavenMetadataSourceTest
extends PlexusTestCase
{
- private MavenRepositorySystem repositorySystem;
+ private RepositorySystem repositorySystem;
protected void setUp()
throws Exception
{
super.setUp();
- repositorySystem = lookup( MavenRepositorySystem.class );
+ repositorySystem = lookup( RepositorySystem.class );
}
public void testShouldNotCarryExclusionsOverFromDependencyToDependency()
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java Sat Mar 7 05:08:43 2009
@@ -37,7 +37,7 @@
{
super.setUp();
- _mrs = getContainer().lookup( MavenRepositorySystem.class, "default" );
+ _mrs = getContainer().lookup( RepositorySystem.class, "default" );
}
// TODO: 2009-03-Oleg : turned it off till we figure out which methods work, which don't
Modified: maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java Sat Mar 7 05:08:43 2009
@@ -31,8 +31,8 @@
import org.apache.maven.mercury.repository.api.Repository;
import org.apache.maven.mercury.repository.api.RepositoryException;
import org.apache.maven.mercury.util.Util;
-import org.apache.maven.repository.LegacyMavenRepositorySystem;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
+import org.apache.maven.repository.LegacyRepositorySystem;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.lang.DefaultLanguage;
@@ -42,10 +42,10 @@
* @author Oleg Gusakov
* @version $Id$
*/
-@Component( role = MavenRepositorySystem.class, hint = "mercury" )
+@Component( role = RepositorySystem.class, hint = "mercury" )
public class MercuryRepositorySystem
- extends LegacyMavenRepositorySystem
- implements MavenRepositorySystem
+ extends LegacyRepositorySystem
+ implements RepositorySystem
{
private static final Language LANG = new DefaultLanguage( MercuryRepositorySystem.class );
Modified: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java Sat Mar 7 05:08:43 2009
@@ -26,7 +26,7 @@
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.Repository;
import org.apache.maven.model.RepositoryPolicy;
-import org.apache.maven.repository.MavenRepositorySystem;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
@@ -38,7 +38,7 @@
public final class ProjectUtils
{
- static MavenRepositorySystem rs;
+ static RepositorySystem rs;
private ProjectUtils()
{
@@ -72,11 +72,11 @@
return rs( c ).buildArtifactRepository( repo );
}
- private static MavenRepositorySystem rs( PlexusContainer c )
+ private static RepositorySystem rs( PlexusContainer c )
{
try
{
- rs = c.lookup( MavenRepositorySystem.class );
+ rs = c.lookup( RepositorySystem.class );
}
catch ( ComponentLookupException e )
{
Copied: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java (from r751159, maven/components/trunk/maven-repository/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/LegacyRepositorySystem.java?p2=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java&p1=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java&r1=751159&r2=751196&rev=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java Sat Mar 7 05:08:43 2009
@@ -59,9 +59,9 @@
/**
* @author Jason van Zyl
*/
-@Component(role = MavenRepositorySystem.class)
-public class LegacyMavenRepositorySystem
- implements MavenRepositorySystem
+@Component(role = RepositorySystem.class)
+public class LegacyRepositorySystem
+ implements RepositorySystem
{
@Requirement
Copied: maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java (from r751159, maven/components/trunk/maven-repository/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/RepositorySystem.java?p2=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java&p1=maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java&r1=751159&r2=751196&rev=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java (original)
+++ maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java Sat Mar 7 05:08:43 2009
@@ -39,7 +39,7 @@
/**
* @author Jason van Zyl
*/
-public interface MavenRepositorySystem
+public interface RepositorySystem
{
Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type );
@@ -83,7 +83,6 @@
// Mirrors
- void addMirror( String id, String mirrorOf, String url );
-
+ void addMirror( String id, String mirrorOf, String url );
List<ArtifactRepository> getMirrors( List<ArtifactRepository> repositories );
}
Modified: maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java?rev=751196&r1=751195&r2=751196&view=diff
==============================================================================
--- maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java (original)
+++ maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java Sat Mar 7 05:08:43 2009
@@ -64,7 +64,7 @@
ArtifactFactory _artifactFactory;
- protected MavenRepositorySystem _mrs;
+ protected RepositorySystem _mrs;
protected Startable _server;