maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1767040 - /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Date Fri, 28 Oct 2016 16:30:03 GMT
Author: hboutemy
Date: Fri Oct 28 16:30:02 2016
New Revision: 1767040

URL: http://svn.apache.org/viewvc?rev=1767040&view=rev
Log:
[DOXIASITETOOLS-170] added skin jar file name to error message

Modified:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1767040&r1=1767039&r2=1767040&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
Fri Oct 28 16:30:02 2016
@@ -701,6 +701,7 @@ public class DefaultSiteRenderer
         try
         {
             Template template;
+            File skin = siteRenderingContext.getSkinJarFile();
 
             try
             {
@@ -713,16 +714,17 @@ public class DefaultSiteRenderer
             catch ( ParseErrorException pee )
             {
                 throw new RendererException( "Velocity parsing error while reading the site
decoration template '"
-                    + templateName + "'", pee );
+                    + templateName + "'" + ( ( skin == null ) ? "" : ( " from " + skin.getName()
+ " skin" ) ), pee );
             }
             catch ( ResourceNotFoundException rnfe )
             {
-                throw new RendererException( "Could not find the site decoration template
'" + templateName + "'",
-                                             rnfe );
+                throw new RendererException( "Could not find the site decoration template
'" + templateName + "'"
+                    + ( ( skin == null ) ? "" : ( " in " + skin.getName() + " skin" ) ),
rnfe );
             }
             catch ( VelocityException ve )
             {
-                throw new RendererException( "Velocity error while getting site decoration
template.", ve );
+                throw new RendererException( "Velocity error while getting site decoration
template"
+                    + ( ( skin == null ) ? "" : ( " from " + skin.getName() + " skin" ) ),
ve );
             }
 
             try



Mime
View raw message