luehe 2003/08/04 15:55:45
Modified: jasper2/src/share/org/apache/jasper/compiler Compiler.java
Validator.java PageInfo.java
Log:
Have 'isELIgnored' page directive attribute take precendence over JSP
config <el-ignored>. This is according to the spec.
Revision Changes Path
1.68 +10 -11
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java
Index: Compiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Compiler.java,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- Compiler.java 4 Aug 2003 15:09:41 -0000 1.67
+++ Compiler.java 4 Aug 2003 22:55:44 -0000 1.68
@@ -209,17 +209,16 @@
JspConfig.JspProperty jspProperty =
jspConfig.findJspProperty(ctxt.getJspFile());
- // If the current uri is matched by a pattern specified in
- // a jsp-property-group in web.xml, initialize pageInfo with
- // those properties.
- if (jspProperty.isELIgnored() != null) {
- pageInfo.setELIgnoredSpecified(true);
- }
- pageInfo.setELIgnored(JspUtil.booleanValue(jspProperty.isELIgnored()));
-
pageInfo.setScriptingInvalid(JspUtil.booleanValue(jspProperty.isScriptingInvalid()));
- if (jspProperty.getIncludePrelude() != null) {
- pageInfo.setIncludePrelude(jspProperty.getIncludePrelude());
- }
+ /*
+ * If the current uri is matched by a pattern specified in
+ * a jsp-property-group in web.xml, initialize pageInfo with
+ * those properties.
+ */
+ pageInfo.setELIgnored(JspUtil.booleanValue(jspProperty.isELIgnored()));
+
pageInfo.setScriptingInvalid(JspUtil.booleanValue(jspProperty.isScriptingInvalid()));
+ if (jspProperty.getIncludePrelude() != null) {
+ pageInfo.setIncludePrelude(jspProperty.getIncludePrelude());
+ }
if (jspProperty.getIncludeCoda() != null) {
pageInfo.setIncludeCoda(jspProperty.getIncludeCoda());
}
1.112 +5 -11
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Validator.java,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- Validator.java 23 Jul 2003 20:37:24 -0000 1.111
+++ Validator.java 4 Aug 2003 22:55:44 -0000 1.112
@@ -196,10 +196,7 @@
}
} else if ("isELIgnored".equals(attr)) {
if (pageInfo.getIsELIgnored() == null) {
- if (!pageInfo.isELIgnoredSpecified()) {
- // If specified in jsp-config, use it
- pageInfo.setIsELIgnored(value, n, err, true);
- }
+ pageInfo.setIsELIgnored(value, n, err, true);
} else if (!pageInfo.getIsELIgnored().equals(value)) {
err.jspError(n, "jsp.error.page.conflict.iselignored",
pageInfo.getIsELIgnored(), value);
@@ -268,10 +265,7 @@
}
} else if ("isELIgnored".equals(attr)) {
if (pageInfo.getIsELIgnored() == null) {
- if (!pageInfo.isELIgnoredSpecified()) {
- // If specified in jsp-config, use it
- pageInfo.setIsELIgnored(value, n, err, false);
- }
+ pageInfo.setIsELIgnored(value, n, err, false);
} else if (!pageInfo.getIsELIgnored().equals(value)) {
err.jspError(n, "jsp.error.tag.conflict.iselignored",
pageInfo.getIsELIgnored(), value);
1.36 +3 -12
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java
Index: PageInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/PageInfo.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- PageInfo.java 1 Aug 2003 17:10:10 -0000 1.35
+++ PageInfo.java 4 Aug 2003 22:55:44 -0000 1.36
@@ -104,7 +104,6 @@
private boolean scriptingInvalid = false;
private String isELIgnoredValue;
private boolean isELIgnored = false;
- private boolean elIgnoredSpecified = false;
private String omitXmlDecl = null;
private boolean isJspPrefixHijacked;
@@ -194,14 +193,6 @@
public boolean isScriptingInvalid() {
return scriptingInvalid;
- }
-
- public void setELIgnoredSpecified(boolean s) {
- elIgnoredSpecified = s;
- }
-
- public boolean isELIgnoredSpecified() {
- return elIgnoredSpecified;
}
public List getIncludePrelude() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
