Author: jboynes
Date: Mon Aug 12 02:33:44 2013
New Revision: 1513030
URL: http://svn.apache.org/r1513030
Log:
Pass validateXml config setting to TldScanner
Although this enables XSD validation during the TLD scan it remains unsupported
for all other descriptors (including TLDs loaded by taglib directives).
Modified:
tomcat/trunk/java/org/apache/jasper/JspC.java
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1513030&r1=1513029&r2=1513030&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Mon Aug 12 02:33:44 2013
@@ -156,6 +156,7 @@ public class JspC extends Task implement
protected ClassLoader loader = null;
protected boolean trimSpaces = false;
protected boolean genStringAsCharArray = false;
+ protected boolean validateXml;
protected boolean xpoweredBy;
protected boolean mappedFile = false;
protected boolean poolingEnabled = true;
@@ -842,6 +843,7 @@ public class JspC extends Task implement
}
public void setValidateXml( boolean b ) {
+ this.validateXml = b;
org.apache.jasper.xmlparser.ParserUtils.validating=b;
}
@@ -1421,7 +1423,7 @@ public class JspC extends Task implement
URL resourceBase = new
File(uriRoot).getCanonicalFile().toURI().toURL();
context = new JspCServletContext(log, resourceBase, classLoader);
- TldScanner scanner = new TldScanner(context, true, false);
+ TldScanner scanner = new TldScanner(context, true, validateXml);
try {
scanner.scan();
} catch (SAXException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
