Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove notion of maven home from the core 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163263 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2004-12-24 22:28:36 +00:00
parent 33332423f6
commit 8afb73892d
8 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequest.java
View File

@ -16,8 +16,6 @@ public class AbstractMavenExecutionRequest
protected List goals;
protected File mavenHome;
protected String type;
public AbstractMavenExecutionRequest( ArtifactRepository localRepository, List goals )
@ -25,8 +23,6 @@ public class AbstractMavenExecutionRequest
this.localRepository = localRepository;
this.goals = goals;
this.mavenHome = mavenHome;
}
public ArtifactRepository getLocalRepository()
@ -39,11 +35,6 @@ public class AbstractMavenExecutionRequest
return goals;
}
public File getMavenHome()
{
return mavenHome;
}
public String getType()
{
return type;

2
maven-core/src/main/java/org/apache/maven/execution/AbstractMavenExecutionRequestHandler.java
View File

@ -33,7 +33,7 @@ public abstract class AbstractMavenExecutionRequestHandler
protected PlexusContainer container;
protected MavenSessionPhaseManager lifecycleManager;
protected MavenSessionPhaseManager sessionPhaseManager;
protected I18N i18n;

2
maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
View File

@ -15,7 +15,5 @@ public interface MavenExecutionRequest
List getGoals();
File getMavenHome();
String getType();
}

2
maven-core/src/main/java/org/apache/maven/execution/project/MavenProjectExecutionRequestHandler.java
View File

@ -26,7 +26,7 @@ public class MavenProjectExecutionRequestHandler
Date s = new Date();
response = lifecycleManager.execute( createSession( request, project ) );
response = sessionPhaseManager.execute( createSession( request, project ) );
response.setStart( s );

4
maven-core/src/main/java/org/apache/maven/lifecycle/session/DefaultMavenSessionPhaseManager.java
View File

@ -38,7 +38,7 @@ public class DefaultMavenSessionPhaseManager
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 @@ public class DefaultMavenSessionPhaseManager
phase.enableLogging( getLogger() );
MavenExecutionResponse response = phase.execute( context );
MavenExecutionResponse response = phase.execute( session );
if ( response.isExecutionFailure() )
{

9
maven-core/src/main/java/org/apache/maven/lifecycle/session/MavenSession.java
View File

@ -124,12 +124,14 @@ public class MavenSession
//
// ----------------------------------------------------------------------
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 class MavenSession
}
}
public void addImpliedExecution( String goal, String implied ) throws CycleDetectedException
public void addImpliedExecution( String goal, String implied )
throws CycleDetectedException
{
dag.addEdge( goal, implied );
}

3
maven-core/src/main/java/org/apache/maven/lifecycle/session/phase/GoalExecutionPhase.java
View File

@ -32,7 +32,8 @@ import java.util.Iterator;
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 );

10
maven-core/src/site/apt/todo.apt Normal file
View File

@ -0,0 +1,10 @@
-----
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.