svn commit: r1593736 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: AbstractSiteRenderingMojo.java ReportDocumentRenderer.java

[hboutemy]

Author: hboutemy
Date: Sat May 10 21:12:28 2014
New Revision: 1593736

URL: http://svn.apache.org/r1593736
Log:
[MSITE-711] added report's goal name to output

Modified:
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
    
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java?rev=1593736&r1=1593735&r2=1593736&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
 Sat May 10 21:12:28 2014
@@ -401,8 +401,14 @@ public abstract class AbstractSiteRender
             {
                 String displayLanguage = locale.getDisplayLanguage( 
Locale.ENGLISH );
 
-                getLog().info( "Skipped \"" + report.getName( locale ) + "\" 
report, file \"" + outputName
-                                   + "\" already exists for the " + 
displayLanguage + " version." );
+                String reportMojoInfo =
+                    ( mavenReportExecution.getGoal() == null ) ? "" : ( " ("
+                        + mavenReportExecution.getPlugin().getArtifactId() + 
':'
+                        + mavenReportExecution.getPlugin().getVersion() + ':' 
+ mavenReportExecution.getGoal() + ')' );
+
+                getLog().info( "Skipped \"" + report.getName( locale ) + "\" 
report" + reportMojoInfo + ", file \""
+                                   + outputName + "\" already exists for the " 
+ displayLanguage + " version." );
+
                 reports.remove( mavenReportExecution );
             }
             else

Modified: 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java?rev=1593736&r1=1593735&r2=1593736&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
 (original)
+++ 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
 Sat May 10 21:12:28 2014
@@ -59,7 +59,7 @@ public class ReportDocumentRenderer
 
     private final RenderingContext renderingContext;
 
-    private final String pluginInfo;
+    private final String reportMojoInfo;
 
     private final ClassLoader classLoader;
     
@@ -73,12 +73,15 @@ public class ReportDocumentRenderer
 
         if ( mavenReportExecution.getPlugin() == null )
         {
-            this.pluginInfo = getPluginInfo( report );
+            // Maven 2: report has been prepared in Maven Core, 
MavenReportExecution contains only the report
+            this.reportMojoInfo = getPluginInfo( report );
         }
         else
         {
-            this.pluginInfo =
-                mavenReportExecution.getPlugin().getArtifactId() + ':' + 
mavenReportExecution.getPlugin().getVersion();
+            // Maven 3: full MavenReportExecution prepared by 
maven-reporting-impl
+            this.reportMojoInfo =
+                mavenReportExecution.getPlugin().getArtifactId() + ':' + 
mavenReportExecution.getPlugin().getVersion()
+                    + ':' + mavenReportExecution.getGoal();
         }
 
         this.classLoader = mavenReportExecution.getClassLoader();
@@ -198,7 +201,7 @@ public class ReportDocumentRenderer
         String localReportName = report.getName( locale );
 
         log.info( "Generating \"" + localReportName + "\" report"
-                  + ( pluginInfo == null ? "." : ( "    --- " + pluginInfo ) ) 
);
+                  + ( reportMojoInfo == null ? "." : ( "    --- " + 
reportMojoInfo ) ) );
 
         MySinkFactory sf = new MySinkFactory( renderingContext );