Author: remm
Date: Wed Nov 1 04:42:53 2006
New Revision: 469890
URL: http://svn.apache.org/viewvc?view=rev&rev=469890
Log:
- Check for some of the errors.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
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=469890&r1=469889&r2=469890
==============================================================================
--- 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
Wed Nov 1 04:42:53 2006
@@ -201,7 +201,9 @@
}
String deferredValueType =
n.getAttributeValue("deferredValueType");
if (deferredValueType != null) {
- deferredValue = true;
+ if (!deferredValue) {
+ err.jspError(n,
"jsp.error.deferredvaluetypewithoutdeferredvalue");
+ }
} else if (deferredValue) {
deferredValueType = "java.lang.Object";
} else {
@@ -218,11 +220,17 @@
String deferredMethodSignature = n
.getAttributeValue("deferredMethodSignature");
if (deferredMethodSignature != null) {
- deferredMethod = true;
+ if (!deferredMethod) {
+ err.jspError(n,
"jsp.error.deferredmethodsignaturewithoutdeferredmethod");
+ }
} else if (deferredMethod) {
deferredMethodSignature = "void methodname()";
}
+ if (deferredMethod && deferredValue) {
+ err.jspError(n, "jsp.error.deferredmethodandvalue");
+ }
+
String attrName = n.getAttributeValue("name");
boolean required = JspUtil.booleanValue(n
.getAttributeValue("required"));
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties?view=diff&rev=469890&r1=469889&r2=469890
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/jasper/resources/LocalStrings.properties
Wed Nov 1 04:42:53 2006
@@ -325,6 +325,9 @@
jsp.error.attribute.noquote=quote symbol expected
jsp.error.attribute.unterminated=attribute for {0} is not properly terminated
jsp.error.missing.tagInfo=TagInfo object for {0} is missing from TLD
+jsp.error.deferredmethodsignaturewithoutdeferredmethod=Cannot specify a method
signature if 'deferredMethod' is not 'true'
+jsp.error.deferredvaluetypewithoutdeferredvalue=Cannot specify a value type if
'deferredValue' is not 'true'
+jsp.error.deferredmethodandvalue='deferredValue' and 'deferredMethod' cannot
be both 'true'
jsp.error.fragmentwithtype=Cannot specify both 'fragment' and 'type'
attributes. If 'fragment' is present, 'type' is fixed as
'javax.servlet.jsp.tagext.JspFragment'
jsp.error.fragmentwithrtexprvalue=Cannot specify both 'fragment' and
'rtexprvalue' attributes. If 'fragment' is present, 'rtexprvalue' is fixed as
'true'
jsp.error.fragmentWithDeclareOrScope=Both 'fragment' and 'declare' or 'scope'
attributes specified in variable directive
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
