You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ha...@hyperreal.org on 1999/11/10 03:22:34 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
harishp 99/11/09 18:22:34
Modified: src/share/org/apache/jasper/compiler Tag:
TOMCAT_J2EE_10F_102199 TagLibraryInfoImpl.java
Log:
Made it handle the case where there is no web.xml in the WEB-INF
directory, but has taglibs ..
Submitted by: Harish
Reviewed by: Mandar
Revision Changes Path
No revision
No revision
1.5.2.3 +5 -7 jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Index: TagLibraryInfoImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- TagLibraryInfoImpl.java 1999/10/27 09:44:53 1.5.2.2
+++ TagLibraryInfoImpl.java 1999/11/10 02:22:32 1.5.2.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.5.2.2 1999/10/27 09:44:53 akv Exp $
- * $Revision: 1.5.2.2 $
- * $Date: 1999/10/27 09:44:53 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.5.2.3 1999/11/10 02:22:32 harishp Exp $
+ * $Revision: 1.5.2.3 $
+ * $Date: 1999/11/10 02:22:32 $
*
* ====================================================================
*
@@ -151,9 +151,7 @@
// Parse web.xml.
InputStream is = ctxt.getServletContext().getResourceAsStream(WEBAPP_INF);
- if (is == null) {
- throw new IOException(Constants.getString("jsp.error.webxml_not_found"));
- }
+ if (is != null) {
URL dtdURL = this.getClass().getResource(Constants.WEBAPP_DTD_RESOURCE);
XmlDocument webtld = JspUtil.parseXMLDoc(is, dtdURL,
@@ -195,7 +193,7 @@
this.uri = tagLoc;
}
}
-
+ }
// "uri" should point to the correct tld location.
if (!uri.startsWith("/")) {