Author: markt
Date: Tue Nov 26 14:12:15 2013
New Revision: 1545668
URL: http://svn.apache.org/r1545668
Log:
Remove the option to use schema validation for *.jspx and *.tagx files
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1545665
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Context.java Tue Nov 26
14:12:15 2013
@@ -693,24 +693,6 @@ public interface Context extends Contain
/**
- * Will the parsing of *.jspx and *.tagx files for this Context be
performed
- * by a validating parser?
- *
- * @return true if validation is enabled.
- */
- public boolean getXmlValidationJspDoc();
-
-
- /**
- * Controls whether the parsing of *.jspx and *.tagx files for this Context
- * will be performed by a validating parser.
- *
- * @param xmlValidationJspDoc true to enable xml validation
- */
- public void setXmlValidationJspDoc(boolean xmlValidationJspDoc);
-
-
- /**
* Get the Jar Scanner to be used to scan for JAR resources for this
* context.
* @return The Jar Scanner configured for this context.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Tue Nov 26
14:12:15 2013
@@ -316,14 +316,4 @@ public final class Globals {
*/
public static final String JASPER_XML_VALIDATION_TLD_INIT_PARAM =
"org.apache.jasper.XML_VALIDATE_TLD";
-
-
- /**
- * Name of the ServletContext init-param that determines if the JSP engine
- * should validate *.jspx and *.tagx files when parsing them.
- * <p>
- * This must be kept in sync with org.apache.jasper.Constants
- */
- public static final String JASPER_XML_VALIDATION_DOC_INIT_PARAM =
- "org.apache.jasper.XML_VALIDATE_DOC";
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Tue Nov 26 14:12:15 2013
@@ -325,9 +325,6 @@ public class ApplicationContext
if (Globals.JASPER_XML_VALIDATION_TLD_INIT_PARAM.equals(name) &&
context.getTldValidation()) {
return "true";
- } else if (Globals.JASPER_XML_VALIDATION_DOC_INIT_PARAM.equals(name) &&
- context.getXmlValidationJspDoc()) {
- return "true";
}
return parameters.get(name);
}
@@ -346,9 +343,6 @@ public class ApplicationContext
if (context.getTldValidation()) {
names.add(Globals.JASPER_XML_VALIDATION_TLD_INIT_PARAM);
}
- if (context.getXmlValidationJspDoc()) {
- names.add(Globals.JASPER_XML_VALIDATION_DOC_INIT_PARAM);
- }
return Collections.enumeration(names);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Tue
Nov 26 14:12:15 2013
@@ -739,13 +739,6 @@ public class StandardContext extends Con
/**
- * Attribute value used to turn on/off XML validation for *.jspx and *.tagx
- * files.
- */
- private boolean xmlValidationJspDoc = false;
-
-
- /**
* Attribute value used to turn on/off XML namespace validation
*/
private boolean webXmlNamespaceAware = Globals.STRICT_SERVLET_COMPLIANCE;
@@ -6649,18 +6642,6 @@ public class StandardContext extends Con
}
- @Override
- public void setXmlValidationJspDoc(boolean webXmlValidationJspDoc){
- this.xmlValidationJspDoc = webXmlValidationJspDoc;
- }
-
-
- @Override
- public boolean getXmlValidationJspDoc(){
- return xmlValidationJspDoc;
- }
-
-
/**
* Sets the process TLDs attribute.
*
@@ -6670,6 +6651,7 @@ public class StandardContext extends Con
processTlds = newProcessTlds;
}
+
/**
* Returns the processTlds attribute value.
*/
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/FailedContext.java
Tue Nov 26 14:12:15 2013
@@ -436,11 +436,6 @@ public class FailedContext extends Lifec
public void setTldNamespaceAware(boolean tldNamespaceAware) { /* NO-OP */ }
@Override
- public boolean getXmlValidationJspDoc() { return false; }
- @Override
- public void setXmlValidationJspDoc(boolean xmlValidationJspDoc) { /* NO-OP
*/ }
-
- @Override
public JarScanner getJarScanner() { return null; }
@Override
public void setJarScanner(JarScanner jarScanner) { /* NO-OP */ }
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/Constants.java Tue Nov 26
14:12:15 2013
@@ -241,14 +241,4 @@ public class Constants {
*/
public static final String XML_VALIDATION_TLD_INIT_PARAM =
"org.apache.jasper.XML_VALIDATE_TLD";
-
-
- /**
- * Name of the ServletContext init-param that determines if the XML parsers
- * used for *.jspx and *.tagx files will be validating or not.
- * <p>
- * This must be kept in sync with org.apache.catalina.Globals
- */
- public static final String XML_VALIDATION_DOC_INIT_PARAM =
- "org.apache.jasper.XML_VALIDATE_DOC";
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/JspC.java Tue Nov 26 14:12:15
2013
@@ -127,7 +127,6 @@ public class JspC extends Task implement
protected static final String SWITCH_SMAP = "-smap";
protected static final String SWITCH_DUMP_SMAP = "-dumpsmap";
protected static final String SWITCH_VALIDATE_TLD = "-validateTld";
- protected static final String SWITCH_VALIDATE_DOC = "-validateDoc";
protected static final String SHOW_SUCCESS ="-s";
protected static final String LIST_ERRORS = "-l";
protected static final int INC_WEBXML = 10;
@@ -159,7 +158,6 @@ public class JspC extends Task implement
protected boolean trimSpaces = false;
protected boolean genStringAsCharArray = false;
protected boolean validateTld;
- protected boolean validateJspDoc;
protected boolean xpoweredBy;
protected boolean mappedFile = false;
protected boolean poolingEnabled = true;
@@ -369,8 +367,6 @@ public class JspC extends Task implement
smapDumped = true;
} else if (tok.equals(SWITCH_VALIDATE_TLD)) {
setValidateTld(true);
- } else if (tok.equals(SWITCH_VALIDATE_DOC)) {
- setValidateJspDoc(true);
} else {
if (tok.startsWith("-")) {
throw new JasperException("Unrecognized option: " + tok +
@@ -858,14 +854,6 @@ public class JspC extends Task implement
return validateTld;
}
- public void setValidateJspDoc( boolean b ) {
- this.validateJspDoc = b;
- }
-
- public boolean isValidateJspDoc() {
- return validateJspDoc;
- }
-
public void setListErrors( boolean b ) {
listErrors = b;
}
@@ -1444,9 +1432,6 @@ public class JspC extends Task implement
} catch (MalformedURLException me) {
System.out.println("**" + me);
}
- if (isValidateJspDoc()) {
- context.setInitParameter(Constants.XML_VALIDATION_DOC_INIT_PARAM,
"true");
- }
if (isValidateTld()) {
context.setInitParameter(Constants.XML_VALIDATION_TLD_INIT_PARAM,
"true");
}
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=1545668&r1=1545667&r2=1545668&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
Tue Nov 26 14:12:15 2013
@@ -30,7 +30,6 @@ import javax.servlet.jsp.tagext.TagLibra
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.jasper.Constants;
import org.apache.jasper.JasperException;
import org.apache.jasper.JspCompilationContext;
import org.xml.sax.Attributes;
@@ -163,13 +162,10 @@ class JspDocumentParser
jspDocParser.isTop = false;
}
- boolean validate = Boolean.parseBoolean(
-
pc.getJspCompilationContext().getServletContext().getInitParameter(
- Constants.XML_VALIDATION_DOC_INIT_PARAM));
- jspDocParser.isValidating = validate;
+ jspDocParser.isValidating = false;
// Parse the input
- SAXParser saxParser = getSAXParser(validate, jspDocParser);
+ SAXParser saxParser = getSAXParser(false, jspDocParser);
InputStream inStream = null;
try {
inStream = JspUtil.getInputStream(path, jarFile,
Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/core/TesterContext.java Tue
Nov 26 14:12:15 2013
@@ -571,16 +571,6 @@ public class TesterContext implements Co
}
@Override
- public boolean getXmlValidationJspDoc() {
- return false;
- }
-
- @Override
- public void setXmlValidationJspDoc(boolean xmlValidationJspDoc) {
- // NO-OP
- }
-
- @Override
public void setXmlValidation(boolean xmlValidation) {
// NO-OP
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Nov 26 14:12:15 2013
@@ -155,11 +155,6 @@
Deprecate the <code>tldNamespaceAware</code> Context attribute as TLDs
are always parsed with a namespace aware parser. (markt)
</fix>
- <add>
- Add a new <code>xmlValidationJspDoc</code> attribute to the Context to
- control if Jasper (the JSP engine) uses a validating parser when
- processing *.jspx and *.tagx files. (markt)
- </add>
<fix>
Correct a logic error that meant that unpackWARs was ignored and the
WAR
was always expanded if a WAR failed to deploy. (markt)
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml?rev=1545668&r1=1545667&r2=1545668&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/context.xml Tue Nov 26 14:12:15
2013
@@ -553,15 +553,6 @@
penalty.</p>
</attribute>
- <attribute name="xmlValidationJspDoc" required="false">
- <p>If the value of this flag is <code>true</code>, the parsing of
- <code>*.jspx</code> and <code>*.tagx</code> files for this web
- application will use a validating parser. Before enabling this option
- users should review section JSP.6.2.4 of the JSP 2.3 specification. The
- default value will be <code>false</code>. Setting this attribute to
- <code>true</code> will incur a performance penalty.</p>
- </attribute>
-
</attributes>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
