Author: jvanzyl
Date: Wed Feb 25 01:27:15 2009
New Revision: 747639
URL: http://svn.apache.org/viewvc?rev=747639&view=rev
Log:
o trim out buildArtifactRepositories( Model )
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.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/repository/LegacyMavenRepositorySystem.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java?rev=747639&r1=747638&r2=747639&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java
Wed Feb 25 01:27:15 2009
@@ -309,7 +309,16 @@
ArtifactResolutionResult result;
- result = artifactCollector.collect( artifacts, originatingArtifact,
managedVersions, localRepository, remoteRepositories, source, filter,
listeners, conflictResolvers );
+ result = artifactCollector.collect(
+ artifacts,
+ originatingArtifact,
+ managedVersions,
+ localRepository,
+ remoteRepositories,
+ source,
+ filter,
+ listeners,
+ conflictResolvers );
// We have collected all the problems so let's mimic the way the old
code worked and just blow up right here.
// That's right lets just let it rip right here and send a big
incomprehensible blob of text at unsuspecting
@@ -391,9 +400,15 @@
// This is an attempt to get the metadata for the artifacts we are
ultimately trying to resolve.
// We still
- ArtifactResolutionResult result = artifactCollector.collect(
artifacts, originatingArtifact,
-
managedVersions, localRepository,
-
remoteRepositories, source, filter, listeners );
+ ArtifactResolutionResult result = artifactCollector.collect(
+ artifacts,
+ originatingArtifact,
+ managedVersions,
+ localRepository,
+ remoteRepositories,
+ source,
+ filter,
+ listeners );
// Let's grab all the repositories that were gleaned. This we should
know up front. I'm not sure
// what the metadata source is doing. Repositories in POMs are deadly.
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=747639&r1=747638&r2=747639&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
Wed Feb 25 01:27:15 2009
@@ -105,30 +105,35 @@
public MavenProject build( File projectDescriptor,
ProjectBuilderConfiguration config )
throws ProjectBuildingException
{
- if(projectDescriptor == null)
+ if ( projectDescriptor == null )
{
- throw new IllegalArgumentException("projectDescriptor: null");
+ throw new IllegalArgumentException( "projectDescriptor: null" );
}
- if(config == null)
+ if ( config == null )
{
- throw new IllegalArgumentException("config: null");
+ throw new IllegalArgumentException( "config: null" );
+ }
+
+ List<ArtifactRepository> artifactRepositories = new
ArrayList<ArtifactRepository>();
+ try
+ {
+ artifactRepositories.addAll(
repositorySystem.buildArtifactRepositories(
projectBuilder.getSuperModel().getRepositories() ) );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ throw new ProjectBuildingException( "Cannot create repositories
from super model.", e.getMessage() );
}
- List<ArtifactRepository> artifactRepositories = new
ArrayList<ArtifactRepository>( );
- artifactRepositories.addAll(
repositorySystem.buildArtifactRepositories( projectBuilder.getSuperModel() ) );
- if(config.getRemoteRepositories() != null)
- {
- artifactRepositories.addAll(config.getRemoteRepositories());
- }
-
- MavenProject project = readModelFromLocalPath( "unknown",
- projectDescriptor,
- new
DefaultPomArtifactResolver( config.getLocalRepository(),
-
artifactRepositories, repositorySystem ), config );
+ if ( config.getRemoteRepositories() != null )
+ {
+ artifactRepositories.addAll( config.getRemoteRepositories() );
+ }
+
+ MavenProject project = readModelFromLocalPath( "unknown",
projectDescriptor, new DefaultPomArtifactResolver( config.getLocalRepository(),
artifactRepositories, repositorySystem ), config );
project.setFile( projectDescriptor );
-
+
project = buildWithProfiles( project.getModel(), config,
projectDescriptor, project.getParentFile(), true );
Build build = project.getBuild();
@@ -176,9 +181,17 @@
if ( project != null )
{
return project;
- }
+ }
+
List<ArtifactRepository> artifactRepositories = new
ArrayList<ArtifactRepository>( remoteArtifactRepositories );
- artifactRepositories.addAll(
repositorySystem.buildArtifactRepositories( projectBuilder.getSuperModel() ) );
+ try
+ {
+ artifactRepositories.addAll(
repositorySystem.buildArtifactRepositories(
projectBuilder.getSuperModel().getRepositories() ) );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ throw new ProjectBuildingException( "Cannot create repositories
from super model.", e.getMessage() );
+ }
File f = (artifact.getFile() != null) ? artifact.getFile() : new File(
localRepository.getBasedir(), localRepository.pathOf( artifact ) );
repositorySystem.findModelFromRepository( artifact,
artifactRepositories, localRepository );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java?rev=747639&r1=747638&r2=747639&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/LegacyMavenRepositorySystem.java
Wed Feb 25 01:27:15 2009
@@ -394,21 +394,6 @@
}
}
- public List<ArtifactRepository> buildArtifactRepositories( Model model )
- throws ProjectBuildingException
- {
- try
- {
- return buildArtifactRepositories( model.getRepositories() );
- }
- catch ( InvalidRepositoryException e )
- {
- String projectId = safeVersionlessKey( model.getGroupId(),
model.getArtifactId() );
-
- throw new ProjectBuildingException( projectId, e.getMessage(), e );
- }
- }
-
private List normalizeToArtifactRepositories( List
remoteArtifactRepositories, String projectId )
throws ProjectBuildingException
{
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java?rev=747639&r1=747638&r2=747639&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/repository/MavenRepositorySystem.java
Wed Feb 25 01:27:15 2009
@@ -75,15 +75,18 @@
// Repository creation
+ // maven model
List<ArtifactRepository> buildArtifactRepositories( List<Repository>
repositories )
throws InvalidRepositoryException;
- ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository
repo )
+ // maven model
+ ArtifactRepository buildDeploymentArtifactRepository( DeploymentRepository
repository )
throws InvalidRepositoryException;
- ArtifactRepository buildArtifactRepository( Repository repo )
+ // maven model
+ ArtifactRepository buildArtifactRepository( Repository repository )
throws InvalidRepositoryException;
-
+
ArtifactRepository createLocalRepository( String url, String repositoryId )
throws IOException;
@@ -91,9 +94,6 @@
ArtifactRepository createRepository( String url, String repositoryId,
ArtifactRepositoryPolicy snapshotsPolicy, ArtifactRepositoryPolicy
releasesPolicy );
- List<ArtifactRepository> buildArtifactRepositories( Model model )
- throws ProjectBuildingException;
-
void setGlobalUpdatePolicy( String policy );
void setGlobalChecksumPolicy( String policy );
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java?rev=747639&r1=747638&r2=747639&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/TestProjectBuilder.java
Wed Feb 25 01:27:15 2009
@@ -31,6 +31,7 @@
@Requirement(hint="test")
private ArtifactResolver artifactResolver;
- @Requirement(hint="test")
- private MavenRepositorySystem repositorySystem;
+ // Causing problems
+ //@Requirement(hint="test")
+ //private MavenRepositorySystem repositorySystem;
}
