luehe 2003/02/13 12:58:42
Modified: jasper2/src/share/org/apache/jasper/compiler
ImplicitTagLibraryInfo.java
Log:
Fixed 17059: o.a.j.compiler.ImplicitTagLibraryInfo doesn't include tag
files with the extension of .tagx when generating an implicit TLD
Revision Changes Path
1.19 +14 -8
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java
Index: ImplicitTagLibraryInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/ImplicitTagLibraryInfo.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ImplicitTagLibraryInfo.java 18 Dec 2002 23:18:20 -0000 1.18
+++ ImplicitTagLibraryInfo.java 13 Feb 2003 20:58:42 -0000 1.19
@@ -79,6 +79,7 @@
private static final String WEB_INF_TAGS = "/WEB-INF/tags";
private static final String TAG_FILE_SUFFIX = ".tag";
+ private static final String TAGX_FILE_SUFFIX = ".tagx";
private static final String TAGS_SHORTNAME = "tags";
private static final String TLIB_VERSION = "1.0";
private static final String JSP_VERSION = "2.0";
@@ -128,13 +129,18 @@
Iterator it = dirList.iterator();
while (it.hasNext()) {
String path = (String) it.next();
- if (path.endsWith(TAG_FILE_SUFFIX)) {
- // use the filename of the tag file, without the .tag
- // extension, as the <name> subelement of the "imaginary"
- // <tag-file> element
+ if (path.endsWith(TAG_FILE_SUFFIX)
+ || path.endsWith(TAGX_FILE_SUFFIX)) {
+ /*
+ * Use the filename of the tag file, without the .tag or
+ * .tagx extension, respectively, as the <name> subelement
+ * of the "imaginary" <tag-file> element
+ */
+ String suffix = path.endsWith(TAG_FILE_SUFFIX) ?
+ TAG_FILE_SUFFIX : TAGX_FILE_SUFFIX;
String tagName = path.substring(path.lastIndexOf("/") + 1);
tagName = tagName.substring(0,
- tagName.lastIndexOf(TAG_FILE_SUFFIX));
+ tagName.lastIndexOf(suffix));
tagFileMap.put(tagName, path);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
