You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ho...@apache.org on 2004/06/25 18:32:29 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tlv JstlBaseTLV.java
horwat 2004/06/25 09:32:29
Modified: standard/doc/web ReleaseNotes.html
standard/src/org/apache/taglibs/standard/tlv
JstlBaseTLV.java
Log:
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
1.54 +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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- ReleaseNotes.html 11 Jun 2004 23:39:43 -0000 1.53
+++ ReleaseNotes.html 25 Jun 2004 16:32:29 -0000 1.54
@@ -68,7 +68,10 @@
<blockquote>
<p>Other changes and additions:</p>
<ul>
- <li>Added Junit and Cactus testing framework. Documentation is in README_src.txt available in the source distribution.<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 allowed by the JSTL specification.</li>
+ <li>Trimmed sql dataSource attribute tokens so any spaces in the comma delimited list are ignored.</li>
+ <li>Added Junit and Cactus testing framework. Documentation is in README_src.txt available in the source distribution.</li>
+ <li>Updated licenses to the new Apache License, Version 2.0.</li>
</ul>
</blockquote>
<dt><b>January 2004 • Standard 1.1.0</b>
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JstlBaseTLV.java 28 Feb 2004 01:01:47 -0000 1.14
+++ JstlBaseTLV.java 25 Jun 2004 16:32:29 -0000 1.15
@@ -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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org