Author: hboutemy Date: Sun Dec 20 13:34:19 2015 New Revision: 1721026 URL: http://svn.apache.org/viewvc?rev=1721026&view=rev Log: in case of validation of a source file with Velocity processing, do not validate in Velocity processing try/catch: in case of failure, Velocity failure would not be distinct from validation failure
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=1721026&r1=1721025&r2=1721026&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 Sun Dec 20 13:34:19 2015 @@ -345,10 +345,6 @@ public class DefaultSiteRenderer velocity.getEngine().mergeTemplate( resource, siteContext.getInputEncoding(), vc, sw ); reader = new StringReader( sw.toString() ); - if ( parser.getType() == Parser.XML_TYPE && siteContext.isValidate() ) - { - reader = validate( reader, resource ); - } } catch ( Exception e ) { @@ -361,6 +357,11 @@ public class DefaultSiteRenderer getLogger().error( "Error parsing " + resource + " as a velocity template, using as text." ); } } + + if ( parser.getType() == Parser.XML_TYPE && siteContext.isValidate() ) + { + reader = validate( reader, resource ); + } } else {