cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/plugin DefaultPluginManager.java

[brett]

brett       2005/03/24 01:20:04

  Modified:    maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
  Log:
  fix goal configuration again
  
  Revision  Changes    Path
  1.71      +6 -8      
maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- DefaultPluginManager.java 24 Mar 2005 07:54:34 -0000      1.70
  +++ DefaultPluginManager.java 24 Mar 2005 09:20:04 -0000      1.71
  @@ -669,7 +669,7 @@
           {
               String pluginId = getPluginId( goalId );
   
  -            for ( Iterator iterator = project.getPlugins().iterator(); 
iterator.hasNext() && dom == null; )
  +            for ( Iterator iterator = project.getPlugins().iterator(); 
iterator.hasNext(); )
               {
                   org.apache.maven.model.Plugin plugin = 
(org.apache.maven.model.Plugin) iterator.next();
   
  @@ -683,7 +683,7 @@
                       if ( index >= 0 )
                       {
                           String goalName = goalId.substring( index + 1 );
  -                        for ( Iterator j = plugin.getGoals().iterator(); 
j.hasNext() && dom == null; )
  +                        for ( Iterator j = plugin.getGoals().iterator(); 
j.hasNext(); )
                           {
                               Goal goal = (Goal) j.next();
                               if ( goal.getId().equals( goalName ) )
  @@ -691,16 +691,14 @@
                                   Xpp3Dom goalConfiguration = (Xpp3Dom) 
goal.getConfiguration();
                                   if ( goalConfiguration != null )
                                   {
  -                                    dom =
  -                                        Xpp3DomUtils.mergeXpp3Dom( 
Xpp3DomUtils.copyXpp3Dom( goalConfiguration ), dom );
  -                                }
  -                                else
  -                                {
  -                                    dom = new Xpp3Dom( "configuration" );
  +                                    Xpp3Dom newDom = 
Xpp3DomUtils.copyXpp3Dom( goalConfiguration );
  +                                    dom = Xpp3DomUtils.mergeXpp3Dom( newDom, 
dom );
                                   }
  +                                break;
                               }
                           }
                       }
  +                    break;
                   }
               }
           }