You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/05/29 17:28:54 UTC
svn commit: r1598319 - in
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site:
ReportDocumentRenderer.java SiteMojo.java
Author: hboutemy
Date: Thu May 29 15:28:53 2014
New Revision: 1598319
URL: http://svn.apache.org/r1598319
Log:
[MSITE-713] removed "Error during page generation" error message, improved "Error rendering Maven report" by adding precise report information
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
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=1598319&r1=1598318&r2=1598319&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 Thu May 29 15:28:53 2014
@@ -220,7 +220,7 @@ public class ReportDocumentRenderer
}
else if ( generateMultiPage( locale, sf, sink ) )
{
- // extended multi-page API for Maven 2.2, only accessible by reflection API
+ // extended multi-page API for Maven 2.2, only accessible by reflection API
}
else
{
@@ -230,11 +230,13 @@ public class ReportDocumentRenderer
}
catch ( MavenReportException e )
{
- throw new RendererException( "Error rendering Maven report: " + e.getMessage(), e );
+ String report = ( reportMojoInfo == null ) ? ( '"' + localReportName + "\" report" ) : reportMojoInfo;
+ throw new RendererException( "Error generating " + report + ": " + e.getMessage(), e );
}
catch ( LinkageError e )
{
- log.warn( "An issue has occurred with report " + report.getClass().getName() + ", skip LinkageError "
+ String report = ( reportMojoInfo == null ) ? ( '"' + localReportName + "\" report" ) : reportMojoInfo;
+ log.warn( "An issue has occurred with " + report + ", skipping LinkageError "
+ e.getMessage() + ", please report an issue to Maven dev team.", e );
}
finally
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=1598319&r1=1598318&r2=1598319&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Thu May 29 15:28:53 2014
@@ -140,7 +140,7 @@ public class SiteMojo
}
catch ( RendererException e )
{
- throw new MojoExecutionException( "Error during page generation", e );
+ throw new MojoExecutionException( e.getMessage(), e );
}
catch ( IOException e )
{