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

[jvanzyl]

jvanzyl     2004/03/23 15:44:59

  Modified:    maven-core/src/main/java/org/apache/maven/plugin/manager
                        DefaultPluginManagerManager.java
  Log:
  o separating the creation of the component manager
  
  Revision  Changes    Path
  1.6       +10 -1     
maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java
  
  Index: DefaultPluginManagerManager.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/manager/DefaultPluginManagerManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultPluginManagerManager.java  21 Mar 2004 00:33:17 -0000      1.5
  +++ DefaultPluginManagerManager.java  23 Mar 2004 23:44:59 -0000      1.6
  @@ -33,6 +33,7 @@
   import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
   import org.codehaus.plexus.util.dag.DAG;
   import org.codehaus.plexus.util.dag.TopologicalSorter;
  +import org.codehaus.plexus.util.dag.CycleDetectedException;
   
   import java.util.HashMap;
   import java.util.Iterator;
  @@ -170,6 +171,7 @@
       }
   
       public void processPluginDescriptor( PluginDescriptor pluginDescriptor )
  +        throws CycleDetectedException
       {
           List goals = pluginDescriptor.getGoals();
   
  @@ -201,7 +203,14 @@
           {
               PluginDescriptor pluginDescriptor = (PluginDescriptor) 
event.getComponentDescriptor();
   
  -            processPluginDescriptor( pluginDescriptor );
  +            try
  +            {
  +                processPluginDescriptor( pluginDescriptor );
  +            }
  +            catch ( CycleDetectedException e )
  +            {
  +                getLogger().error( "A cycle was detected in the goal graph: ", e );
  +            }
           }
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]