horwat 2004/09/03 10:09:59
Modified: standard/doc/web ReleaseNotes.html
standard/src/org/apache/taglibs/standard/tag/common/xml
TransformSupport.java
Log:
In JstlUriResolver when external entitities are resolved the 'base' varies from
different Xalan implementations. Fixed how base is handled to avoid problems with
newer versions of Xalan like the one in JDK 5.0.
Revision Changes Path
1.57 +8 -0 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ReleaseNotes.html 17 Aug 2004 22:48:21 -0000 1.56
+++ ReleaseNotes.html 3 Sep 2004 17:09:59 -0000 1.57
@@ -63,6 +63,14 @@
</table>
</blockquote>
</ul>
+ </ul>
+ <blockquote>
+ <p>Other changes and additions:</p>
+ <ul>
+ <li>In JstlUriResolver when external entitities are resolved the 'base'
varies from different Xalan implementations. Fixed how base is handled.</li>
+ </ul>
+ </blockquote>
+
<dt><b>July 2004 • Standard 1.1.1</b></dt>
<p>The latest implementation is available from the Nightly Builds.</p>
1.17 +6 -2
jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
Index: TransformSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TransformSupport.java 28 Feb 2004 01:01:45 -0000 1.16
+++ TransformSupport.java 3 Sep 2004 17:09:59 -0000 1.17
@@ -331,8 +331,12 @@
return null;
// remove "jstl" marker from 'base'
- if (base != null && base.startsWith("jstl:"))
- base = base.substring(5);
+ // NOTE: how 'base' is determined varies among different Xalan
+ // xsltc implementations
+ int index;
+ if (base != null && (index = base.indexOf("jstl:")) != -1) {
+ base = base.substring(index + 5);
+ }
// we're only concerned with relative URLs
if (ImportSupport.isAbsoluteUrl(href)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
