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 2009/09/27 17:51:59 UTC
svn commit: r819329 - in /maven/plugins/branches/maven-site-plugin-3.x/src:
it/report-changes-generation/ it/report-changes-generation/pom.xml
main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
Author: olamy
Date: Sun Sep 27 15:51:59 2009
New Revision: 819329
URL: http://svn.apache.org/viewvc?rev=819329&view=rev
Log:
fix injection of configuration section coming from the reporting/plugin section.
copy it coming from maven-changes-plugin.
Added:
maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/
- copied from r819291, maven/plugins/trunk/maven-changes-plugin/src/it/report-changes-generation/
Modified:
maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml
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/it/report-changes-generation/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml?rev=819329&r1=819291&r2=819329&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/it/report-changes-generation/pom.xml Sun Sep 27 15:51:59 2009
@@ -41,7 +41,7 @@
<url>http://localhost/bla</url>
</issueManagement>
<properties>
- <changesPluginVersion>@pom.version@</changesPluginVersion>
+ <changesPluginVersion>2.1</changesPluginVersion>
</properties>
<build>
<pluginManagement>
@@ -77,7 +77,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>@sitePluginVersion@</version>
+ <version>@pom.version@</version>
</plugin>
</plugins>
</build>
@@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>@pom.version@</version>
+ <version>${changesPluginVersion}</version>
<configuration>
<issueLinkTemplate>http://myjira/browse/%ISSUE%</issueLinkTemplate>
</configuration>
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=819329&r1=819328&r2=819329&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 Sun Sep 27 15:51:59 2009
@@ -44,6 +44,7 @@
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.Xpp3DomUtils;
/**
*
@@ -137,15 +138,48 @@
}
MojoExecution mojoExecution = new MojoExecution( plugin, goal, "report:" + goal );
+
mojoExecution.setConfiguration( convert( mojoDescriptor ) );
- //lifecycleExecutor.populateDefaultConfigurationForPlugin( plugin, repositoryRequest );
+
mojoExecution.setMojoDescriptor( mojoDescriptor );
+
mavenPluginManager.setupPluginRealm( pluginDescriptor,
mavenReportExecutorRequest.getMavenSession(),
Thread.currentThread().getContextClassLoader(), imports );
MavenReport mavenReport =
getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
+
+ if ( mavenReport == null )
+ {
+ continue;
+ }
+
+ if ( reportPlugin.getConfiguration() != null )
+ {
+
+ Xpp3Dom mergedConfiguration =
+ Xpp3DomUtils.mergeXpp3Dom( (Xpp3Dom) reportPlugin.getConfiguration(),
+ convert( mojoDescriptor ) );
+
+ Xpp3Dom cleanedConfiguration = new Xpp3Dom( "configuration" );
+ for ( int i = 0, size = mergedConfiguration.getChildren().length; i < size; i++ )
+ {
+ if ( mojoDescriptor.getParameterMap().containsKey(
+ mergedConfiguration.getChildren()[i].getName() ) )
+ {
+ cleanedConfiguration.addChild( mergedConfiguration.getChildren()[i] );
+ }
+ }
+
+ getLog().info( "mojoExecution mergedConfiguration " + mergedConfiguration );
+ getLog().info( "mojoExecution cleanedConfiguration " + cleanedConfiguration );
+
+ mojoExecution.setConfiguration( cleanedConfiguration );
+ }
+
+ mavenReport =
+ getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
if ( mavenReport != null )
{