svn commit: r1544208 - in /tomcat/trunk/java/org/apache: jasper/compiler/JspDocumentParser.java tomcat/util/digester/Digester.java

[markt]

Author: markt
Date: Thu Nov 21 15:13:39 2013
New Revision: 1544208

URL: http://svn.apache.org/r1544208
Log:
Align the XML parser configuration between the Digester (web.xml, 
web-fragment.xml, *.tld) and JspDocumentParser (*.jspx, *.tagx)

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
    tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1544208&r1=1544207&r2=1544208&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Thu Nov 
21 15:13:39 2013
@@ -1423,16 +1423,24 @@ class JspDocumentParser
         throws Exception {
 
         SAXParserFactory factory = SAXParserFactory.newInstance();
-        factory.setNamespaceAware(true);
 
+        factory.setNamespaceAware(true);
         // Preserve xmlns attributes
         factory.setFeature(
             "http://xml.org/sax/features/namespace-prefixes";,
             true);
+
         factory.setValidating(validating);
-        //factory.setFeature(
-        //    "http://xml.org/sax/features/validation";,
-        //    validating);
+        if (validating) {
+            // Enable DTD validation
+            factory.setFeature(
+                    "http://xml.org/sax/features/validation";,
+                    true);
+            // Enable schema validation
+            factory.setFeature(
+                    "http://apache.org/xml/features/validation/schema";,
+                    true);
+        }
 
         // Configure the parser
         SAXParser saxParser = factory.newSAXParser();

Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1544208&r1=1544207&r2=1544208&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Nov 21 
15:13:39 2013
@@ -413,7 +413,13 @@ public class Digester extends DefaultHan
 
         if (factory == null) {
             factory = SAXParserFactory.newInstance();
+
             factory.setNamespaceAware(namespaceAware);
+            // Preserve xmlns attributes
+            factory.setFeature(
+                "http://xml.org/sax/features/namespace-prefixes";,
+                true);
+
             factory.setValidating(validating);
             if (validating) {
                 // Enable DTD validation



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org