Author: jvanzyl
Date: Thu Oct 2 04:26:35 2008
New Revision: 701085
URL: http://svn.apache.org/viewvc?rev=701085&view=rev
Log:
o some rework of lifecycle and reporting on trunk
Removed:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/AggregatedBuildFailureException.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/InvalidTaskException.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/ProjectBuildFailureException.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/errors/
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/TaskValidationResult.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/binding/
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/plan/
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/statemgmt/
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/test/java/org/apache/maven/errors/DefaultCoreErrorReporterTest.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/test/java/org/apache/maven/lifecycle/
maven/components/branches/maven-3.0.x-lifecycle/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
maven/components/branches/maven-3.0.x-lifecycle/maven-lifecycle/
Modified:
maven/components/branches/maven-3.0.x-lifecycle/build.xml
maven/components/branches/maven-3.0.x-lifecycle/maven-core/pom.xml
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/plugin/loader/DefaultPluginLoader.java
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoader.java
maven/components/branches/maven-3.0.x-lifecycle/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-3.0.x-lifecycle/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java
maven/components/branches/maven-3.0.x-lifecycle/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java
maven/components/branches/maven-3.0.x-lifecycle/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/branches/maven-3.0.x-lifecycle/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
maven/components/branches/maven-3.0.x-lifecycle/pom.xml
Modified: maven/components/branches/maven-3.0.x-lifecycle/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/build.xml?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-lifecycle/build.xml (original)
+++ maven/components/branches/maven-3.0.x-lifecycle/build.xml Thu Oct 2
04:26:35 2008
@@ -124,7 +124,6 @@
</macrodef>
<modello file="maven-model/src/main/mdo/maven.mdo" version="4.0.0"/>
- <modello file="maven-lifecycle/src/main/mdo/maven-lifecycle.mdo"/>
<modello file="maven-plugin-api/src/main/mdo/lifecycle.mdo"/>
<modello file="maven-project/src/main/mdo/profiles.mdo"/>
<modello file="maven-core/src/main/mdo/settings.mdo"/>
Modified: maven/components/branches/maven-3.0.x-lifecycle/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/pom.xml?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-lifecycle/maven-core/pom.xml
(original)
+++ maven/components/branches/maven-3.0.x-lifecycle/maven-core/pom.xml Thu Oct
2 04:26:35 2008
@@ -31,10 +31,12 @@
<artifactId>maven-core</artifactId>
<name>Maven Core</name>
<dependencies>
+ <!--
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-lifecycle</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-reporting-api</artifactId>
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/BuildFailureException.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/BuildFailureException.java
Thu Oct 2 04:26:35 2008
@@ -26,16 +26,31 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id$
*/
-public abstract class BuildFailureException
+public class BuildFailureException
extends Exception
{
- protected BuildFailureException( String message )
+
+ public BuildFailureException()
{
- super( message );
+ super();
+ // TODO Auto-generated constructor stub
}
- protected BuildFailureException( String message, Throwable cause )
+ public BuildFailureException( String message, Throwable cause )
{
super( message, cause );
+ // TODO Auto-generated constructor stub
+ }
+
+ public BuildFailureException( String message )
+ {
+ super( message );
+ // TODO Auto-generated constructor stub
}
+
+ public BuildFailureException( Throwable cause )
+ {
+ super( cause );
+ // TODO Auto-generated constructor stub
+ }
}
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Thu Oct 2 04:26:35 2008
@@ -235,8 +235,6 @@
result.setProject( reactorManager.getTopLevelProject() );
- result.setBuildPlans( session.getBuildPlans() );
-
dispatcher.dispatchEnd( event, request.getBaseDirectory() );
return result;
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
Thu Oct 2 04:26:35 2008
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext;
@@ -583,8 +582,6 @@
private Settings settings;
- private CoreErrorReporter errorReporter;
-
private ProfileActivationContext profileActivationContext;
// calculated from request attributes.
@@ -687,17 +684,6 @@
return this;
}
- public CoreErrorReporter getErrorReporter()
- {
- return errorReporter;
- }
-
- public MavenExecutionRequest setErrorReporter( CoreErrorReporter reporter )
- {
- errorReporter = reporter;
- return this;
- }
-
public ProfileActivationContext getProfileActivationContext()
{
return profileActivationContext;
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionResult.java
Thu Oct 2 04:26:35 2008
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.lifecycle.plan.BuildPlan;
import org.apache.maven.project.MavenProject;
import java.util.ArrayList;
@@ -113,19 +112,4 @@
return this;
}
-
- public BuildPlan getBuildPlan( String projectId )
- {
- return (BuildPlan) buildPlans.get( projectId );
- }
-
- public BuildPlan getBuildPlan( MavenProject project )
- {
- return (BuildPlan) buildPlans.get( project.getId() );
- }
-
- public void setBuildPlans( Map buildPlans )
- {
- this.buildPlans = buildPlans;
- }
}
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionRequest.java
Thu Oct 2 04:26:35 2008
@@ -21,7 +21,6 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
-import org.apache.maven.errors.CoreErrorReporter;
import org.apache.maven.monitor.event.EventMonitor;
import org.apache.maven.profiles.ProfileManager;
import org.apache.maven.profiles.activation.ProfileActivationContext;
@@ -218,8 +217,5 @@
MavenExecutionRequest clearAccumulatedBuildState();
- MavenExecutionRequest setErrorReporter( CoreErrorReporter reporter );
- CoreErrorReporter getErrorReporter();
-
ProjectBuilderConfiguration getProjectBuildingConfiguration();
}
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenExecutionResult.java
Thu Oct 2 04:26:35 2008
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.lifecycle.plan.BuildPlan;
import org.apache.maven.project.MavenProject;
import java.util.List;
@@ -53,10 +52,4 @@
MavenExecutionResult addException( Throwable e );
boolean hasExceptions();
-
- BuildPlan getBuildPlan( String projectId );
-
- BuildPlan getBuildPlan( MavenProject project );
-
- void setBuildPlans( Map buildPlan );
}
Modified:
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=701085&r1=701084&r2=701085&view=diff
==============================================================================
---
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
(original)
+++
maven/components/branches/maven-3.0.x-lifecycle/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Thu Oct 2 04:26:35 2008
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.lifecycle.plan.BuildPlan;
import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
@@ -257,26 +256,6 @@
return reports.keySet();
}
- public BuildPlan getBuildPlan( String projectId )
- {
- return (BuildPlan) buildPlans.get( projectId );
- }
-
- public BuildPlan getBuildPlan( MavenProject project )
- {
- return (BuildPlan) buildPlans.get( project.getId() );
- }
-
- public void setBuildPlan( MavenProject project, BuildPlan buildPlan )
- {
- buildPlans.put( project.getId(), buildPlan );
- }
-
- public Map getBuildPlans()
- {
- return buildPlans;
- }
-
public ProjectBuilderConfiguration getProjectBuilderConfiguration()
{
return request.getProjectBuildingConfiguration();
