svn commit: r1593730 - in /maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec: DefaultMavenReportExecutor.java MavenReportExecution.java

[hb...@apache.org]

Author: hboutemy
Date: Sat May 10 20:44:53 2014
New Revision: 1593730

URL: http://svn.apache.org/r1593730
Log:
[MSHARED-334] added goal name to MavenReportExecution

Modified:
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
    maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java?rev=1593730&r1=1593729&r2=1593730&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/DefaultMavenReportExecutor.java Sat May 10 20:44:53 2014
@@ -261,7 +261,8 @@ public class DefaultMavenReportExecutor
                             getConfiguredMavenReport( mojoExecution, pluginDescriptor, mavenReportExecutorRequest );
 
             MavenReportExecution mavenReportExecution =
-                new MavenReportExecution( mojoExecution.getPlugin(), mavenReport, pluginDescriptor.getClassRealm() );
+                new MavenReportExecution( report.getGoal(), mojoExecution.getPlugin(), mavenReport,
+                                          pluginDescriptor.getClassRealm() );
 
             lifecycleExecutor.calculateForkedExecutions( mojoExecution, mavenReportExecutorRequest.getMavenSession() );
 

Modified: maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java?rev=1593730&r1=1593729&r2=1593730&view=diff
==============================================================================
--- maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java (original)
+++ maven/shared/trunk/maven-reporting-exec/src/main/java/org/apache/maven/reporting/exec/MavenReportExecution.java Sat May 10 20:44:53 2014
@@ -28,6 +28,7 @@ import org.apache.maven.reporting.MavenR
  *   This class will store all necessary information for {@link MavenReport} execution:
  *   <ul>
  *     <li>a {@link MavenReport},</li>
+ *     <li>the goal name associated to the report,</li>
  *     <li>the associated {@link ClassLoader} for the Report Mojo execution,</li>
  *     <li>the {@link Plugin} associated to the {@link MavenReport}.</li>
  *   </ul> 
@@ -50,16 +51,24 @@ public class MavenReportExecution
 
     private Plugin plugin;
 
-    public MavenReportExecution( Plugin plugin, MavenReport mavenReport, ClassLoader classLoader )
+    private final String goal;
+
+    public MavenReportExecution( String goal, Plugin plugin, MavenReport mavenReport, ClassLoader classLoader )
     {
+        this.goal = goal;
         this.setPlugin( plugin );
         this.mavenReport = mavenReport;
         this.classLoader = classLoader;
     }
 
+    public MavenReportExecution( Plugin plugin, MavenReport mavenReport, ClassLoader classLoader )
+    {
+        this( null, plugin, mavenReport, classLoader );
+    }
+
     public MavenReportExecution( MavenReport mavenReport )
     {
-        this( null, mavenReport, null );
+        this( null, null, mavenReport, null );
     }
 
     public MavenReport getMavenReport()
@@ -91,4 +100,9 @@ public class MavenReportExecution
     {
         return plugin;
     }
+
+    public String getGoal()
+    {
+        return goal;
+    }
 }