You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by lu...@apache.org on 2003/01/13 21:09:47 UTC

cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler TagLibraryInfoImpl.java

luehe       2003/01/13 12:09:46

  Modified:    jasper2/src/share/org/apache/jasper/compiler
                        TagLibraryInfoImpl.java
  Log:
  Added support for new 'version' attribute of <taglib> element, which
  has been added in JSP 2.0 to replace the <jsp-version> subelement
  
  Revision  Changes    Path
  1.32      +10 -5     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java
  
  Index: TagLibraryInfoImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/TagLibraryInfoImpl.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- TagLibraryInfoImpl.java	18 Dec 2002 23:18:21 -0000	1.31
  +++ TagLibraryInfoImpl.java	13 Jan 2003 20:09:44 -0000	1.32
  @@ -248,11 +248,16 @@
           // Create an iterator over the child elements of our <taglib> element
           ParserUtils pu = new ParserUtils();
           TreeNode tld = pu.parseXMLDocument(uri, in);
  -        Iterator list = tld.findChildren();
  +
  +	// Check to see if the <taglib> root element contains a 'version'
  +	// attribute, which was added in JSP 2.0 to replace the <jsp-version>
  +	// subelement
  +	this.jspversion = tld.findAttribute("version");
   
           // Process each child element of our <taglib> element
  -        while (list.hasNext()) {
  +        Iterator list = tld.findChildren();
   
  +        while (list.hasNext()) {
               TreeNode element = (TreeNode) list.next();
               String tname = element.getName();
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>