Author: sisbell
Date: Mon Sep 29 21:58:51 2008
New Revision: 700336
URL: http://svn.apache.org/viewvc?rev=700336&view=rev
Log:
Remove repository helper.
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/RepositoryHelper.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
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=700336&r1=700335&r2=700336&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
Mon Sep 29 21:58:51 2008
@@ -93,8 +93,6 @@
private ProjectBuilder projectBuilder;
- private RepositoryHelper repositoryHelper;
-
private Logger logger;
//DO NOT USE, it is here only for backward compatibility reasons. The
existing
@@ -131,7 +129,7 @@
throws ProjectBuildingException
{
MavenProject project = readModelFromLocalPath( "unknown",
projectDescriptor, new PomArtifactResolver(
- config.getLocalRepository(),
repositoryHelper.buildArtifactRepositories(
+ config.getLocalRepository(), buildArtifactRepositories(
getSuperProject( config, projectDescriptor, true ).getModel()
), artifactResolver ), config );
project.setFile( projectDescriptor );
@@ -164,21 +162,29 @@
if ( project != null )
{
return project;
- }
-
- File f = (artifact.getFile() != null) ? artifact.getFile() :
- new File( localRepository.getBasedir(),
localRepository.pathOf( artifact ) );;
- repositoryHelper.findModelFromRepository( artifact,
remoteArtifactRepositories, localRepository );
+ }
+ File originalArtifactFile = artifact.getFile();
+ File f;
+ if ( !"pom".equals( artifact.getType() ) )
+ {
+ Artifact a = artifactFactory.createProjectArtifact(
artifact.getGroupId(), artifact.getArtifactId(),
+
artifact.getVersion(), artifact.getScope() );
+ f = new File( localRepository.getBasedir(),
localRepository.pathOf( a ) );
+ } else
+ {
+ f = (artifact.getFile() != null) ? artifact.getFile() : new File(
localRepository.getBasedir(), localRepository.pathOf( artifact ) );
+ }
ProjectBuilderConfiguration config = new
DefaultProjectBuilderConfiguration().setLocalRepository( localRepository );
List<ArtifactRepository> artifactRepositories = new
ArrayList<ArtifactRepository>( remoteArtifactRepositories );
- artifactRepositories.addAll(
repositoryHelper.buildArtifactRepositories( getSuperProject( config,
artifact.getFile(), false ).getModel() ) );
+ artifactRepositories.addAll( buildArtifactRepositories(
getSuperProject( config, f, false ).getModel() ) );
- project = readModelFromLocalPath( "unknown", artifact.getFile(), new
PomArtifactResolver( config.getLocalRepository(), artifactRepositories,
artifactResolver ), config );
- project = buildInternal( project.getModel(), config,
artifact.getFile(), project.getParentFile(), false );
+ project = readModelFromLocalPath( "unknown", f, new
PomArtifactResolver( config.getLocalRepository(), artifactRepositories,
artifactResolver ), config );
+ project = buildInternal( project.getModel(), config, f,
project.getParentFile(), false );
+
+ artifact.setFile( originalArtifactFile );
- artifact.setFile( f );
project.setVersion( artifact.getVersion() );
hm.put( artifact.getId(), project );
@@ -595,4 +601,20 @@
setBuildOutputDirectoryOnParent( parent );
}
}
+
+ public List buildArtifactRepositories( Model model )
+ throws ProjectBuildingException
+ {
+ try
+ {
+ return mavenTools.buildArtifactRepositories(
model.getRepositories() );
+ }
+ catch ( InvalidRepositoryException e )
+ {
+ String projectId = safeVersionlessKey( model.getGroupId(),
model.getArtifactId() );
+
+ throw new ProjectBuildingException( projectId, e.getMessage(), e );
+ }
+ }
+
}
\ No newline at end of file
Modified:
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=700336&r1=700335&r2=700336&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-project/src/main/resources/META-INF/plexus/components.xml
Mon Sep 29 21:58:51 2008
@@ -88,10 +88,7 @@
<role>org.apache.maven.project.MavenProjectBuilder</role>
<role-hint>default</role-hint>
<implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
+ <requirements>
<requirement>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
@@ -119,27 +116,6 @@
</requirement>
</requirements>
</component>
-
-<!--Eliminate this component after Mercury Integration-->
- <component>
- <role>org.apache.maven.project.RepositoryHelper</role>
-
<implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- </requirements>
- </component>
<!--
|
|
Modified:
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=700336&r1=700335&r2=700336&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
Mon Sep 29 21:58:51 2008
@@ -19,41 +19,6 @@
<plexus>
<components>
-<!--Eliminate this component after Mercury Integration-->
- <component>
- <role>org.apache.maven.project.RepositoryHelper</role>
-
<implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- </requirements>
- </component>
- <!-- Due to PLX-108, have to work around it...
- <component>
- <role>org.apache.maven.artifact.ArtifactResolver</role>
- <implementation>org.apache.maven.project.TestArtifactResolvertion>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- -->
<component>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
@@ -115,9 +80,6 @@
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
Modified:
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=700336&r1=700335&r2=700336&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
(original)
+++
maven/components/trunk/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
Mon Sep 29 21:58:51 2008
@@ -18,41 +18,7 @@
-->
<plexus>
- <components><!--Eliminate this component after Mercury Integration-->
- <component>
- <role>org.apache.maven.project.RepositoryHelper</role>
-
<implementation>org.apache.maven.project.DefaultRepositoryHelper</implementation>
- <requirements>
- <requirement>
- <role>org.apache.maven.profiles.build.ProfileAdvisor</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
- <role-hint>default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.MavenTools</role>
- </requirement>
- </requirements>
- </component>
-
- <!-- Due to PLX-108, have to work around it...
- <component>
- <role>org.apache.maven.artifact.ArtifactResolver</role>
- <implementation>org.apache.maven.project.TestArtifactResolvertion>
- <requirements>
- <requirement>
- <role>org.apache.maven.artifact.manager.WagonManager</role>
- </requirement>
- <requirement>
- <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
- </requirement>
- </requirements>
- </component>
- -->
+ <components>
<component>
<role>org.apache.maven.profiles.injection.ProfileInjector</role>
<role-hint>test</role-hint>
@@ -112,9 +78,6 @@
<implementation>org.apache.maven.project.TestProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.project.RepositoryHelper</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.builder.ProjectBuilder</role>
</requirement>
<requirement>
