From ee9266fd7f006c4214d2f8e7075d7bd9437a3f8b Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 5 Jul 2009 13:25:21 +0000 Subject: [PATCH] Improve error message to include TDL uri when there is a problem with a tld so user knows which TLD to look at git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@791243 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/jasper/compiler/TagLibraryInfoImpl.java | 4 ++-- java/org/apache/jasper/resources/LocalStrings.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java index faad83816..05372f9ce 100644 --- a/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java +++ b/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java @@ -278,11 +278,11 @@ class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { 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()]; diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index abf4acb4b..26f10672c 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -335,7 +335,7 @@ jsp.error.tld.fn.invalid.signature=Invalid syntax for function signature in TLD. 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 -- 2.11.0