svn commit: r813616 - in /maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven: execution/DefaultMavenExecutionRequest.java plugin/DefaultPluginManager.java

[jdcasey]

Author: jdcasey
Date: Thu Sep 10 22:07:43 2009
New Revision: 813616

URL: http://svn.apache.org/viewvc?rev=813616&view=rev
Log:
[MNG-4148][MNG-4347] Fixing through-line for the new session-specific metadata 
source, which is set in the execution request, passed into the session through 
that, and eventually used in the plugin manager and the extension manager from 
the session.

Modified:
    
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
    
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=813616&r1=813615&r2=813616&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
 Thu Sep 10 22:07:43 2009
@@ -77,6 +77,9 @@
     
     private List selectedProjects;
 
+    // lazily initialized.
+    private ProjectBuilderConfiguration projectBuilderConfig;
+
     public DefaultMavenExecutionRequest( ArtifactRepository localRepository, 
Settings settings,
                                          EventDispatcher eventDispatcher, List 
goals, String baseDirectory,
                                          ProfileManager globalProfileManager, 
Properties executionProperties,
@@ -215,14 +218,19 @@
 
     public ProjectBuilderConfiguration getProjectBuilderConfiguration()
     {
-        ProjectBuilderConfiguration config = new 
DefaultProjectBuilderConfiguration();
-        config.setLocalRepository( getLocalRepository() )
-              .setGlobalProfileManager( getGlobalProfileManager() )
-              .setExecutionProperties( getExecutionProperties() )
-              .setUserProperties( getUserProperties() )
-              .setBuildStartTime( startTime );
+        if ( projectBuilderConfig == null )
+        {
+            ProjectBuilderConfiguration config = new 
DefaultProjectBuilderConfiguration();
+            config.setLocalRepository( getLocalRepository() )
+                  .setGlobalProfileManager( getGlobalProfileManager() )
+                  .setExecutionProperties( getExecutionProperties() )
+                  .setUserProperties( getUserProperties() )
+                  .setBuildStartTime( startTime );
+            
+            projectBuilderConfig = config;
+        }
 
-        return config;
+        return projectBuilderConfig;
     }
     
     public String getMakeBehavior()

Modified: 
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: 
http://svn.apache.org/viewvc/maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=813616&r1=813615&r2=813616&view=diff
==============================================================================
--- 
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 (original)
+++ 
maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
 Thu Sep 10 22:07:43 2009
@@ -1498,6 +1498,12 @@
         {
             project.resolveActiveArtifacts();
         }
+        
+        ArtifactMetadataSource metadataSource = 
context.getProjectBuilderConfiguration().getMetadataSource();
+        if ( metadataSource == null )
+        {
+            metadataSource = artifactMetadataSource;
+        }
 
         Set resolvedArtifacts;
         try
@@ -1507,7 +1513,7 @@
                                                                                
 project.getManagedVersionMap(),
                                                                                
 context.getLocalRepository(),
                                                                                
 project.getRemoteArtifactRepositories(),
-                                                                               
 artifactMetadataSource, filter );
+                                                                               
 metadataSource, filter );
             resolvedArtifacts = result.getArtifacts();
         }
         catch ( MultipleArtifactsNotFoundException me )