svn commit: r649629 - in /maven/components/trunk: maven-embedder/src/main/java/org/apache/maven/embedder/ maven-project/src/main/java/org/apache/maven/project/

[jdcasey]

Author: jdcasey
Date: Fri Apr 18 11:00:27 2008
New Revision: 649629

URL: http://svn.apache.org/viewvc?rev=649629&view=rev
Log:
Adding ProjectBuilderConfiguration method for buildProjectWithDependencies, 
then switch the embedder.readProject* to use the 
ProjectBuilderConfiguration-enabled methods.

Modified:
    
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.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/project/MavenProjectBuilder.java

Modified: 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=649629&r1=649628&r2=649629&view=diff
==============================================================================
--- 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 (original)
+++ 
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
 Fri Apr 18 11:00:27 2008
@@ -376,7 +376,7 @@
 
         getLogger().debug( "Building MavenProject instance: " + mavenProject );
 
-        return mavenProjectBuilder.build( mavenProject, 
request.getLocalRepository(), request.getProfileManager() );
+        return mavenProjectBuilder.build( mavenProject, 
request.getProjectBuildingConfiguration() );
     }
 
     /**
@@ -450,8 +450,7 @@
         {
             projectBuildingResult = 
mavenProjectBuilder.buildProjectWithDependencies(
                 request.getPom(),
-                request.getLocalRepository(),
-                request.getProfileManager() );
+                request.getProjectBuildingConfiguration() );
         }
         catch ( ProjectBuildingException e )
         {

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=649629&r1=649628&r2=649629&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
 Fri Apr 18 11:00:27 2008
@@ -353,7 +353,17 @@
                                                              ProfileManager 
profileManager )
         throws ProjectBuildingException
     {
-        MavenProject project = build( projectDescriptor, localRepository, 
profileManager );
+        ProjectBuilderConfiguration config = new 
DefaultProjectBuilderConfiguration().setLocalRepository( localRepository )
+                                                                               
      .setGlobalProfileManager( profileManager );
+
+        return buildProjectWithDependencies( projectDescriptor, config );
+    }
+
+    public MavenProjectBuildingResult buildProjectWithDependencies( File 
projectDescriptor,
+                                                                    
ProjectBuilderConfiguration config )
+               throws ProjectBuildingException
+   {
+        MavenProject project = build( projectDescriptor, config );
 
         // 
----------------------------------------------------------------------
         // Typically when the project builder is being used from maven proper
@@ -387,7 +397,7 @@
         ArtifactResolutionRequest request = new ArtifactResolutionRequest()
             .setArtifact( projectArtifact )
             .setArtifactDependencies( project.getDependencyArtifacts() )
-            .setLocalRepository( localRepository )
+            .setLocalRepository( config.getLocalRepository() )
             .setRemoteRepostories( project.getRemoteArtifactRepositories() )
             .setManagedVersionMap( managedVersions )
             .setMetadataSource( artifactMetadataSource );

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=649629&r1=649628&r2=649629&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
 Fri Apr 18 11:00:27 2008
@@ -55,6 +55,14 @@
         throws ProjectBuildingException;
 
     MavenProjectBuildingResult buildProjectWithDependencies( File project,
+                                                             
ProjectBuilderConfiguration config )
+        throws ProjectBuildingException;
+
+
+    /**
+     * @deprecated Use [EMAIL PROTECTED] 
MavenProjectBuilder#buildProjectWithDependencies(File, 
ProjectBuilderConfiguration)} instead.
+     */
+    MavenProjectBuildingResult buildProjectWithDependencies( File project,
                                                              
ArtifactRepository localRepository,
                                                              ProfileManager 
globalProfileManager )
         throws ProjectBuildingException;