svn commit: r958705 - in /maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site: DefaultMavenReportExecutor.java MavenReportExecution.java ReportDocumentRenderer.java

[hboutemy]

Author: hboutemy
Date: Mon Jun 28 20:24:00 2010
New Revision: 958705

URL: http://svn.apache.org/viewvc?rev=958705&view=rev
Log:
added plugin information to report generation message

Modified:
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/DefaultMavenReportExecutor.java
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.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=958705&r1=958704&r2=958705&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
 Mon Jun 28 20:24:00 2010
@@ -116,7 +116,7 @@ public class DefaultMavenReportExecutor
 
                 if ( logger.isInfoEnabled() )
                 {
-                    logger.info( "configuring reportPlugin " + plugin.getId() 
);
+                    logger.info( "configuring report plugin " + plugin.getId() 
);
                 }
 
                 List<String> goals = new ArrayList<String>();
@@ -199,7 +199,8 @@ public class DefaultMavenReportExecutor
                     if ( mavenReport != null )
                     {
                         MavenReportExecution mavenReportExecution =
-                            new MavenReportExecution( mavenReport, 
pluginDescriptor.getClassRealm() );
+                            new MavenReportExecution( 
mojoExecution.getPlugin(), mavenReport,
+                                                      
pluginDescriptor.getClassRealm() );
 
                         lifecycleExecutor.calculateForkedExecutions( 
mojoExecution,
                                                                      
mavenReportExecutorRequest.getMavenSession() );
@@ -360,7 +361,8 @@ public class DefaultMavenReportExecutor
         return logger;
     }
 
-    protected String getPluginVersion( ReportPlugin reportPlugin, 
RepositoryRequest repositoryRequest, MavenReportExecutorRequest 
mavenReportExecutorRequest )
+    protected String getPluginVersion( ReportPlugin reportPlugin, 
RepositoryRequest repositoryRequest,
+                                       MavenReportExecutorRequest 
mavenReportExecutorRequest )
         throws PluginVersionResolutionException
     {
         String reportPluginKey = null;

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java?rev=958705&r1=958704&r2=958705&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/MavenReportExecution.java
 Mon Jun 28 20:24:00 2010
@@ -19,6 +19,7 @@ package org.apache.maven.plugins.site;
  * under the License.
  */
 
+import org.apache.maven.model.Plugin;
 import org.apache.maven.reporting.MavenReport;
 
 /**
@@ -32,8 +33,11 @@ public class MavenReportExecution
 
     private ClassLoader classLoader;
 
-    public MavenReportExecution( MavenReport mavenReport, ClassLoader 
classLoader )
+    private Plugin plugin;
+
+    public MavenReportExecution( Plugin plugin, MavenReport mavenReport, 
ClassLoader classLoader )
     {
+        this.setPlugin( plugin );
         this.mavenReport = mavenReport;
         this.classLoader = classLoader;
     }
@@ -57,4 +61,14 @@ public class MavenReportExecution
     {
         this.classLoader = classLoader;
     }
+
+    public void setPlugin( Plugin plugin )
+    {
+        this.plugin = plugin;
+    }
+
+    public Plugin getPlugin()
+    {
+        return plugin;
+    }
 }

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=958705&r1=958704&r2=958705&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
 Mon Jun 28 20:24:00 2010
@@ -147,7 +147,9 @@ public class ReportDocumentRenderer
         MavenReport report = mavenReportExecution.getMavenReport();
 
         String localReportName = report.getName( locale );
-        log.info( "Generating \"" + localReportName + "\" report." );
+        String pluginInfo =
+            mavenReportExecution.getPlugin().getArtifactId() + ':' + 
mavenReportExecution.getPlugin().getVersion();
+        log.info( "Generating \"" + localReportName + "\" report    --- " + 
pluginInfo );
 
         MySinkFactory sf = new MySinkFactory( renderingContext );