Author: markt
Date: Tue Jul 7 14:04:09 2009
New Revision: 791840
URL: http://svn.apache.org/viewvc?rev=791840&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
Add uri of broken TLD to error message to help debugging
Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791840&r1=791839&r2=791840&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul 7 14:04:09 2009
@@ -231,6 +231,10 @@
security manager as required by the specification. (markt)
</fix>
<fix>
+ <bug>38897</bug>: Add uri of broken TLD to error message to aid
+ debugging. (markt)
+ </fix>
+ <fix>
<bug>41606</bug>: Fix double initialisation of JSPs. Patch provided by
Chris Halstead. (markt)
</fix>
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=791840&r1=791839&r2=791840&view=diff
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Tue Jul 7 14:04:09 2009
@@ -278,11 +278,11 @@
if (tlibversion == null) {
err.jspError("jsp.error.tld.mandatory.element.missing",
- "tlib-version");
+ "tlib-version", uri);
}
if (jspversion == null) {
err.jspError("jsp.error.tld.mandatory.element.missing",
- "jsp-version");
+ "jsp-version", uri);
}
this.tags = new TagInfo[tagVector.size()];
Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties?rev=791840&r1=791839&r2=791840&view=diff
==============================================================================
---
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
(original)
+++
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/resources/LocalStrings.properties
Tue Jul 7 14:04:09 2009
@@ -327,7 +327,7 @@
jsp.error.tld.fn.duplicate.name=Duplicate function name {0} in tag library {1}
jsp.error.tld.fn.invalid.signature.commaexpected=Invalid syntax for function
signature in TLD. Comma ',' expected. Tag Library: {0}, Function: {1}.
jsp.error.tld.fn.invalid.signature.parenexpected=Invalid syntax for function
signature in TLD. Parenthesis '(' expected. Tag Library: {0}, Function: {1}.
-jsp.error.tld.mandatory.element.missing=Mandatory TLD element missing or
empty: {0}
+jsp.error.tld.mandatory.element.missing=Mandatory TLD element {0} missing or
empty in TLD {1}
jsp.error.dynamic.attributes.not.implemented=The {0} tag declares that it
accepts dynamic attributes but does not implement the required interface
jsp.error.nomatching.fragment=Cannot find an attribute directive (with
name={0} and fragment=true) prior to the fragment directive.
jsp.error.attribute.noequal=equal symbol expected
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
