You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/05 14:36:22 UTC
svn commit: r1712767 - in /tomcat/trunk: conf/ java/org/apache/jasper/
java/org/apache/jasper/resources/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Thu Nov 5 13:36:22 2015
New Revision: 1712767
URL: http://svn.apache.org/viewvc?rev=1712767&view=rev
Log:
Remove the deprecated STRICT_QUOTE_ESCAPING system property
Modified:
tomcat/trunk/conf/web.xml
tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/trunk/java/org/apache/jasper/JspC.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/webapps/docs/config/systemprops.xml
tomcat/trunk/webapps/docs/jasper-howto.xml
Modified: tomcat/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=1712767&r1=1712766&r2=1712767&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Thu Nov 5 13:36:22 2015
@@ -246,9 +246,6 @@
<!-- attribute values, should the rules in JSP.1.6 -->
<!-- for the escaping of quote characters be -->
<!-- strictly applied? [true] -->
- <!-- The default can be changed with the -->
- <!-- org.apache.jasper.compiler.Parser. -->
- <!-- STRICT_QUOTE_ESCAPING system property. -->
<servlet>
<servlet-name>jsp</servlet-name>
Modified: tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=1712767&r1=1712766&r2=1712767&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java (original)
+++ tomcat/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Thu Nov 5 13:36:22 2015
@@ -200,18 +200,10 @@ public final class EmbeddedServletOption
private int jspIdleTimeout = -1;
/**
- * System property that controls if the strict quoting rules are applied
- * when parsing attribute values that use scriptlet expressions (<%=...%>).
- */
- private static final boolean STRICT_QUOTE_ESCAPING_DEFAULT= Boolean.parseBoolean(
- System.getProperty(
- "org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
- "true"));
- /**
* Should JSP.1.6 be applied strictly to attributes defined using scriptlet
* expressions?
*/
- private boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+ private boolean strictQuoteEscaping = true;
public String getProperty(String name ) {
return settings.getProperty( name );
@@ -768,8 +760,7 @@ public final class EmbeddedServletOption
this.strictQuoteEscaping = false;
} else {
if (log.isWarnEnabled()) {
- log.warn(Localizer.getMessage("jsp.warning.strictQuoteEscaping",
- Boolean.toString(STRICT_QUOTE_ESCAPING_DEFAULT)));
+ log.warn(Localizer.getMessage("jsp.warning.strictQuoteEscaping"));
}
}
}
Modified: tomcat/trunk/java/org/apache/jasper/JspC.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspC.java?rev=1712767&r1=1712766&r2=1712767&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspC.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspC.java Thu Nov 5 13:36:22 2015
@@ -107,15 +107,6 @@ public class JspC extends Task implement
// Logger
private static final Log log = LogFactory.getLog(JspC.class);
- /**
- * System property that controls if the strict quoting rules are applied
- * when parsing attribute values that use scriptlet expressions (<%=...%>).
- */
- private static final boolean STRICT_QUOTE_ESCAPING_DEFAULT= Boolean.parseBoolean(
- System.getProperty(
- "org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING",
- "true"));
-
protected static final String SWITCH_VERBOSE = "-v";
protected static final String SWITCH_HELP = "-help";
protected static final String SWITCH_OUTPUT_DIR = "-d";
@@ -181,7 +172,7 @@ public class JspC extends Task implement
protected boolean validateTld;
protected boolean validateXml;
protected boolean blockExternal = true;
- protected boolean strictQuoteEscaping = STRICT_QUOTE_ESCAPING_DEFAULT;
+ protected boolean strictQuoteEscaping = true;
protected boolean xpoweredBy;
protected boolean mappedFile = false;
protected boolean poolingEnabled = true;
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=1712767&r1=1712766&r2=1712767&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Thu Nov 5 13:36:22 2015
@@ -123,7 +123,7 @@ jsp.warning.suppressSmap=Warning: Invali
jsp.warning.displaySourceFragment=Warning: Invalid value for the initParam displaySourceFragment. Will use the default value of \"true\"
jsp.warning.maxLoadedJsps=Warning: Invalid value for the initParam maxLoadedJsps. Will use the default value of \"-1\"
jsp.warning.jspIdleTimeout=Warning: Invalid value for the initParam jspIdleTimeout. Will use the default value of \"-1\"
-jsp.warning.strictQuoteEscaping=Warning: Invalid value for the initParam strictQuoteEscaping. Will use the default value of \"{0}\"
+jsp.warning.strictQuoteEscaping=Warning: Invalid value for the initParam strictQuoteEscaping. Will use the default value of \"true\"
jsp.warning.unknown.element.in.taglib=Unknown element ({0}) in taglib
jsp.warning.unknown.element.in.tag=Unknown element ({0}) in tag
jsp.warning.unknown.element.in.tagfile=Unknown element ({0}) in tag-file
Modified: tomcat/trunk/webapps/docs/config/systemprops.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/systemprops.xml?rev=1712767&r1=1712766&r2=1712767&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/systemprops.xml (original)
+++ tomcat/trunk/webapps/docs/config/systemprops.xml Thu Nov 5 13:36:22 2015
@@ -138,13 +138,6 @@
will be used.</p>
</property>
- <property name="org.apache.jasper.compiler. Parser.STRICT_QUOTE_ESCAPING">
- <p><strong>Deprecated</strong>. Configures the default setting for the
- <code>strictQuoteEscaping</code> JSP initialisation paramater.</p>
- <p>If not specified, the specification compliant default of
- <code>true</code> will be used.</p>
- </property>
-
<property name="org.apache.jasper.compiler. Parser.STRICT_WHITESPACE">
<p>If <code>false</code> the requirements for whitespace before an
attribute name will be relaxed so that the lack of whitespace will not
Modified: tomcat/trunk/webapps/docs/jasper-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1712767&r1=1712766&r2=1712767&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Thu Nov 5 13:36:22 2015
@@ -201,9 +201,7 @@ default <code>false</code>.</li>
<li><strong>strictQuoteEscaping</strong> - When scriptlet expressions are used
for attribute values, should the rules in JSP.1.6 for the escaping of quote
characters be strictly applied? <code>true</code> or <code>false</code>, default
-<code>true</code> which can be changed with the
-<code>org.apache.jasper.compiler.Parser.STRICT_QUOTE_ESCAPING</code> system
-property.</li>
+<code>true</code>.</li>
</ul>
<p>The Java compiler from Eclipse JDT in included as the default compiler. It is
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org