Author: jvanzyl
Date: Sun Mar 8 16:14:26 2009
New Revision: 751454
URL: http://svn.apache.org/viewvc?rev=751454&view=rev
Log:
o branch for my simplification of the lifecycle executor
Removed:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/binding/
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/plan/
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/LegacyLifecycleMappingParserTest.java
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/binding/
maven/components/branches/MNG-2766/maven-core/src/test/java/org/apache/maven/lifecycle/plan/BuildPlanTest.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/branches/MNG-2766/maven-core/src/main/resources/META-INF/plexus/components.xml
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
maven/components/branches/MNG-2766/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/MNG-2766/pom.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/BuildFailureException.java?rev=751454&r1=751453&r2=751454&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
Sun Mar 8 16:14:26 2009
@@ -26,15 +26,15 @@
* @author <a href="mailto:br...@apache.org";>Brett Porter</a>
* @version $Id$
*/
-public abstract class BuildFailureException
+public class BuildFailureException
extends Exception
{
- protected BuildFailureException( String message )
+ public BuildFailureException( String message )
{
super( message );
}
- protected BuildFailureException( String message, Throwable cause )
+ public BuildFailureException( String message, Throwable cause )
{
super( message, cause );
}
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=751454&r1=751453&r2=751454&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Sun Mar 8 16:14:26 2009
@@ -19,14 +19,12 @@
* under the License.
*/
-import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.lifecycle.plan.BuildPlan;
-import org.apache.maven.project.MavenProject;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Map;
+
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.project.MavenProject;
/** @author Jason van Zyl */
public class DefaultMavenExecutionResult
@@ -34,7 +32,7 @@
{
private MavenProject project;
- private List topologicallySortedProjects;
+ private List<MavenProject> topologicallySortedProjects;
private ArtifactResolutionResult artifactResolutionResult;
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=751454&r1=751453&r2=751454&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
Sun Mar 8 16:14:26 2009
@@ -19,13 +19,11 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.lifecycle.plan.BuildPlan;
import org.apache.maven.project.MavenProject;
-import java.util.List;
-import java.util.Map;
-
/**
* @author Jason van Zyl
*/
@@ -35,7 +33,7 @@
MavenProject getProject();
MavenExecutionResult setTopologicallySortedProjects( List projects );
- List getTopologicallySortedProjects();
+ List<MavenProject> getTopologicallySortedProjects();
MavenExecutionResult setArtifactResolutionResult( ArtifactResolutionResult
result );
ArtifactResolutionResult getArtifactResolutionResult();
