Author: jvanzyl
Date: Mon Dec 15 21:19:39 2008
New Revision: 726961
URL: http://svn.apache.org/viewvc?rev=726961&view=rev
Log:
o passing in the file, we don't need the parent directory
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java?rev=726961&r1=726960&r2=726961&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
Mon Dec 15 21:19:39 2008
@@ -34,10 +34,11 @@
*/
public interface ProjectBuilder
{
- public PomClassicDomainModel buildModel( File pom, List<Model>
inheritedModels,
+ public PomClassicDomainModel buildModel( File pom,
+ List<Model> inheritedModels,
Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- PomArtifactResolver resolver,
File projectDirectory,
+ PomArtifactResolver resolver,
ProjectBuilderConfiguration
projectBuilderConfiguration )
throws IOException;
@@ -53,9 +54,11 @@
* @return a maven project for the specified input stream
* @throws IOException if there is a problem in the construction of the
maven project
*/
- MavenProject buildFromLocalPath( File pom, List<Model> inheritedModels,
Collection<ImportModel> importModels,
+ MavenProject buildFromLocalPath( File pom,
+ List<Model> inheritedModels,
+ Collection<ImportModel> importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- PomArtifactResolver resolver, File
baseDirectory,
+ PomArtifactResolver resolver,
ProjectBuilderConfiguration
projectBuilderConfiguration )
throws IOException;
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=726961&r1=726960&r2=726961&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Mon Dec 15 21:19:39 2008
@@ -42,7 +42,6 @@
import org.apache.maven.project.builder.PomClassicDomainModelFactory;
import org.apache.maven.project.builder.PomClassicTransformer;
import org.apache.maven.project.builder.ProjectBuilder;
-import org.apache.maven.project.validation.ModelValidationResult;
import org.apache.maven.project.validation.ModelValidator;
import org.apache.maven.shared.model.DomainModel;
import org.apache.maven.shared.model.ImportModel;
@@ -82,7 +81,7 @@
public PomClassicDomainModel buildModel( File pom, List<Model>
inheritedModels,
Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- PomArtifactResolver resolver,
File projectDirectory,
+ PomArtifactResolver resolver,
ProjectBuilderConfiguration
projectBuilderConfiguration )
throws IOException
{
@@ -96,11 +95,6 @@
throw new IllegalArgumentException( "resolver: null" );
}
- if ( projectDirectory == null )
- {
- throw new IllegalArgumentException( "projectDirectory: null" );
- }
-
if ( inheritedModels == null )
{
inheritedModels = new ArrayList<Model>();
@@ -122,7 +116,7 @@
}
PomClassicDomainModel domainModel = new PomClassicDomainModel( pom );
- domainModel.setProjectDirectory( projectDirectory );
+ domainModel.setProjectDirectory( pom.getParentFile() );
List<DomainModel> domainModels = new ArrayList<DomainModel>();
domainModels.add( domainModel );
@@ -131,9 +125,9 @@
if ( domainModel.getModel().getParent() != null )
{
List<DomainModel> mavenParents;
- if ( isParentLocal( domainModel.getModel().getParent(),
projectDirectory ) )
+ if ( isParentLocal( domainModel.getModel().getParent(),
pom.getParentFile() ) )
{
- mavenParents = getDomainModelParentsFromLocalPath(
domainModel, resolver, projectDirectory );
+ mavenParents = getDomainModelParentsFromLocalPath(
domainModel, resolver, pom.getParentFile() );
}
else
{
@@ -174,7 +168,7 @@
public MavenProject buildFromLocalPath( File pom, List<Model>
inheritedModels,
Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
- PomArtifactResolver resolver, File
projectDirectory,
+ PomArtifactResolver resolver,
ProjectBuilderConfiguration
projectBuilderConfiguration )
throws IOException
{
@@ -183,7 +177,6 @@
importModels,
interpolatorProperties,
resolver,
- projectDirectory,
projectBuilderConfiguration );
try
