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

o get rid of enableLogging method 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750657 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-03-05 22:53:43 +00:00
parent 57c1ffabe2
commit 8fd147fff0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
View File

@ -131,14 +131,14 @@ public class DefaultMavenProjectBuilder
return build( project, configuration ); return build( project, configuration );
} }
public MavenProject build( File projectDescriptor, ProjectBuilderConfiguration config ) public MavenProject build( File pomFile, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException throws ProjectBuildingException
{ {
MavenProject project = readModelFromLocalPath( "unknown", projectDescriptor, config.getLocalRepository(), config.getRemoteRepositories(), config ); MavenProject project = readModelFromLocalPath( "unknown", pomFile, configuration.getLocalRepository(), configuration.getRemoteRepositories(), configuration );
project.setFile( projectDescriptor ); project.setFile( pomFile );
project = buildWithProfiles( project.getModel(), config, projectDescriptor, project.getParentFile() ); project = buildWithProfiles( project.getModel(), configuration, pomFile, project.getParentFile() );
Build build = project.getBuild(); Build build = project.getBuild();
// NOTE: setting this script-source root before path translation, because // NOTE: setting this script-source root before path translation, because
@ -146,7 +146,7 @@ public class DefaultMavenProjectBuilder
project.addScriptSourceRoot( build.getScriptSourceDirectory() ); project.addScriptSourceRoot( build.getScriptSourceDirectory() );
project.addCompileSourceRoot( build.getSourceDirectory() ); project.addCompileSourceRoot( build.getSourceDirectory() );
project.addTestCompileSourceRoot( build.getTestSourceDirectory() ); project.addTestCompileSourceRoot( build.getTestSourceDirectory() );
project.setFile( projectDescriptor ); project.setFile( pomFile );
setBuildOutputDirectoryOnParent( project ); setBuildOutputDirectoryOnParent( project );
@ -273,11 +273,6 @@ public class DefaultMavenProjectBuilder
return new MavenProjectBuildingResult( project, result ); return new MavenProjectBuildingResult( project, result );
} }
public void enableLogging( Logger logger )
{
this.logger = logger;
}
private MavenProject buildWithProfiles( Model model, ProjectBuilderConfiguration config, File projectDescriptor, File parentDescriptor ) private MavenProject buildWithProfiles( Model model, ProjectBuilderConfiguration config, File projectDescriptor, File parentDescriptor )
throws ProjectBuildingException throws ProjectBuildingException
{ {