jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pier...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core ForEachSupport.java OutSupport.java Util.java
Date Tue, 25 Mar 2003 19:43:25 GMT
pierred     2003/03/25 11:43:25

  Modified:    standard/conf c.tld fmt.tld fn.tld permittedTaglibs.tld
                        sql.tld x.tld
               standard/doc/web GettingStarted.html
               standard/examples/web ShowSource.jsp
               standard/examples/web/conditionals Choose.jsp
                        CustomLogicTag.jsp FailureLocal.jsp If.jsp
               standard/examples/web/elsupport Out.jsp Set.jsp Set2.jsp
               standard/examples/web/format FormatDateTime.jsp
                        FormatDateTimeBrowserLocale.jsp FormatNumber.jsp
                        FormatNumberBrowserLocale.jsp GermanLocale.jsp
                        GermanUmlautCorrect.jsp GermanUmlautIncorrect.jsp
                        ItalianLocale.jsp MissingResourceBundle.jsp
                        ParametricReplacement.jsp PrefixAttribute.jsp
                        UndefinedKey.jsp
               standard/examples/web/functions Functions.jsp
               standard/examples/web/import Absolute.jsp AbsoluteFtp.jsp
                        ContextRelative.jsp Encode.jsp
                        EncodeContextRelative.jsp ExposeString.jsp
                        ExposeStringRelative.jsp LocalQueryString.jsp
                        LocalSample.jsp Param.jsp Relative.jsp
                        StartSlash.jsp
               standard/examples/web/iterators Collaboration.jsp
                        DataTypes.jsp ForTokens.jsp Simple.jsp
                        SimpleRange.jsp Status.jsp
               standard/examples/web/misc IteratorTest.jsp
               standard/examples/web/sql DriverSetup.jsp QueryDirect.jsp
                        QueryIterate.jsp QueryParam.jsp Transaction.jsp
                        Update.jsp session.jsp
               standard/examples/web/tlv PermittedTaglibsError.jsp
                        PermittedTaglibsOk.jsp ScriptFreeOk.jsp
               standard/examples/web/xml Filter.jsp ForEach.jsp If.jsp
                        Out.jsp Parse.jsp ParseWithEntities.jsp Set.jsp
                        Transform.jsp TransformWithInclusion.jsp When.jsp
               standard/src/org/apache/taglibs/standard/functions
                        Functions.java
               standard/src/org/apache/taglibs/standard/tag/common/core
                        ForEachSupport.java OutSupport.java Util.java
  Log:
  More work for compliance with JSTL 1.1
    - 13 out of 16 functions implemented
      (only split, join, replace missing)
    - using new URI (http://java.sun.com/jsp/jstl/...
  
  Commented out support for ResultSet in ForEachSupport
  (since it is not supported by c:forEach)
  
  Revision  Changes    Path
  1.24      +1 -1      jakarta-taglibs/standard/conf/c.tld
  
  Index: c.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/c.tld,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- c.tld	18 Mar 2003 18:06:48 -0000	1.23
  +++ c.tld	25 Mar 2003 19:43:21 -0000	1.24
  @@ -9,7 +9,7 @@
     <display-name>JSTL core</display-name>
     <tlib-version>1.1</tlib-version>
     <short-name>c</short-name>
  -  <uri>http://java.sun.com/jstl-el/core</uri>
  +  <uri>http://java.sun.com/jsp/jstl/core</uri>
   
     <validator>
       <description>
  
  
  
  1.29      +1 -1      jakarta-taglibs/standard/conf/fmt.tld
  
  Index: fmt.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/fmt.tld,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- fmt.tld	18 Mar 2003 18:06:48 -0000	1.28
  +++ fmt.tld	25 Mar 2003 19:43:21 -0000	1.29
  @@ -9,7 +9,7 @@
     <display-name>JSTL fmt</display-name>
     <tlib-version>1.1</tlib-version>
     <short-name>fmt</short-name>
  -  <uri>http://java.sun.com/jstl-el/fmt</uri>
  +  <uri>http://java.sun.com/jsp/jstl/fmt</uri>
   
     <validator>
       <description>
  
  
  
  1.2       +67 -1     jakarta-taglibs/standard/conf/fn.tld
  
  Index: fn.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/fn.tld,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- fn.tld	18 Mar 2003 22:56:37 -0000	1.1
  +++ fn.tld	25 Mar 2003 19:43:21 -0000	1.2
  @@ -9,7 +9,67 @@
     <display-name>JSTL functions</display-name>
     <tlib-version>1.1</tlib-version>
     <short-name>fn</short-name>
  -  <uri>http://java.sun.com/jstl-el/functions</uri>
  +  <uri>http://java.sun.com/jsp/jstl/functions</uri>
  +
  +  <function>
  +    <name>contains</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>boolean contains(java.lang.String, java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>containsIgnoreCase</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>boolean containsIgnoreCase(java.lang.String, java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>endsWith</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>boolean endsWith(java.lang.String, java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>escapeXml</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>java.lang.String escapeXml(java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>indexOf</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>int indexOf(java.lang.String, java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>length</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>int length(java.lang.Object)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>startsWith</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>boolean startsWith(java.lang.String, java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>substring</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>java.lang.String substring(java.lang.String, int, int)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>substringAfter</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>java.lang.String substringAfter(java.lang.String, java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>substringBefore</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>java.lang.String substringBefore(java.lang.String, java.lang.String)</function-signature>
  +  </function>
   
     <function>
       <name>toLowerCase</name>
  @@ -21,6 +81,12 @@
       <name>toUpperCase</name>
       <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
       <function-signature>java.lang.String toUpperCase(java.lang.String)</function-signature>
  +  </function>
  +
  +  <function>
  +    <name>trim</name>
  +    <function-class>org.apache.taglibs.standard.functions.Functions</function-class>
  +    <function-signature>java.lang.String trim(java.lang.String)</function-signature>
     </function>
   
   </taglib>
  
  
  
  1.6       +4 -4      jakarta-taglibs/standard/conf/permittedTaglibs.tld
  
  Index: permittedTaglibs.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/permittedTaglibs.tld,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- permittedTaglibs.tld	13 Mar 2003 18:56:56 -0000	1.5
  +++ permittedTaglibs.tld	25 Mar 2003 19:43:21 -0000	1.6
  @@ -18,10 +18,10 @@
       <init-param>
         <param-name>permittedTaglibs</param-name>
         <param-value>
  -	http://java.sun.com/jstl-el/core
  -	http://java.sun.com/jstl-el/fmt
  -	http://java.sun.com/jstl-el/sql
  -	http://java.sun.com/jstl-el/xml
  +	http://java.sun.com/jsp/jstl/core
  +	http://java.sun.com/jsp/jstl/fmt
  +	http://java.sun.com/jsp/jstl/sql
  +	http://java.sun.com/jsp/jstl/xml
         </param-value>
         <description>
           Whitespace-separated list of taglib URIs to permit.  This example
  
  
  
  1.27      +1 -1      jakarta-taglibs/standard/conf/sql.tld
  
  Index: sql.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/sql.tld,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- sql.tld	18 Mar 2003 18:06:48 -0000	1.26
  +++ sql.tld	25 Mar 2003 19:43:21 -0000	1.27
  @@ -9,7 +9,7 @@
     <display-name>JSTL sql</display-name>
     <tlib-version>1.1</tlib-version>
     <short-name>sql</short-name>
  -  <uri>http://java.sun.com/jstl-el/sql</uri>
  +  <uri>http://java.sun.com/jsp/jstl/sql</uri>
   
     <validator>
       <description>
  
  
  
  1.13      +1 -1      jakarta-taglibs/standard/conf/x.tld
  
  Index: x.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/x.tld,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- x.tld	18 Mar 2003 18:06:48 -0000	1.12
  +++ x.tld	25 Mar 2003 19:43:21 -0000	1.13
  @@ -9,7 +9,7 @@
     <display-name>JSTL XML</display-name>
     <tlib-version>1.1</tlib-version>
     <short-name>x</short-name>
  -  <uri>http://java.sun.com/jstl-el/xml</uri>
  +  <uri>http://java.sun.com/jsp/jstl/xml</uri>
   
     <validator>
       <description>
  
  
  
  1.21      +5 -5      jakarta-taglibs/standard/doc/web/GettingStarted.html
  
  Index: GettingStarted.html
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/doc/web/GettingStarted.html,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- GettingStarted.html	14 Mar 2003 23:48:19 -0000	1.20
  +++ GettingStarted.html	25 Mar 2003 19:43:22 -0000	1.21
  @@ -222,7 +222,7 @@
       </tr>
       <tr> 
         <td>Core</td>
  -      <td>http://java.sun.com/jstl-el/core</td>
  +      <td>http://java.sun.com/jsp/jstl/core</td>
         <td> 
           <div align="center"><font face="Courier New, Courier, mono">c</font></div>
         </td>
  @@ -230,7 +230,7 @@
       </tr>
       <tr> 
         <td>XML processing</td>
  -      <td>http://java.sun.com/jstl-el/xml</td>
  +      <td>http://java.sun.com/jsp/jstl/xml</td>
         <td> 
           <div align="center"><font face="Courier New, Courier, mono">x</font></div>
         </td>
  @@ -238,7 +238,7 @@
       </tr>
       <tr> 
         <td>I18N capable formatting</td>
  -      <td>http://java.sun.com/jstl-el/fmt</td>
  +      <td>http://java.sun.com/jsp/jstl/fmt</td>
         <td> 
           <div align="center"><font face="Courier New, Courier, mono">fmt</font></div>
         </td>
  @@ -246,7 +246,7 @@
       </tr>
       <tr> 
         <td>Database access (SQL)</td>
  -      <td>http://java.sun.com/jstl-el/sql</td>
  +      <td>http://java.sun.com/jsp/jstl/sql</td>
         <td> 
           <div align="center"><font face="Courier New, Courier, mono">sql</font></div>
         </td>
  @@ -261,7 +261,7 @@
   follows:</p>
   
   <pre>
  -    &lt;%@ taglib uri="http://java.sun.com/jstl-el/core" prefix="c" %&gt;
  +    &lt;%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %&gt;
   </pre>
   
   <h3>Expression language</h3>
  
  
  
  1.12      +1 -1      jakarta-taglibs/standard/examples/web/ShowSource.jsp
  
  Index: ShowSource.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/ShowSource.jsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ShowSource.jsp	13 Mar 2003 18:56:57 -0000	1.11
  +++ ShowSource.jsp	25 Mar 2003 19:43:22 -0000	1.12
  @@ -7,7 +7,7 @@
          (even as an experiment) into this application --%>
   -->
   
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <%@ taglib prefix="ex" uri="/jstl-examples-taglib" %>
   
   <%-- 
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/conditionals/Choose.jsp
  
  Index: Choose.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/conditionals/Choose.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Choose.jsp	13 Mar 2003 18:56:57 -0000	1.6
  +++ Choose.jsp	25 Mar 2003 19:43:22 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/conditionals/CustomLogicTag.jsp
  
  Index: CustomLogicTag.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/conditionals/CustomLogicTag.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CustomLogicTag.jsp	13 Mar 2003 18:56:57 -0000	1.6
  +++ CustomLogicTag.jsp	25 Mar 2003 19:43:22 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <%@ taglib prefix="ex" uri="/jstl-examples-taglib" %>
   
   <html>
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/examples/web/conditionals/FailureLocal.jsp
  
  Index: FailureLocal.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/conditionals/FailureLocal.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FailureLocal.jsp	13 Mar 2003 18:56:57 -0000	1.5
  +++ FailureLocal.jsp	25 Mar 2003 19:43:22 -0000	1.6
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/conditionals/If.jsp
  
  Index: If.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/conditionals/If.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- If.jsp	13 Mar 2003 18:56:57 -0000	1.6
  +++ If.jsp	25 Mar 2003 19:43:22 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.3       +1 -1      jakarta-taglibs/standard/examples/web/elsupport/Out.jsp
  
  Index: Out.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/elsupport/Out.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Out.jsp	13 Mar 2003 18:56:57 -0000	1.2
  +++ Out.jsp	25 Mar 2003 19:43:22 -0000	1.3
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <html>
   <head>
     <title>JSTL: Expression Language Support -- Expr Example</title>
  
  
  
  1.8       +1 -1      jakarta-taglibs/standard/examples/web/elsupport/Set.jsp
  
  Index: Set.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/elsupport/Set.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Set.jsp	13 Mar 2003 18:56:57 -0000	1.7
  +++ Set.jsp	25 Mar 2003 19:43:22 -0000	1.8
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.8       +1 -1      jakarta-taglibs/standard/examples/web/elsupport/Set2.jsp
  
  Index: Set2.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/elsupport/Set2.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Set2.jsp	13 Mar 2003 18:56:57 -0000	1.7
  +++ Set2.jsp	25 Mar 2003 19:43:22 -0000	1.8
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <html>
   <head>
     <title>JSTL: Expression Language Support -- Set 2 Example</title>
  
  
  
  1.13      +2 -2      jakarta-taglibs/standard/examples/web/format/FormatDateTime.jsp
  
  Index: FormatDateTime.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/FormatDateTime.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- FormatDateTime.jsp	13 Mar 2003 18:56:58 -0000	1.12
  +++ FormatDateTime.jsp	25 Mar 2003 19:43:22 -0000	1.13
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/examples/web/format/FormatDateTimeBrowserLocale.jsp
  
  Index: FormatDateTimeBrowserLocale.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/FormatDateTimeBrowserLocale.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FormatDateTimeBrowserLocale.jsp	13 Mar 2003 18:56:58 -0000	1.2
  +++ FormatDateTimeBrowserLocale.jsp	25 Mar 2003 19:43:22 -0000	1.3
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.13      +1 -1      jakarta-taglibs/standard/examples/web/format/FormatNumber.jsp
  
  Index: FormatNumber.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/FormatNumber.jsp,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- FormatNumber.jsp	13 Mar 2003 18:56:58 -0000	1.12
  +++ FormatNumber.jsp	25 Mar 2003 19:43:22 -0000	1.13
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.5       +2 -2      jakarta-taglibs/standard/examples/web/format/FormatNumberBrowserLocale.jsp
  
  Index: FormatNumberBrowserLocale.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/FormatNumberBrowserLocale.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FormatNumberBrowserLocale.jsp	13 Mar 2003 18:56:58 -0000	1.4
  +++ FormatNumberBrowserLocale.jsp	25 Mar 2003 19:43:22 -0000	1.5
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/examples/web/format/GermanLocale.jsp
  
  Index: GermanLocale.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/GermanLocale.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- GermanLocale.jsp	13 Mar 2003 18:56:58 -0000	1.5
  +++ GermanLocale.jsp	25 Mar 2003 19:43:22 -0000	1.6
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.5       +3 -3      jakarta-taglibs/standard/examples/web/format/GermanUmlautCorrect.jsp
  
  Index: GermanUmlautCorrect.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/GermanUmlautCorrect.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GermanUmlautCorrect.jsp	13 Mar 2003 18:56:58 -0000	1.4
  +++ GermanUmlautCorrect.jsp	25 Mar 2003 19:43:22 -0000	1.5
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  @@ -17,4 +17,4 @@
   </ul>
   
   </body>
  -</html>
  \ No newline at end of file
  +</html>
  
  
  
  1.5       +3 -3      jakarta-taglibs/standard/examples/web/format/GermanUmlautIncorrect.jsp
  
  Index: GermanUmlautIncorrect.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/GermanUmlautIncorrect.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- GermanUmlautIncorrect.jsp	13 Mar 2003 18:56:58 -0000	1.4
  +++ GermanUmlautIncorrect.jsp	25 Mar 2003 19:43:22 -0000	1.5
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  @@ -15,4 +15,4 @@
   </ul>
   
   </body>
  -</html>
  \ No newline at end of file
  +</html>
  
  
  
  1.8       +1 -1      jakarta-taglibs/standard/examples/web/format/ItalianLocale.jsp
  
  Index: ItalianLocale.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/ItalianLocale.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ItalianLocale.jsp	13 Mar 2003 18:56:58 -0000	1.7
  +++ ItalianLocale.jsp	25 Mar 2003 19:43:22 -0000	1.8
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/format/MissingResourceBundle.jsp
  
  Index: MissingResourceBundle.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/MissingResourceBundle.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MissingResourceBundle.jsp	13 Mar 2003 18:56:58 -0000	1.6
  +++ MissingResourceBundle.jsp	25 Mar 2003 19:43:22 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.11      +2 -2      jakarta-taglibs/standard/examples/web/format/ParametricReplacement.jsp
  
  Index: ParametricReplacement.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/ParametricReplacement.jsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ParametricReplacement.jsp	13 Mar 2003 18:56:58 -0000	1.10
  +++ ParametricReplacement.jsp	25 Mar 2003 19:43:22 -0000	1.11
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.5       +1 -1      jakarta-taglibs/standard/examples/web/format/PrefixAttribute.jsp
  
  Index: PrefixAttribute.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/PrefixAttribute.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PrefixAttribute.jsp	13 Mar 2003 18:56:58 -0000	1.4
  +++ PrefixAttribute.jsp	25 Mar 2003 19:43:22 -0000	1.5
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/format/UndefinedKey.jsp
  
  Index: UndefinedKey.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/UndefinedKey.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- UndefinedKey.jsp	13 Mar 2003 18:56:58 -0000	1.6
  +++ UndefinedKey.jsp	25 Mar 2003 19:43:22 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl-el/fmt" %>
  +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
   
   <html>
   <head>
  
  
  
  1.2       +418 -7    jakarta-taglibs/standard/examples/web/functions/Functions.jsp
  
  Index: Functions.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/functions/Functions.jsp,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Functions.jsp	18 Mar 2003 23:00:46 -0000	1.1
  +++ Functions.jsp	25 Mar 2003 19:43:23 -0000	1.2
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="fn" uri="http://java.sun.com/jstl-el/functions" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
   
   <html>
   <head>
  @@ -7,15 +7,426 @@
   </head>
   <body bgcolor="#FFFFFF">
   
  -<c:set var="s1" value="Tanenbaum, David"/>
  +
  +<c:set var="s1" value="There is a castle on a cloud"/>
  +
  +<h4>fn:contains</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>castle</td>
  +    <td>${fn:contains(s1, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>CASTLE</td>
  +    <td>${fn:contains(s1, "CASTLE")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>${fn:contains(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>${fn:contains(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>${fn:contains(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>${fn:contains(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:containsIgnoreCase</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>castle</td>
  +    <td>${fn:containsIgnoreCase(s1, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>CASTLE</td>
  +    <td>${fn:containsIgnoreCase(s1, "CASTLE")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>CaStLe</td>
  +    <td>${fn:containsIgnoreCase(s1, "CaStLe")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>${fn:containsIgnoreCase(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>${fn:containsIgnoreCase(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>${fn:containsIgnoreCase(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>${fn:containsIgnoreCase(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:startsWith</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>castle</td>
  +    <td>${fn:startsWith(s1, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>There is</td>
  +    <td>${fn:startsWith(s1, "There is")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>${fn:startsWith(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>${fn:startsWith(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>${fn:startsWith(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>${fn:startsWith(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:endsWith</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>castle</td>
  +    <td>${fn:endsWith(s1, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>cloud</td>
  +    <td>${fn:endsWith(s1, "cloud")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>${fn:endsWith(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>${fn:endsWith(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>${fn:endsWith(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>${fn:endsWith(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:indexOf</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>castle</td>
  +    <td>${fn:indexOf(s1, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>cloud</td>
  +    <td>${fn:indexOf(s1, "cloud")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>${fn:indexOf(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>${fn:indexOf(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>${fn:indexOf(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>${fn:indexOf(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:substring</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>beginIndex</th>
  +    <th>endIndex</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>11</td>
  +    <td>17</td>
  +    <td>${fn:substring(s1, 11, 17)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>23</td>
  +    <td>-1</td>
  +    <td>${fn:substring(s1, 23, -1)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>-1</td>
  +    <td>-1</td>
  +    <td>${fn:substring(s1, -1, -1)}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:substringAfter</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>There</td>
  +    <td>${fn:substringAfter(s1, "There")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>on a</td>
  +    <td>${fn:substringAfter(s1, "on a")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>${fn:substringAfter(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>${fn:substringAfter(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>&nbsp;${fn:substringAfter(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:substringAfter(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:substringBefore</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>substring</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>on a</td>
  +    <td>${fn:substringBefore(s1, "on a")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>castle</td>
  +    <td>${fn:substringBefore(s1, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>null</td>
  +    <td>&nbsp;${fn:substringBefore(s1, undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:substringBefore(s1, "")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>castle</td>
  +    <td>&nbsp;${fn:substringBefore(undefined, "castle")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:substringBefore(undefined, "")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:escapeXml</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>${fn:escapeXml(s1)}</td>
  +  </tr>
  +  <tr>
  +    <td><foo>body of foo</foo></td>
  +    <td>${fn:escapeXml("<foo>body of foo</foo>")}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>&nbsp;${fn:escapeXml(undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:escapeXml("")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:trim</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>${fn:trim(s1)}</td>
  +  </tr>
  +  <tr>
  +    <td><pre>    3 spaces before and after   </pre></td>
  +    <td><pre>${fn:trim("    3 spaces before and after   ")}</pre></td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>&nbsp;${fn:trim(undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:trim("")}</td>
  +  </tr>
  +</table>
  +
  +<h4>fn:length</h4>
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>${fn:length(s1)}</td>
  +  </tr>
  +  <tr>
  +    <td>${customers}</td>
  +    <td>${fn:length(customers)}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>${fn:length(undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>empty</td>
  +    <td>${fn:length("")}</td>
  +  </tr>
  +</table>
   
   <h4>fn:toLowerCase</h4>
  -Before: ${s1} <br>
  -After:  ${fn:toLowerCase(s1)}
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>${fn:toLowerCase(s1)}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>&nbsp;${fn:toLowerCase(undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:toLowerCase("")}</td>
  +  </tr>
  +</table>
   
   <h4>fn:toUpperCase</h4>
  -Before: ${s1} <br>
  -After:  ${fn:toUpperCase(s1)}
  +<table cellpadding="5" border="1">
  +  <tr>
  +    <th align="left">Input String</th>
  +    <th>Result</th>
  +  </tr>
  +  <tr>
  +    <td>${s1}</td>
  +    <td>${fn:toUpperCase(s1)}</td>
  +  </tr>
  +  <tr>
  +    <td>null</td>
  +    <td>&nbsp;${fn:toUpperCase(undefined)}</td>
  +  </tr>
  +  <tr>
  +    <td>empty</td>
  +    <td>&nbsp;${fn:toUpperCase("")}</td>
  +  </tr>
  +</table>
   
   </body>
   </html>
  
  
  
  1.5       +1 -1      jakarta-taglibs/standard/examples/web/import/Absolute.jsp
  
  Index: Absolute.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/Absolute.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Absolute.jsp	13 Mar 2003 18:56:59 -0000	1.4
  +++ Absolute.jsp	25 Mar 2003 19:43:23 -0000	1.5
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <%@ taglib prefix="ex" uri="/jstl-examples-taglib" %>
   
   <html>
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/import/AbsoluteFtp.jsp
  
  Index: AbsoluteFtp.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/AbsoluteFtp.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbsoluteFtp.jsp	13 Mar 2003 18:56:59 -0000	1.3
  +++ AbsoluteFtp.jsp	25 Mar 2003 19:43:23 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/import/ContextRelative.jsp
  
  Index: ContextRelative.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/ContextRelative.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ContextRelative.jsp	13 Mar 2003 18:56:59 -0000	1.6
  +++ ContextRelative.jsp	25 Mar 2003 19:43:23 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.8       +1 -1      jakarta-taglibs/standard/examples/web/import/Encode.jsp
  
  Index: Encode.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/Encode.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Encode.jsp	13 Mar 2003 18:56:59 -0000	1.7
  +++ Encode.jsp	25 Mar 2003 19:43:23 -0000	1.8
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.8       +1 -1      jakarta-taglibs/standard/examples/web/import/EncodeContextRelative.jsp
  
  Index: EncodeContextRelative.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/EncodeContextRelative.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EncodeContextRelative.jsp	13 Mar 2003 18:56:59 -0000	1.7
  +++ EncodeContextRelative.jsp	25 Mar 2003 19:43:23 -0000	1.8
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/examples/web/import/ExposeString.jsp
  
  Index: ExposeString.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/ExposeString.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExposeString.jsp	13 Mar 2003 18:56:59 -0000	1.5
  +++ ExposeString.jsp	25 Mar 2003 19:43:23 -0000	1.6
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/import/ExposeStringRelative.jsp
  
  Index: ExposeStringRelative.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/ExposeStringRelative.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExposeStringRelative.jsp	13 Mar 2003 18:56:59 -0000	1.6
  +++ ExposeStringRelative.jsp	25 Mar 2003 19:43:23 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/import/LocalQueryString.jsp
  
  Index: LocalQueryString.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/LocalQueryString.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- LocalQueryString.jsp	13 Mar 2003 18:56:59 -0000	1.6
  +++ LocalQueryString.jsp	25 Mar 2003 19:43:23 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <hr>
   <h3> This is the output of the imported file </h3>
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/import/LocalSample.jsp
  
  Index: LocalSample.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/LocalSample.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalSample.jsp	13 Mar 2003 18:56:59 -0000	1.3
  +++ LocalSample.jsp	25 Mar 2003 19:43:23 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/import/Param.jsp
  
  Index: Param.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/Param.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Param.jsp	13 Mar 2003 18:56:59 -0000	1.3
  +++ Param.jsp	25 Mar 2003 19:43:23 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <%--
     --   These URLs likely don't exist, but the error that gets reported 
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/import/Relative.jsp
  
  Index: Relative.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/Relative.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Relative.jsp	13 Mar 2003 18:56:59 -0000	1.3
  +++ Relative.jsp	25 Mar 2003 19:43:23 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/import/StartSlash.jsp
  
  Index: StartSlash.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/StartSlash.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StartSlash.jsp	13 Mar 2003 18:56:59 -0000	1.3
  +++ StartSlash.jsp	25 Mar 2003 19:43:23 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.9       +1 -1      jakarta-taglibs/standard/examples/web/iterators/Collaboration.jsp
  
  Index: Collaboration.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/iterators/Collaboration.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Collaboration.jsp	13 Mar 2003 18:57:00 -0000	1.8
  +++ Collaboration.jsp	25 Mar 2003 19:43:23 -0000	1.9
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <%@ taglib prefix="ex" uri="/jstl-examples-taglib" %>
   
   <html>
  
  
  
  1.8       +1 -1      jakarta-taglibs/standard/examples/web/iterators/DataTypes.jsp
  
  Index: DataTypes.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/iterators/DataTypes.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DataTypes.jsp	13 Mar 2003 18:57:00 -0000	1.7
  +++ DataTypes.jsp	25 Mar 2003 19:43:23 -0000	1.8
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/examples/web/iterators/ForTokens.jsp
  
  Index: ForTokens.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/iterators/ForTokens.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ForTokens.jsp	13 Mar 2003 18:57:00 -0000	1.5
  +++ ForTokens.jsp	25 Mar 2003 19:43:23 -0000	1.6
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/iterators/Simple.jsp
  
  Index: Simple.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/iterators/Simple.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Simple.jsp	13 Mar 2003 18:57:00 -0000	1.6
  +++ Simple.jsp	25 Mar 2003 19:43:23 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/iterators/SimpleRange.jsp
  
  Index: SimpleRange.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/iterators/SimpleRange.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SimpleRange.jsp	13 Mar 2003 18:57:00 -0000	1.6
  +++ SimpleRange.jsp	25 Mar 2003 19:43:23 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.9       +1 -1      jakarta-taglibs/standard/examples/web/iterators/Status.jsp
  
  Index: Status.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/iterators/Status.jsp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Status.jsp	13 Mar 2003 18:57:00 -0000	1.8
  +++ Status.jsp	25 Mar 2003 19:43:23 -0000	1.9
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/misc/IteratorTest.jsp
  
  Index: IteratorTest.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/misc/IteratorTest.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- IteratorTest.jsp	13 Mar 2003 18:57:00 -0000	1.6
  +++ IteratorTest.jsp	25 Mar 2003 19:43:24 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/sql/DriverSetup.jsp
  
  Index: DriverSetup.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/DriverSetup.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DriverSetup.jsp	13 Mar 2003 18:57:00 -0000	1.6
  +++ DriverSetup.jsp	25 Mar 2003 19:43:24 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="sql" uri="http://java.sun.com/jstl-el/sql" %>
  +<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
   
   <html>
   <head>
  
  
  
  1.15      +2 -2      jakarta-taglibs/standard/examples/web/sql/QueryDirect.jsp
  
  Index: QueryDirect.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/QueryDirect.jsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- QueryDirect.jsp	13 Mar 2003 18:57:00 -0000	1.14
  +++ QueryDirect.jsp	25 Mar 2003 19:43:24 -0000	1.15
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="sql" uri="http://java.sun.com/jstl-el/sql" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.16      +2 -2      jakarta-taglibs/standard/examples/web/sql/QueryIterate.jsp
  
  Index: QueryIterate.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/QueryIterate.jsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- QueryIterate.jsp	13 Mar 2003 18:57:00 -0000	1.15
  +++ QueryIterate.jsp	25 Mar 2003 19:43:24 -0000	1.16
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="sql" uri="http://java.sun.com/jstl-el/sql" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.14      +2 -2      jakarta-taglibs/standard/examples/web/sql/QueryParam.jsp
  
  Index: QueryParam.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/QueryParam.jsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- QueryParam.jsp	13 Mar 2003 18:57:00 -0000	1.13
  +++ QueryParam.jsp	25 Mar 2003 19:43:24 -0000	1.14
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="sql" uri="http://java.sun.com/jstl-el/sql" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.12      +1 -1      jakarta-taglibs/standard/examples/web/sql/Transaction.jsp
  
  Index: Transaction.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/Transaction.jsp,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Transaction.jsp	13 Mar 2003 18:57:00 -0000	1.11
  +++ Transaction.jsp	25 Mar 2003 19:43:24 -0000	1.12
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="sql" uri="http://java.sun.com/jstl-el/sql" %>
  +<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
   
   <html>
   <head>
  
  
  
  1.16      +2 -2      jakarta-taglibs/standard/examples/web/sql/Update.jsp
  
  Index: Update.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/Update.jsp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Update.jsp	13 Mar 2003 18:57:00 -0000	1.15
  +++ Update.jsp	25 Mar 2003 19:43:24 -0000	1.16
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="sql" uri="http://java.sun.com/jstl-el/sql" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.5       +1 -1      jakarta-taglibs/standard/examples/web/sql/session.jsp
  
  Index: session.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/sql/session.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- session.jsp	13 Mar 2003 18:57:00 -0000	1.4
  +++ session.jsp	25 Mar 2003 19:43:24 -0000	1.5
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/examples/web/tlv/PermittedTaglibsError.jsp
  
  Index: PermittedTaglibsError.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/tlv/PermittedTaglibsError.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PermittedTaglibsError.jsp	13 Mar 2003 18:57:01 -0000	1.2
  +++ PermittedTaglibsError.jsp	25 Mar 2003 19:43:24 -0000	1.3
  @@ -1,5 +1,5 @@
   <%@ taglib prefix="permittedTaglibs" uri="http://jakarta.apache.org/taglibs/standard/permittedTaglibs" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <%@ taglib prefix="ex" uri="/jstl-examples-taglib" %>
   
   <html>
  @@ -23,4 +23,4 @@
   </table>
   
   </body>
  -</html>
  \ No newline at end of file
  +</html>
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/examples/web/tlv/PermittedTaglibsOk.jsp
  
  Index: PermittedTaglibsOk.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/tlv/PermittedTaglibsOk.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PermittedTaglibsOk.jsp	13 Mar 2003 18:57:01 -0000	1.2
  +++ PermittedTaglibsOk.jsp	25 Mar 2003 19:43:24 -0000	1.3
  @@ -1,5 +1,5 @@
   <%@ taglib prefix="permittedTaglibs" uri="http://jakarta.apache.org/taglibs/standard/permittedTaglibs" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   
   <html>
   <head>
  @@ -27,4 +27,4 @@
   </table>
   
   </body>
  -</html>
  \ No newline at end of file
  +</html>
  
  
  
  1.3       +1 -1      jakarta-taglibs/standard/examples/web/tlv/ScriptFreeOk.jsp
  
  Index: ScriptFreeOk.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/tlv/ScriptFreeOk.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ScriptFreeOk.jsp	13 Mar 2003 18:57:01 -0000	1.2
  +++ ScriptFreeOk.jsp	25 Mar 2003 19:43:24 -0000	1.3
  @@ -1,5 +1,5 @@
   <%@ taglib prefix="scriptfree" uri="http://jakarta.apache.org/taglibs/standard/scriptfree" %>
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
   <html>
   <head>
     <title>JSTL: Tag Library Validator -- ScriptFree OK</title>
  
  
  
  1.7       +1 -1      jakarta-taglibs/standard/examples/web/xml/Filter.jsp
  
  Index: Filter.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/Filter.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Filter.jsp	13 Mar 2003 18:57:01 -0000	1.6
  +++ Filter.jsp	25 Mar 2003 19:43:24 -0000	1.7
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   <%@ taglib prefix="ex" uri="/jstl-examples-taglib" %>
   
   <html>
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/examples/web/xml/ForEach.jsp
  
  Index: ForEach.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/ForEach.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ForEach.jsp	13 Mar 2003 18:57:01 -0000	1.5
  +++ ForEach.jsp	25 Mar 2003 19:43:24 -0000	1.6
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/xml/If.jsp
  
  Index: If.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/If.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- If.jsp	13 Mar 2003 18:57:01 -0000	1.3
  +++ If.jsp	25 Mar 2003 19:43:24 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.3       +1 -1      jakarta-taglibs/standard/examples/web/xml/Out.jsp
  
  Index: Out.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/Out.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Out.jsp	13 Mar 2003 18:57:01 -0000	1.2
  +++ Out.jsp	25 Mar 2003 19:43:24 -0000	1.3
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.7       +2 -2      jakarta-taglibs/standard/examples/web/xml/Parse.jsp
  
  Index: Parse.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/Parse.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Parse.jsp	13 Mar 2003 18:57:01 -0000	1.6
  +++ Parse.jsp	25 Mar 2003 19:43:24 -0000	1.7
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/examples/web/xml/ParseWithEntities.jsp
  
  Index: ParseWithEntities.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/ParseWithEntities.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ParseWithEntities.jsp	13 Mar 2003 18:57:01 -0000	1.2
  +++ ParseWithEntities.jsp	25 Mar 2003 19:43:24 -0000	1.3
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/examples/web/xml/Set.jsp
  
  Index: Set.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/Set.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Set.jsp	13 Mar 2003 18:57:01 -0000	1.5
  +++ Set.jsp	25 Mar 2003 19:43:24 -0000	1.6
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.8       +2 -2      jakarta-taglibs/standard/examples/web/xml/Transform.jsp
  
  Index: Transform.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/Transform.jsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Transform.jsp	13 Mar 2003 18:57:01 -0000	1.7
  +++ Transform.jsp	25 Mar 2003 19:43:24 -0000	1.8
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/examples/web/xml/TransformWithInclusion.jsp
  
  Index: TransformWithInclusion.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/TransformWithInclusion.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TransformWithInclusion.jsp	13 Mar 2003 18:57:01 -0000	1.2
  +++ TransformWithInclusion.jsp	25 Mar 2003 19:43:24 -0000	1.3
  @@ -1,5 +1,5 @@
  -<%@ taglib prefix="c" uri="http://java.sun.com/jstl-el/core" %>
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/xml/When.jsp
  
  Index: When.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/xml/When.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- When.jsp	13 Mar 2003 18:57:01 -0000	1.3
  +++ When.jsp	25 Mar 2003 19:43:24 -0000	1.4
  @@ -1,4 +1,4 @@
  -<%@ taglib prefix="x" uri="http://java.sun.com/jstl-el/xml" %>
  +<%@ taglib prefix="x" uri="http://java.sun.com/jsp/jstl/xml" %>
   
   <html>
   <head>
  
  
  
  1.2       +125 -1    jakarta-taglibs/standard/src/org/apache/taglibs/standard/functions/Functions.java
  
  Index: Functions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/functions/Functions.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Functions.java	18 Mar 2003 23:00:49 -0000	1.1
  +++ Functions.java	25 Mar 2003 19:43:25 -0000	1.2
  @@ -55,6 +55,12 @@
   
   package org.apache.taglibs.standard.functions;
   
  +import java.lang.reflect.Array;
  +import java.util.*;
  +import javax.servlet.jsp.*;
  +import org.apache.taglibs.standard.resources.Resources;
  +import org.apache.taglibs.standard.tag.common.core.Util;
  +
   /**
    * <p>JSTL Functions</p>
    * 
  @@ -64,7 +70,7 @@
   public class Functions {
   
       //*********************************************************************
  -    // String Capitalization
  +    // String capitalization
   
       /**
        * Converts all of the characters of the input string to upper case.
  @@ -79,4 +85,122 @@
       public static String toLowerCase(String input) {
           return input.toLowerCase();
       }
  +    
  +    //*********************************************************************
  +    // Substring processing
  +    
  +    public static int indexOf(String input, String substring) {
  +        if (input == null) input = "";
  +        if (substring == null) substring = "";
  +        return input.indexOf(substring);
  +    }    
  +
  +    public static boolean contains(String input, String substring) {
  +        return indexOf(input, substring) != -1;
  +    }    
  +
  +    public static boolean containsIgnoreCase(String input, String substring) {
  +        if (input == null) input = "";
  +        if (substring == null) substring = "";        
  +        String inputUC = input.toUpperCase();
  +        String substringUC = substring.toUpperCase();
  +        return indexOf(inputUC, substringUC) != -1;
  +    }    
  +
  +    public static boolean startsWith(String input, String substring) {
  +        if (input == null) input = "";
  +        if (substring == null) substring = "";
  +        return input.startsWith(substring);
  +    }    
  +        
  +    public static boolean endsWith(String input, String substring) {
  +        if (input == null) input = "";
  +        if (substring == null) substring = "";
  +        int index = input.indexOf(substring);
  +        if (index == -1) return false;
  +        if (index == 0 && substring.length() == 0) return true;
  +        return (index == input.length() - substring.length());
  +    }  
  +    
  +    public static String substring(String input, int beginIndex, int endIndex) {
  +        if (input == null) input = "";
  +        if (beginIndex < 0) beginIndex = 0;
  +        if (endIndex < 0 || endIndex > input.length()) endIndex = input.length();
  +        return input.substring(beginIndex, endIndex);
  +    }    
  +    
  +    public static String substringAfter(String input, String substring) {
  +        if (input == null) input = "";
  +        if (substring == null) substring = "";
  +        int index = input.indexOf(substring);
  +        if (index == -1) {
  +            return "";
  +        } else {
  +            return input.substring(index+substring.length());
  +        }
  +    }    
  +        
  +    public static String substringBefore(String input, String substring) {
  +        if (input == null) input = "";
  +        if (substring == null) substring = "";
  +        int index = input.indexOf(substring);
  +        if (index == -1) {
  +            return "";
  +        } else {
  +            return input.substring(0, index);
  +        }
  +    }    
  +
  +    //*********************************************************************
  +    // Character replacement
  +    
  +    public static String escapeXml(String input) {
  +        if (input == null) input = "";
  +        return Util.escapeXml(input);
  +    }    
  +    
  +    public static String trim(String input) {
  +        if (input == null) return "";
  +        return input.trim();
  +    }    
  +
  +    //*********************************************************************
  +    // Collections processing
  +    
  +    public static int length(Object obj) throws JspTagException {
  +        if (obj == null) return 0;  
  +        
  +        if (obj instanceof String) return ((String)obj).length();
  +        if (obj instanceof Collection) return ((Collection)obj).size();
  +        if (obj instanceof Map) return ((Map)obj).size();
  +        
  +        int count = 0;
  +        if (obj instanceof Iterator) {
  +            Iterator iter = (Iterator)obj;
  +            count = 0;
  +            while (iter.hasNext()) {
  +                count++;
  +                iter.next();
  +            }
  +            return count;
  +        }            
  +        if (obj instanceof Enumeration) {
  +            Enumeration enum = (Enumeration)obj;
  +            count = 0;
  +            while (enum.hasMoreElements()) {
  +                count++;
  +                enum.nextElement();
  +            }
  +            return count;
  +        }
  +        try {
  +            count = Array.getLength(obj);
  +            return count;
  +        } catch (IllegalArgumentException ex) {}
  +        throw new JspTagException(Resources.getMessage("FOREACH_BAD_ITEMS"));        
  +    }      
  +
  +    /** @@@ LEFT TO DO
  +     * split(), join(), replace()
  +     */    
   }
  
  
  
  1.4       +7 -1      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java
  
  Index: ForEachSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/ForEachSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ForEachSupport.java	14 Mar 2003 22:04:35 -0000	1.3
  +++ ForEachSupport.java	25 Mar 2003 19:43:25 -0000	1.4
  @@ -59,7 +59,7 @@
   import javax.servlet.*;
   import javax.servlet.jsp.*;
   import javax.servlet.jsp.tagext.*;
  -import java.sql.ResultSet;
  +//import java.sql.ResultSet;
   import javax.servlet.jsp.jstl.core.LoopTagSupport;
   import org.apache.taglibs.standard.resources.Resources;
   
  @@ -175,10 +175,12 @@
               items = beginEndForEachIterator();
           }
   
  +        /* ResultSet no more supported in <c:forEach>
           // step must be 1 when ResultSet is passed in
           if (rawItems instanceof ResultSet && step != 1)
               throw new JspTagException(
   		Resources.getMessage("FOREACH_STEP_NO_RESULTSET"));
  +        */
       }
   
   
  @@ -242,8 +244,10 @@
               items = toForEachIterator((Enumeration) o);
           else if (o instanceof Map)
               items = toForEachIterator((Map) o);
  +        /*
           else if (o instanceof ResultSet)
               items = toForEachIterator((ResultSet) o);
  +        */
           else if (o instanceof String)
               items = toForEachIterator((String) o);
           else
  @@ -390,6 +394,7 @@
           return new SimpleForEachIterator(m.entrySet().iterator());
       }
   
  +    /* No more supported in JSTL. See interface Result instead.
       // thinly wraps a ResultSet in an appropriate Iterator
       protected ForEachIterator toForEachIterator(ResultSet rs)
               throws JspTagException {
  @@ -419,6 +424,7 @@
   
           return new ResultSetAdapter(rs);
       }
  +    */
   
       // tokenizes a String as a CSV and returns an iterator over it
       protected ForEachIterator toForEachIterator(String s) {
  
  
  
  1.8       +2 -0      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java
  
  Index: OutSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/OutSupport.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- OutSupport.java	14 Mar 2003 22:04:35 -0000	1.7
  +++ OutSupport.java	25 Mar 2003 19:43:25 -0000	1.8
  @@ -174,6 +174,8 @@
        *    > -> &gt;
        *    " -> &#034;
        *    ' -> &#039;
  +     *
  +     * See also Util.escapeXml().
        */
       public static void out(PageContext pageContext,
                              boolean escapeXml,
  
  
  
  1.8       +32 -0     jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/Util.java
  
  Index: Util.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/core/Util.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Util.java	14 Mar 2003 22:04:35 -0000	1.7
  +++ Util.java	25 Mar 2003 19:43:25 -0000	1.8
  @@ -133,4 +133,36 @@
   
   	return ret;
       }
  +    
  +    /**
  +     * Performs the following substring replacements 
  +     * (to facilitate output to XML/HTML pages):
  +     *
  +     *    & -> &amp;
  +     *    < -> &lt;
  +     *    > -> &gt;
  +     *    " -> &#034;
  +     *    ' -> &#039;
  +     *
  +     * See also OutSupport.out().
  +     */
  +    public static String escapeXml(String input) {
  +        StringBuffer sb = new StringBuffer();
  +        for (int i = 0; i < input.length(); i++) {
  +            char c = input.charAt(i);
  +            if (c == '&')
  +                sb.append("&amp;");
  +            else if (c == '<')
  +                sb.append("&lt;");
  +            else if (c == '>')
  +                sb.append("&gt;");
  +            else if (c == '"')
  +                sb.append("&#034;");
  +            else if (c == '\'')
  +                sb.append("&#039;");
  +            else
  +                sb.append(c);
  +        }
  +        return sb.toString();
  +    }    
   }
  
  
  

---------------------------------------------------------------------
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