Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-03-08 17:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

o locate all repository related constants into the RepositorySystem

Browse Source 
o add a method to the RepositorySystem for creating the default local repository
o make the test utils for the lifecycle executor use the createDefaultLocalRepository method to decouple from my home directory



git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@757464 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-23 17:38:44 +00:00
parent 881bebd552
commit ecf09e66f5
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
View File

@ -163,17 +163,10 @@ protected void customizeContainerConfiguration( ContainerConfiguration container
containerConfiguration.addComponentDiscoveryListener( new MavenPluginCollector() );
}
//!!jvz The repository system needs to know about the defaults for Maven, it's tied up in the embedder right now.
protected ArtifactRepository getLocalRepository()
throws InvalidRepositoryException
{
return repositorySystem.createLocalRepository( new File( "/Users/jvanzyl/.m2/repository" ) );
}
protected MavenSession createMavenSession( File pom )
throws Exception
{
ArtifactRepository localRepository = getLocalRepository();
ArtifactRepository localRepository = repositorySystem.createDefaultLocalRepository();
Repository repository = new Repository();
repository.setUrl( "http://repo1.maven.org/maven2" );

8
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -81,14 +81,10 @@
*/
public class MavenEmbedder
{
public static final String DEFAULT_LOCAL_REPO_ID = "local";
public static final String userHome = System.getProperty( "user.home" );
public static final File userMavenConfigurationHome = new File( userHome, ".m2" );
public static final File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
public static final File DEFAULT_USER_SETTINGS_FILE = new File( userMavenConfigurationHome, "settings.xml" );
public static final File DEFAULT_GLOBAL_SETTINGS_FILE =
@ -110,8 +106,6 @@ public class MavenEmbedder
private MavenProjectBuilder mavenProjectBuilder;
private RepositorySystem repositorySystem;
private MavenXpp3Reader modelReader;
private MavenXpp3Writer modelWriter;
@ -458,7 +452,7 @@ private void start( Configuration configuration )
populator = container.lookup( MavenExecutionRequestPopulator.class );
repositorySystem = container.lookup( RepositorySystem.class );
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.

5
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -27,7 +27,6 @@
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.embedder.Configuration;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.model.Profile;
@ -412,12 +411,12 @@ public ArtifactRepository createLocalRepository( MavenExecutionRequest request,
if ( StringUtils.isEmpty( localRepositoryPath ) )
{
localRepositoryPath = MavenEmbedder.defaultUserLocalRepository.getAbsolutePath();
localRepositoryPath = RepositorySystem.defaultUserLocalRepository.getAbsolutePath();
}
try
{
return repositorySystem.createLocalRepository( localRepositoryPath, MavenEmbedder.DEFAULT_LOCAL_REPO_ID );
return repositorySystem.createLocalRepository( localRepositoryPath, RepositorySystem.DEFAULT_LOCAL_REPO_ID );
}
catch ( IOException e )
{

7
maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
View File

@ -64,7 +64,6 @@
public class LegacyRepositorySystem
implements RepositorySystem
{
@Requirement
private WagonManager wagonManager;
@ -318,6 +317,12 @@ public ArtifactRepositoryPolicy buildArtifactRepositoryPolicy( RepositoryPolicy
// From MavenExecutionRequestPopulator
public ArtifactRepository createDefaultLocalRepository()
throws InvalidRepositoryException
{
return createLocalRepository( RepositorySystem.defaultUserLocalRepository );
}
public ArtifactRepository createLocalRepository( File localRepository )
throws InvalidRepositoryException
{

11
maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
View File

@ -42,6 +42,14 @@
*/
public interface RepositorySystem
{
static final String DEFAULT_LOCAL_REPO_ID = "local";
static final String userHome = System.getProperty( "user.home" );
static final File userMavenConfigurationHome = new File( userHome, ".m2" );
static final File defaultUserLocalRepository = new File( userMavenConfigurationHome, "repository" );
Artifact createArtifact( String groupId, String artifactId, String version, String scope, String type );
Artifact createProjectArtifact( String groupId, String artifactId, String metaVersionId );
@ -66,6 +74,9 @@ ArtifactRepository buildArtifactRepository( Repository repository )
ArtifactRepository createLocalRepository( String url, String repositoryId )
throws IOException;
ArtifactRepository createDefaultLocalRepository()
throws InvalidRepositoryException;
ArtifactRepository createLocalRepository( File localRepository )
throws InvalidRepositoryException;