jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hor...@apache.org
Subject cvs commit: jakarta-taglibs/standard/doc/web ReleaseNotes.html
Date Fri, 25 Jun 2004 16:33:13 GMT
horwat      2004/06/25 09:33:13

  Modified:    standard/src/org/apache/taglibs/standard/tlv Tag:
                        STANDARD_1_0_BRANCH JstlBaseTLV.java
               standard/doc/web Tag: STANDARD_1_0_BRANCH ReleaseNotes.html
  Log:
  Port of JSTL 1.1.x fix.
  
  According to the JSTL specification RT and EL based actions can be mixed. Fixed
  the TLV so it allows the mixing of actions as illustrated in the following example:
  
  ----
      <c_rt:url var="myUrl" value="/jstl" context="/justyna">
          <c:param name="param1" value="value1"/>
      </c_rt:url>
  ----
  
  This fix addresses a specification violation.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.9.2.4   +7 -1      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
  
  Index: JstlBaseTLV.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv/JstlBaseTLV.java,v
  retrieving revision 1.9.2.3
  retrieving revision 1.9.2.4
  diff -u -r1.9.2.3 -r1.9.2.4
  --- JstlBaseTLV.java	28 Feb 2004 06:08:13 -0000	1.9.2.3
  +++ JstlBaseTLV.java	25 Jun 2004 16:33:13 -0000	1.9.2.4
  @@ -205,7 +205,13 @@
   		|| matchUri == null
   		|| matchLn == null)
   	    return false;
  -        return (tagUri.equals(matchUri) && tagLn.equals(matchLn));
  +        // match beginning of URI since some suffix *_rt tags can
  +        // be nested in EL enabled tags as defined by the spec
  +        if (tagUri.length() > matchUri.length()) {
  +            return (tagUri.startsWith(matchUri) && tagLn.equals(matchLn));
  +        } else {
  +            return (matchUri.startsWith(tagUri) && tagLn.equals(matchLn));
  +        }
       }
   
       protected boolean isJspTag(String tagUri, String tagLn, String target) {
  
  
  
  No                   revision
  No                   revision
  1.37.2.10 +4 -1      jakarta-taglibs/standard/doc/web/ReleaseNotes.html
  
  Index: ReleaseNotes.html
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/doc/web/ReleaseNotes.html,v
  retrieving revision 1.37.2.9
  retrieving revision 1.37.2.10
  diff -u -r1.37.2.9 -r1.37.2.10
  --- ReleaseNotes.html	12 Jun 2004 00:46:57 -0000	1.37.2.9
  +++ ReleaseNotes.html	25 Jun 2004 16:33:13 -0000	1.37.2.10
  @@ -71,7 +71,10 @@
       <blockquote>
         <p>Other changes and additions:</p>
         <ul>
  -        <li>Updated licenses to the new Apache License, Version 2.0.
  +        <li>Fixed Core TLV to allow EL and RT based actions to be mixed as allow
  +ed by the JSTL specification.</li>
  +        <li>Trimmed sql dataSource attribute tokens so any spaces in the comma delimited
list are ignored.</li>
  +        <li>Updated licenses to the new Apache License, Version 2.0.</li>
         </ul>
       </blockquote>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org


Mime
View raw message