maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-core/src/site/apt todo.apt
Date Fri, 24 Dec 2004 22:28:36 GMT
jvanzyl     2004/12/24 14:28:36

  Modified:    maven-core/src/main/java/org/apache/maven/execution
                        AbstractMavenExecutionRequest.java
                        AbstractMavenExecutionRequestHandler.java
                        MavenExecutionRequest.java
               maven-core/src/main/java/org/apache/maven/execution/project
                        MavenProjectExecutionRequestHandler.java
               maven-core/src/main/java/org/apache/maven/lifecycle/session
                        DefaultMavenSessionPhaseManager.java
                        MavenSession.java
               maven-core/src/main/java/org/apache/maven/lifecycle/session/phase
                        GoalExecutionPhase.java
  Added:       maven-core/src/site/apt todo.apt
  Log:
  remove notion of maven home from the core
  
  Revision  Changes    Path
  1.2       +1 -10     maven-components/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java
  
  Index: AbstractMavenExecutionRequest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractMavenExecutionRequest.java	23 Dec 2004 23:46:41 -0000	1.1
  +++ AbstractMavenExecutionRequest.java	24 Dec 2004 22:28:36 -0000	1.2
  @@ -16,8 +16,6 @@
   
       protected List goals;
   
  -    protected File mavenHome;
  -
       protected String type;
   
       public AbstractMavenExecutionRequest( ArtifactRepository localRepository, List goals
)
  @@ -25,8 +23,6 @@
           this.localRepository = localRepository;
   
           this.goals = goals;
  -
  -        this.mavenHome = mavenHome;
       }
   
       public ArtifactRepository getLocalRepository()
  @@ -37,11 +33,6 @@
       public List getGoals()
       {
           return goals;
  -    }
  -
  -    public File getMavenHome()
  -    {
  -        return mavenHome;
       }
   
       public String getType()
  
  
  
  1.4       +2 -2      maven-components/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java
  
  Index: AbstractMavenExecutionRequestHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractMavenExecutionRequestHandler.java	24 Dec 2004 20:51:45 -0000	1.3
  +++ AbstractMavenExecutionRequestHandler.java	24 Dec 2004 22:28:36 -0000	1.4
  @@ -33,7 +33,7 @@
   
       protected PlexusContainer container;
   
  -    protected MavenSessionPhaseManager lifecycleManager;
  +    protected MavenSessionPhaseManager sessionPhaseManager;
   
       protected I18N i18n;
   
  
  
  
  1.2       +1 -3      maven-components/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
  
  Index: MavenExecutionRequest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MavenExecutionRequest.java	23 Dec 2004 23:46:41 -0000	1.1
  +++ MavenExecutionRequest.java	24 Dec 2004 22:28:36 -0000	1.2
  @@ -15,7 +15,5 @@
   
       List getGoals();
   
  -    File getMavenHome();
  -
       String getType();
   }
  
  
  
  1.6       +2 -2      maven-components/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java
  
  Index: MavenProjectExecutionRequestHandler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MavenProjectExecutionRequestHandler.java	24 Dec 2004 21:36:00 -0000	1.5
  +++ MavenProjectExecutionRequestHandler.java	24 Dec 2004 22:28:36 -0000	1.6
  @@ -26,7 +26,7 @@
   
               Date s = new Date();
   
  -            response = lifecycleManager.execute( createSession( request, project ) );
  +            response = sessionPhaseManager.execute( createSession( request, project ) );
   
               response.setStart( s );
   
  
  
  
  1.7       +3 -3      maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java
  
  Index: DefaultMavenSessionPhaseManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultMavenSessionPhaseManager.java	23 Dec 2004 23:46:41 -0000	1.6
  +++ DefaultMavenSessionPhaseManager.java	24 Dec 2004 22:28:36 -0000	1.7
  @@ -38,7 +38,7 @@
           return lifecyclePhases;
       }
   
  -    public MavenExecutionResponse execute( MavenSession context )
  +    public MavenExecutionResponse execute( MavenSession session )
           throws Exception
       {
           for ( Iterator iterator = lifecyclePhases.iterator(); iterator.hasNext(); )
  @@ -47,7 +47,7 @@
   
               phase.enableLogging( getLogger() );
   
  -            MavenExecutionResponse response = phase.execute( context );
  +            MavenExecutionResponse response = phase.execute( session );
   
               if ( response.isExecutionFailure() )
               {
  
  
  
  1.8       +7 -4      maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java
  
  Index: MavenSession.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MavenSession.java	24 Dec 2004 17:29:41 -0000	1.7
  +++ MavenSession.java	24 Dec 2004 22:28:36 -0000	1.8
  @@ -124,12 +124,14 @@
       //
       // ----------------------------------------------------------------------
   
  -    public Object lookup( String role ) throws ComponentLookupException
  +    public Object lookup( String role )
  +        throws ComponentLookupException
       {
           return container.lookup( role );
       }
   
  -    public Object lookup( String role, String roleHint ) throws ComponentLookupException
  +    public Object lookup( String role, String roleHint )
  +        throws ComponentLookupException
       {
           return container.lookup( role, roleHint );
       }
  @@ -200,7 +202,8 @@
           }
       }
   
  -    public void addImpliedExecution( String goal, String implied ) throws CycleDetectedException
  +    public void addImpliedExecution( String goal, String implied )
  +        throws CycleDetectedException
       {
           dag.addEdge( goal, implied );
       }
  
  
  
  1.7       +3 -2      maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java
  
  Index: GoalExecutionPhase.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- GoalExecutionPhase.java	23 Dec 2004 23:46:41 -0000	1.6
  +++ GoalExecutionPhase.java	24 Dec 2004 22:28:36 -0000	1.7
  @@ -32,7 +32,8 @@
   public class GoalExecutionPhase
       extends AbstractMavenSessionPhase
   {
  -    public MavenExecutionResponse execute( MavenSession session ) throws Exception
  +    public MavenExecutionResponse execute( MavenSession session )
  +        throws Exception
       {
           MavenGoalPhaseManager lifecycleManager = (MavenGoalPhaseManager) session.lookup(
MavenGoalPhaseManager.ROLE );
   
  
  
  
  1.1                  maven-components/maven-core/src/site/apt/todo.apt
  
  Index: todo.apt
  ===================================================================
   -----
   Maven todo
   -----
   Jason van Zyl
   -----
  
  Maven Todos
  
   I need to make the request/response flow through the whole system. i think i can probably
fold the session into
   the request and response.
  
  
  

Mime
View raw message