You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2010/09/01 19:52:55 UTC
svn commit: r991624 -
/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Author: olamy
Date: Wed Sep 1 17:52:55 2010
New Revision: 991624
URL: http://svn.apache.org/viewvc?rev=991624&view=rev
Log:
configure mojo earlier as core is more strict regarding @required parameters.
see [MNG-4615]
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java?rev=991624&r1=991623&r2=991624&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java Wed Sep 1 17:52:55 2010
@@ -188,21 +188,7 @@ public class DefaultMavenReportExecutor
MojoExecution mojoExecution = new MojoExecution( plugin, goal, "report:" + goal );
mojoExecution.setConfiguration( convert( mojoDescriptor ) );
-
- mojoExecution.setMojoDescriptor( mojoDescriptor );
-
- mavenPluginManager.setupPluginRealm( pluginDescriptor,
- mavenReportExecutorRequest.getMavenSession(),
- Thread.currentThread().getContextClassLoader(), IMPORTS,
- exclusionSetFilter );
- MavenReport mavenReport =
- getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
-
- if ( mavenReport == null )
- {
- continue;
- }
-
+
if ( reportPlugin.getConfiguration() != null )
{
Xpp3Dom reportConfiguration = convert( reportPlugin.getConfiguration() );
@@ -228,30 +214,37 @@ public class DefaultMavenReportExecutor
}
mojoExecution.setConfiguration( cleanedConfiguration );
- }
+ }
- mavenReport =
+ mojoExecution.setMojoDescriptor( mojoDescriptor );
+
+ mavenPluginManager.setupPluginRealm( pluginDescriptor,
+ mavenReportExecutorRequest.getMavenSession(),
+ Thread.currentThread().getContextClassLoader(), IMPORTS,
+ exclusionSetFilter );
+ MavenReport mavenReport =
getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
- if ( mavenReport != null )
+ if ( mavenReport == null )
{
- MavenReportExecution mavenReportExecution =
- new MavenReportExecution( mojoExecution.getPlugin(), mavenReport,
- pluginDescriptor.getClassRealm() );
+ continue;
+ }
+ MavenReportExecution mavenReportExecution =
+ new MavenReportExecution( mojoExecution.getPlugin(), mavenReport,
+ pluginDescriptor.getClassRealm() );
- lifecycleExecutor.calculateForkedExecutions( mojoExecution,
- mavenReportExecutorRequest.getMavenSession() );
+ lifecycleExecutor.calculateForkedExecutions( mojoExecution,
+ mavenReportExecutorRequest.getMavenSession() );
- if ( !mojoExecution.getForkedExecutions().isEmpty() )
- {
- lifecycleExecutor.executeForkedExecutions( mojoExecution,
- mavenReportExecutorRequest.getMavenSession() );
- }
+ if ( !mojoExecution.getForkedExecutions().isEmpty() )
+ {
+ lifecycleExecutor.executeForkedExecutions( mojoExecution,
+ mavenReportExecutorRequest.getMavenSession() );
+ }
- if ( canGenerateReport( mavenReport ) )
- {
- reports.add( mavenReportExecution );
- }
+ if ( canGenerateReport( mavenReport ) )
+ {
+ reports.add( mavenReportExecution );
}
}
}