svn commit: r769934 - in /maven/components/branches/MNG-2766: maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java

[si...@apache.org]

Author: sisbell
Date: Wed Apr 29 21:10:03 2009
New Revision: 769934

URL: http://svn.apache.org/viewvc?rev=769934&view=rev
Log:
Checking in work on populating plugins configs. Some problem with finding wagon for http protocol is causing build to fail.

Modified:
    maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java

Modified: maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=769934&r1=769933&r2=769934&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Apr 29 21:10:03 2009
@@ -22,9 +22,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
@@ -34,11 +36,13 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 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.DomainModel;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.ModelEventListener;
+import org.apache.maven.model.Plugin;
 import org.apache.maven.model.ProcessorContext;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.interpolator.Interpolator;
@@ -87,6 +91,13 @@
     @Requirement
     private ResolutionErrorHandler resolutionErrorHandler;    
 
+    //DO NOT USE, it is here only for backward compatibility reasons. The existing
+    // maven-assembly-plugin (2.2-beta-1) is accessing it via reflection.
+
+    // the aspect weaving seems not to work for reflection from plugin.
+
+    private Map processedProjectCache = new HashMap();
+
     private static HashMap<String, MavenProject> hm = new HashMap<String, MavenProject>();
 
     private MavenProject superProject;
@@ -161,15 +172,28 @@
         
         //Interpolation & Management
         MavenProject project;
-		try {
+		try 
+		{		
 			Model model = interpolateDomainModel( domainModel, configuration, pomFile );
-			ProcessorContext.addPluginsToModel(model, lifecycle.getPluginsBoundByDefaultToAllLifecycles(model.getPackaging()));
-			
+			Set<Plugin> plugins = lifecycle.getPluginsBoundByDefaultToAllLifecycles(model.getPackaging());
+			ProcessorContext.addPluginsToModel(model, plugins);			
 			ProcessorContext.processManagementNodes(model);
 			project = this.fromDomainModelToMavenProject(model, domainModel.getParentFile(), configuration, pomFile);
-		} catch (IOException e) {
+				
+			plugins = lifecycle.populateDefaultConfigurationForPlugins(new HashSet<Plugin>(model.getBuild().getPlugins()), 
+				project, configuration.getLocalRepository());
+
+			project.getModel().getBuild().setPlugins(new ArrayList<Plugin>(plugins));
+		} 
+		catch (IOException e) 
+		{
 			throw new ProjectBuildingException("", "");
 		}
+		catch (LifecycleExecutionException e) 
+		{
+			e.printStackTrace();
+			throw new ProjectBuildingException("",e.getMessage());
+		}
 		
         project.setActiveProfiles( projectProfiles );
          
@@ -184,7 +208,7 @@
         setBuildOutputDirectoryOnParent( project );
 
         hm.put( ArtifactUtils.artifactId( project.getGroupId(), project.getArtifactId(), "pom", project.getVersion() ), project );
-   
+        
         return project;
     }
     

Modified: maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java?rev=769934&r1=769933&r2=769934&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java (original)
+++ maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/ProcessorContext.java Wed Apr 29 21:10:03 2009
@@ -275,7 +275,6 @@
     	{
     		if( !containsPlugin( p, mPlugins) )
     		{
-    			p.setConfiguration(null);
     			lifecyclePlugins.add(p);
     		}
     	}