svn commit: r770433 - in /maven/components/branches/MNG-2766: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/project/ maven-model-builder/src/main/java/org/apache/maven/model/processors/

[sisbell]

Author: sisbell
Date: Thu Apr 30 20:26:13 2009
New Revision: 770433

URL: http://svn.apache.org/viewvc?rev=770433&view=rev
Log:
Plugin was picking up default plugin groupId, which was causing resolve of 
plugins to fail.

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    
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/processors/PluginProcessor.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=770433&r1=770432&r2=770433&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Thu Apr 30 20:26:13 2009
@@ -91,7 +91,7 @@
         MavenExecutionResult result = new DefaultMavenExecutionResult();
 
         MavenSession session = createMavenSession( request, result );        
-
+        
         if ( session.getReactorManager().hasMultipleProjects() )
         {
             //logger.info( "Reactor build order: " );

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=770433&r1=770432&r2=770433&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
 Thu Apr 30 20:26:13 2009
@@ -182,7 +182,7 @@
                        ProcessorContext.processManagementNodes(model);
                        
                        project = this.fromDomainModelToMavenProject(model, 
domainModel.getParentFile(), configuration, pomFile);
-               
+                       
                        ArrayList<Plugin> pln = new ArrayList<Plugin>();
                        for(Plugin p : 
project.getModel().getBuild().getPlugins())
                        {
@@ -190,7 +190,7 @@
                                PluginProcessor.copy2(p, copy, true);   
                                pln.add(copy);
                        }
-                       
+               
                        Set<Plugin> pl = 
lifecycle.populateDefaultConfigurationForPlugins(new HashSet<Plugin>(pln), 
                                project, configuration.getLocalRepository());
                        /*
@@ -225,6 +225,7 @@
 
                        }               
                        project.getModel().getBuild().setPlugins(new 
ArrayList<Plugin>(pl));    
+
                } 
                catch (IOException e) 
                {
@@ -252,7 +253,15 @@
         return project;
     }
 
-    
+    private static void printPlugin(Plugin plugin, String tag)
+    {
+       System.out.println(tag + ":" + plugin);
+       System.out.println("CONFIG:" + plugin.getConfiguration());
+       for(PluginExecution pe : plugin.getExecutions())
+       {
+               System.out.println("PE:" + pe.getConfiguration());
+       }
+    }
     
     private static PluginExecution contains(String goal, List<PluginExecution> 
plugins)
     {

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java?rev=770433&r1=770432&r2=770433&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/PluginProcessor.java
 Thu Apr 30 20:26:13 2009
@@ -188,7 +188,7 @@
             target.setArtifactId( source.getArtifactId() );   
         }
         
-        if(target.getGroupId() == null)
+        if(target.getGroupId() == null || 
!source.getGroupId().equals("org.apache.maven.plugins"))
         {
             target.setGroupId( source.getGroupId() );                  
         }
@@ -352,9 +352,10 @@
             }
             else
             {
+               
                 target.setConfiguration( new Xpp3Dom( (Xpp3Dom) 
source.getConfiguration()) );
+                //System.out.println("+++++++++++COPY PE+++++++++++++++++" + 
target.getConfiguration());
             }            
-        }
-      
+        }     
     }
 }