Author: markt
Date: Thu Nov 21 15:21:54 2013
New Revision: 1544211
URL: http://svn.apache.org/r1544211
Log:
Align the XML parser configuration between the Digester (web.xml,
web-fragment.xml, *.tld) and JspDocumentParser (*.jspx, *.tagx)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1544208,1544210
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1544211&r1=1544210&r2=1544211&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
Thu Nov 21 15:21:54 2013
@@ -1428,16 +1428,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/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1544211&r1=1544210&r2=1544211&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu
Nov 21 15:21:54 2013
@@ -468,7 +468,15 @@ public class Digester extends DefaultHan
if (factory == null) {
factory = SAXParserFactory.newInstance();
+
factory.setNamespaceAware(namespaceAware);
+ // Preserve xmlns attributes
+ if (namespaceAware) {
+ factory.setFeature(
+ "http://xml.org/sax/features/namespace-prefixes";,
+ true);
+ }
+
factory.setValidating(validating);
if (validating) {
// Enable DTD validation
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
