costin 01/06/16 13:45:49
Modified: jasper34/generator/org/apache/jasper34/jsptree
TagLibraries.java
Log:
Adapt to the changes in container liaison ( needed to use it as per/context
singleton)
Revision Changes Path
1.5 +5 -2
jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/jsptree/TagLibraries.java
Index: TagLibraries.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper34/generator/org/apache/jasper34/jsptree/TagLibraries.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TagLibraries.java 2001/06/12 15:19:34 1.4
+++ TagLibraries.java 2001/06/16 20:45:49 1.5
@@ -121,8 +121,11 @@
/** Add a taglib prefix and the associated URI.
This is the result of a taglib directive, we'll need to
read the descriptor if not already there.
+
+ @param uriBase the jsp page that loads the taglib, used to resolve
+ relative uris.
*/
- public void addTagLibrary( String prefix, String uri )
+ public void addTagLibrary( String prefix, String uri, String uriBase )
throws JasperException, IOException
{
if( tagLibInfos.get( prefix ) != null ) {
@@ -132,7 +135,7 @@
TagLibraryInfoImpl tl = new TagLibraryInfoImpl(prefix, uri);
- containerL.readTLD( this, tl, prefix, uri );
+ containerL.readTLD( this, tl, prefix, uri, uriBase );
addTagLibrary(prefix, tl);