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

o using annotations for DefaultMaven, remove hand-made entry 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@721569 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2008-11-28 22:02:44 +00:00
parent 5f268ca18a
commit 49299ed42b
2 changed files with 38 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
maven-core/src/main/java/org/apache/maven/DefaultMaven.java
View File

@ -20,32 +20,6 @@ package org.apache.maven;
*/ */
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.*;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.monitor.event.DeprecationEventDispatcher;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -54,25 +28,54 @@ import java.util.Date;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.DuplicateProjectException;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.execution.ReactorManager;
import org.apache.maven.execution.RuntimeInformation;
import org.apache.maven.lifecycle.LifecycleExecutionException;
import org.apache.maven.lifecycle.LifecycleExecutor;
import org.apache.maven.lifecycle.TaskValidationResult;
import org.apache.maven.monitor.event.DeprecationEventDispatcher;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.monitor.event.MavenEvents;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.reactor.MavenExecutionException;
import org.apache.maven.reactor.MissingModuleException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.LogEnabled;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.Os;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
/** /**
* @author jason van zyl * @author Jason van Zyl
* @version $Id$ * @version $Id$
* @todo EventDispatcher should be a component as it is internal to maven. * @todo EventDispatcher should be a component as it is internal to maven.
*/ */
@Component(role = Maven.class)
public class DefaultMaven public class DefaultMaven
implements Maven, implements Maven, LogEnabled
Contextualizable, LogEnabled
{ {
// ---------------------------------------------------------------------- @Requirement
// Components
// ----------------------------------------------------------------------
protected MavenProjectBuilder projectBuilder; protected MavenProjectBuilder projectBuilder;
@Requirement
protected LifecycleExecutor lifecycleExecutor; protected LifecycleExecutor lifecycleExecutor;
@Requirement
protected PlexusContainer container; protected PlexusContainer container;
@Requirement
protected RuntimeInformation runtimeInformation; protected RuntimeInformation runtimeInformation;
private Logger logger; private Logger logger;
@ -388,16 +391,6 @@ public class DefaultMaven
return session; return session;
} }
// ----------------------------------------------------------------------
// Lifecylce Management
// ----------------------------------------------------------------------
public void contextualize( Context context )
throws ContextException
{
container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
}
private List getProjectFiles( MavenExecutionRequest request ) private List getProjectFiles( MavenExecutionRequest request )
throws IOException throws IOException
{ {

16
maven-core/src/main/resources/META-INF/plexus/components.xml
View File

@ -292,22 +292,6 @@ under the License.
</requirements> </requirements>
</component> </component>
<component>
<role>org.apache.maven.Maven</role>
<implementation>org.apache.maven.DefaultMaven</implementation>
<requirements>
<requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement>
<requirement>
<role>org.apache.maven.lifecycle.LifecycleExecutor</role>
</requirement>
<requirement>
<role>org.apache.maven.execution.RuntimeInformation</role>
</requirement>
</requirements>
</component>
<component> <component>
<role>org.apache.maven.execution.RuntimeInformation</role> <role>org.apache.maven.execution.RuntimeInformation</role>
<implementation>org.apache.maven.execution.DefaultRuntimeInformation</implementation> <implementation>org.apache.maven.execution.DefaultRuntimeInformation</implementation>