You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/22 00:31:39 UTC
svn commit: r630048 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan:
BuildPlan.java DefaultBuildPlanner.java
Author: jdcasey
Date: Thu Feb 21 15:31:38 2008
New Revision: 630048
URL: http://svn.apache.org/viewvc?rev=630048&view=rev
Log:
Fixing site-generation and other plugins that require reports.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java?rev=630048&r1=630047&r2=630048&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java Thu Feb 21 15:31:38 2008
@@ -8,7 +8,6 @@
import org.apache.maven.lifecycle.model.LifecycleBinding;
import org.apache.maven.lifecycle.model.LifecycleBindings;
import org.apache.maven.lifecycle.model.MojoBinding;
-import org.apache.maven.lifecycle.model.Phase;
import org.apache.maven.lifecycle.statemgmt.StateManagementUtils;
import java.util.ArrayList;
@@ -87,27 +86,11 @@
}
public void markFullyResolved()
+ throws NoSuchPhaseException
{
- for ( Iterator bindingIterator = bindings.getBindingList().iterator(); bindingIterator.hasNext(); )
- {
- LifecycleBinding binding = (LifecycleBinding) bindingIterator.next();
-
- for ( Iterator phaseIterator = binding.getPhasesInOrder().iterator(); phaseIterator.hasNext(); )
- {
- Phase phase = (Phase) phaseIterator.next();
-
- for ( Iterator mojoBindingIterator = phase.getBindings().iterator(); mojoBindingIterator.hasNext(); )
- {
- MojoBinding mojoBinding = (MojoBinding) mojoBindingIterator.next();
-
- String key = MojoBindingUtils.createMojoBindingKey( mojoBinding, false );
-
- fullyResolvedBindings.add( key );
- }
- }
- }
+ List bindings = renderExecutionPlan( new Stack() );
- for ( Iterator it = directInvocationBindings.values().iterator(); it.hasNext(); )
+ for ( Iterator it = bindings.iterator(); it.hasNext(); )
{
MojoBinding mojoBinding = (MojoBinding) it.next();
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java?rev=630048&r1=630047&r2=630048&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/plan/DefaultBuildPlanner.java Thu Feb 21 15:31:38 2008
@@ -208,6 +208,7 @@
{
if ( plan.isIncludingReports() )
{
+ logger.debug( "Report modifiers are already present in the build plan." );
return;
}
@@ -220,6 +221,7 @@
if ( plan.isFullyResolved( mojoBinding ) )
{
+ logger.debug( "Skipping report-discovery for mojo: " + MojoBindingUtils.toString( mojoBinding ) + "; it is already fully resolved in the build plan." );
continue;
}
@@ -230,6 +232,7 @@
if ( pluginDescriptor == null )
{
+ logger.debug( "Plugin descriptor not found for mojo: " + MojoBindingUtils.toString( mojoBinding ) + "; skipping for report-discovery." );
continue;
}
@@ -243,6 +246,7 @@
if ( mojoDescriptor.isRequiresReports() )
{
+ logger.debug( "Mojo: " + MojoBindingUtils.toString( mojoBinding ) + " requires reports; running report-discovery." );
List reportBindings = lifecycleBindingManager.getReportBindings( project, session );
if ( reportBindings != null )