cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/lifecycle MavenLifecycleContext.java MavenLifecycleManager.java MavenLifecyclePhase.java

[jvanzyl]

jvanzyl     2004/04/05 09:01:31

  Modified:    maven-core/src/main/java/org/apache/maven DefaultMaven.java
               maven-core/src/main/java/org/apache/maven/lifecycle
                        MavenLifecycleContext.java
                        MavenLifecycleManager.java MavenLifecyclePhase.java
  Log:
  
  
  Revision  Changes    Path
  1.14      +6 -6      
maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
  
  Index: DefaultMaven.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/DefaultMaven.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultMaven.java 4 Apr 2004 17:23:44 -0000       1.13
  +++ DefaultMaven.java 5 Apr 2004 16:01:31 -0000       1.14
  @@ -44,7 +44,7 @@
       // Components
       // ----------------------------------------------------------------------
   
  -    private PluginManagerManager pluginMM;
  +    private PluginManagerManager pluginManagerManager;
   
       private MavenProjectBuilder projectBuilder;
   
  @@ -74,7 +74,7 @@
               throw new GoalNotFoundException( goal );
           }
   
  -        PluginExecutionResponse response = pluginMM.attainGoal( project, goal );
  +        PluginExecutionResponse response = pluginManagerManager.attainGoal( 
project, goal );
   
           if ( response.exceptionOccurred() )
           {
  @@ -88,12 +88,12 @@
   
       public Map getPluginDescriptors()
       {
  -        return pluginMM.getPluginDescriptors();
  +        return pluginManagerManager.getPluginDescriptors();
       }
   
       public PluginDescriptor getPluginDescriptor( String pluginId )
       {
  -        return pluginMM.getPluginDescriptor( pluginId );
  +        return pluginManagerManager.getPluginDescriptor( pluginId );
       }
   
       // ----------------------------------------------------------------------
  @@ -102,12 +102,12 @@
   
       public Map getGoalDescriptors()
       {
  -        return pluginMM.getGoalDescriptors();
  +        return pluginManagerManager.getGoalDescriptors();
       }
   
       public GoalDescriptor getGoalDescriptor( String goalId )
       {
  -        return pluginMM.getGoalDescriptor( goalId );
  +        return pluginManagerManager.getGoalDescriptor( goalId );
       }
   
       // ----------------------------------------------------------------------
  
  
  
  1.2       +32 -0     
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleContext.java
  
  Index: MavenLifecycleContext.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MavenLifecycleContext.java        5 Apr 2004 15:41:46 -0000       1.1
  +++ MavenLifecycleContext.java        5 Apr 2004 16:01:31 -0000       1.2
  @@ -1,9 +1,41 @@
   package org.apache.maven.lifecycle;
   
  +import org.apache.maven.Maven;
  +import org.apache.maven.project.MavenProject;
  +
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @version $Id$
    */
   public class MavenLifecycleContext
   {
  +    private Maven maven;
  +
  +    private MavenProject project;
  +
  +    private String goal;
  +
  +    public MavenLifecycleContext( Maven maven, MavenProject project, String goal )
  +    {
  +        this.maven = maven;
  +
  +        this.project = project;
  +
  +        this.goal = goal;
  +    }
  +
  +    public Maven getMaven()
  +    {
  +        return maven;
  +    }
  +
  +    public MavenProject getProject()
  +    {
  +        return project;
  +    }
  +
  +    public String getGoal()
  +    {
  +        return goal;
  +    }
   }
  
  
  
  1.3       +0 -1      
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleManager.java
  
  Index: MavenLifecycleManager.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecycleManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MavenLifecycleManager.java        5 Apr 2004 15:55:21 -0000       1.2
  +++ MavenLifecycleManager.java        5 Apr 2004 16:01:31 -0000       1.3
  @@ -14,5 +14,4 @@
           throws Exception;
   
       List getLifecyclePhases();
  -
   }
  
  
  
  1.3       +3 -3      
maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java
  
  Index: MavenLifecyclePhase.java
  ===================================================================
  RCS file: 
/home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/MavenLifecyclePhase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MavenLifecyclePhase.java  5 Apr 2004 15:55:21 -0000       1.2
  +++ MavenLifecyclePhase.java  5 Apr 2004 16:01:31 -0000       1.3
  @@ -1,5 +1,7 @@
   package org.apache.maven.lifecycle;
   
  +import org.apache.maven.Maven;
  +
   /**
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @version $Id$
  @@ -8,8 +10,6 @@
   {
       String ROLE = MavenLifecyclePhase.class.getName();
   
  -    String MAVEN = "maven";
  -
       void execute( MavenLifecycleContext context )
  -        throws Exception;
  +        throws Exception;   
   }
  
  
  

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