You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/11/16 16:57:39 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java
pierred 00/11/16 07:57:38
Modified: src/share/org/apache/jasper/compiler Tag: tomcat_32
TagLibraryInfoImpl.java
Log:
Do not copy taglib jar file to the work directory
Revision Changes Path
No revision
No revision
1.22.2.6 +7 -5 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.22.2.5
retrieving revision 1.22.2.6
diff -u -r1.22.2.5 -r1.22.2.6
--- TagLibraryInfoImpl.java 2000/10/06 11:09:38 1.22.2.5
+++ TagLibraryInfoImpl.java 2000/11/16 15:57:38 1.22.2.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.22.2.5 2000/10/06 11:09:38 larryi Exp $
- * $Revision: 1.22.2.5 $
- * $Date: 2000/10/06 11:09:38 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v 1.22.2.6 2000/11/16 15:57:38 pierred Exp $
+ * $Revision: 1.22.2.6 $
+ * $Date: 2000/11/16 15:57:38 $
*
* The Apache Software License, Version 1.1
*
@@ -234,6 +234,8 @@
}
// FIXME Take this stuff out when taglib changes are thoroughly tested.
+ // 2000.11.15 commented out the 'copy to work dir' section,
+ // which I believe is what this FIXME comment referred to. (pierred)
if (uri.endsWith("jar")) {
if (!isRelativeURI(uri)) {
@@ -248,6 +250,7 @@
this.jarEntries = new Hashtable();
this.ctxt = ctxt;
+ /* NOT COMPILED
// First copy this file into our work directory!
{
File jspFile = new File(ctxt.getJspFile());
@@ -278,8 +281,7 @@
ctxt.addJar(jarFileName);
}
-
-
+ */ // END NOT COMPILED
boolean tldFound = false;
ZipEntry entry;
while ((entry = zin.getNextEntry()) != null) {