Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Fixed handling of project directory 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@781119 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-06-02 18:47:33 +00:00
parent 753f4897a3
commit 370660ec9a
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
View File

@ -28,6 +28,7 @@ import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.model.Build;
import org.apache.maven.model.FileModelSource;
import org.apache.maven.model.Model;
import org.apache.maven.model.ModelBuilder;
import org.apache.maven.model.ModelBuildingException;
@ -78,10 +79,10 @@ public class DefaultProjectBuilder
public MavenProject build( File pomFile, ProjectBuildingRequest configuration )
throws ProjectBuildingException
{
return build( pomFile, pomFile.getParentFile(), configuration );
return build( pomFile, true, configuration );
}
private MavenProject build( File pomFile, File projectDirectory, ProjectBuildingRequest configuration )
private MavenProject build( File pomFile, boolean localProject, ProjectBuildingRequest configuration )
throws ProjectBuildingException
{
String cacheKey = getCacheKey( pomFile, configuration );
@ -100,7 +101,16 @@ public class DefaultProjectBuilder
ModelBuildingResult result;
try
{
result = modelBuilder.build( pomFile, configuration.getModelBuildingRequest(), resolver );
if ( localProject )
{
result = modelBuilder.build( pomFile, configuration.getModelBuildingRequest(), resolver );
}
else
{
result =
modelBuilder.build( new FileModelSource( pomFile ), configuration.getModelBuildingRequest(),
resolver );
}
}
catch ( ModelBuildingException e )
{
@ -171,7 +181,7 @@ public class DefaultProjectBuilder
throw new ProjectBuildingException( artifact.getId(), "Error resolving project artifact.", e );
}
return build( artifact.getFile(), null, configuration );
return build( artifact.getFile(), false, configuration );
}
/**
@ -238,7 +248,7 @@ public class DefaultProjectBuilder
throws InvalidProjectModelException
{
MavenProject project;
String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() );
try
{
project = new MavenProject( model, repositorySystem, this, config );
@ -247,10 +257,10 @@ public class DefaultProjectBuilder
project.setArtifact( projectArtifact );
project.setParentFile( parentFile );
}
catch ( InvalidRepositoryException e )
{
String projectId = safeVersionlessKey( model.getGroupId(), model.getArtifactId() );
throw new InvalidProjectModelException( projectId, e.getMessage(), projectDescriptor, e );
}