Author: remm
Date: Mon Dec 4 17:02:06 2006
New Revision: 482434
URL: http://svn.apache.org/viewvc?view=rev&rev=482434
Log:
- Add 1.2 as well.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?view=diff&rev=482434&r1=482433&r2=482434
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Mon Dec 4 17:02:06 2006
@@ -273,7 +273,7 @@
}
}
- if ("2.0".equals(tagLibInfo.getRequiredVersion())
+ if (("2.0".equals(tagLibInfo.getRequiredVersion()) ||
("1.2".equals(tagLibInfo.getRequiredVersion())))
&& (deferredMethodSpecified || deferredMethod
|| deferredValueSpecified || deferredValue)) {
err.jspError("jsp.error.invalid.version", path);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java?view=diff&rev=482434&r1=482433&r2=482434
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Validator.java Mon Dec
4 17:02:06 2006
@@ -706,7 +706,8 @@
if (n.getType() == '#') {
if (!pageInfo.isDeferredSyntaxAllowedAsLiteral()
&& (tagInfo == null
- || ((tagInfo != null) &&
!tagInfo.getTagLibrary().getRequiredVersion().equals("2.0")))) {
+ || ((tagInfo != null) &&
!(tagInfo.getTagLibrary().getRequiredVersion().equals("2.0")
+ ||
tagInfo.getTagLibrary().getRequiredVersion().equals("1.2"))))) {
err.jspError(n, "jsp.error.el.template.deferred");
} else {
return;
@@ -1024,7 +1025,8 @@
&& (attrs.getURI(i) == null
|| attrs.getURI(i).length() == 0 || attrs
.getURI(i).equals(n.getURI()))) {
- boolean checkDeferred =
!tagInfo.getTagLibrary().getRequiredVersion().equals("2.0");
+ boolean checkDeferred =
!(tagInfo.getTagLibrary().getRequiredVersion().equals("2.0")
+ ||
tagInfo.getTagLibrary().getRequiredVersion().equals("1.2"));
boolean deferred = false;
boolean deferredValueIsLiteral = false;
boolean expression = isExpression(n,
attrs.getValue(i), checkDeferred);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
