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/examples/web/misc IteratorTest.jsp
Date Tue, 05 Mar 2002 21:17:44 GMT
horwat      02/03/05 13:17:44

  Modified:    standard/examples/web ShowSource.jsp
               standard/examples/web/conditionals Choose.jsp
                        CustomLogicTag.jsp FailureLocal.jsp If.jsp
               standard/examples/web/elsupport Set.jsp Set2.jsp Expr.jsp
               standard/examples/web/format Exception.jsp
                        FormatDateTime.jsp FormatNumber.jsp
                        ItalianLocale.jsp MissingResourceBundle.jsp
                        ParametricReplacement.jsp UndefinedKey.jsp
               standard/examples/web/import ExposeStringRelative.jsp
                        LocalQueryString.jsp ExposeString.jsp
                        EncodeQueryString.jsp EncodeContextRelative.jsp
                        ContextRelative.jsp
               standard/examples/web/iterators Status.jsp SimpleRange.jsp
                        Simple.jsp ForTokens.jsp DataTypes.jsp
                        Collaboration.jsp
               standard/examples/web/misc IteratorTest.jsp
  Log:
  Convert to new EL syntax.
  
  Revision  Changes    Path
  1.8       +4 -4      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- ShowSource.jsp	12 Dec 2001 02:44:39 -0000	1.7
  +++ ShowSource.jsp	5 Mar 2002 21:17:43 -0000	1.8
  @@ -21,15 +21,15 @@
   
   <html>
   <head>
  -  <title>JSTL: Source code for <c:expr value="$filename"/></title>
  +  <title>JSTL: Source code for <c:expr value="${filename}"/></title>
   </head>
   <body bgcolor="#FFFFFF">
  -<h3>Source code for:&nbsp; <c:expr value="$filename"/></h3>
  +<h3>Source code for:&nbsp; <c:expr value="${filename}"/></h3>
   
   <hr>
   
  -<c:import varReader="reader" url="$filepath">
  -  <ex:escapeHtml reader="$reader"/>
  +<c:import varReader="reader" url="${filepath}">
  +  <ex:escapeHtml reader="${reader}"/>
   </c:import>
   <hr>
   </body>
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Choose.jsp	21 Nov 2001 20:42:48 -0000	1.2
  +++ Choose.jsp	5 Mar 2002 21:17:43 -0000	1.3
  @@ -9,19 +9,19 @@
   
   <h4>USA:blue Canada:red Others:green</h4>
   
  -<c:forEach var="customer" items="$customers">
  +<c:forEach var="customer" items="${customers}">
     <c:choose>
  -    <c:when test="$customer.address.country == 'USA'">
  +    <c:when test="${customer.address.country == 'USA'}">
         <font color="blue">
       </c:when>
  -    <c:when test="$customer.address.country == 'Canada'">
  +    <c:when test="${customer.address.country == 'Canada'}">
         <font color="red">
       </c:when>
       <c:otherwise>
         <font color="green">	
       </c:otherwise>	
     </c:choose>
  -  <c:expr value="$customer"/></font><br>
  +  <c:expr value="${customer}"/></font><br>
   </c:forEach>
   </body>
   </html>
  
  
  
  1.3       +7 -7      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CustomLogicTag.jsp	21 Nov 2001 20:42:48 -0000	1.2
  +++ CustomLogicTag.jsp	5 Mar 2002 21:17:43 -0000	1.3
  @@ -12,25 +12,25 @@
   <h4>Customers living in the USA</h4>
   
   <h4>Simple Conditional Execution</h4>
  -<c:forEach var="customer" items="$customers">
  -  <ex:usCustomer customer="$customer">
  -    <c:expr value="$customer"/><br>
  +<c:forEach var="customer" items="${customers}">
  +  <ex:usCustomer customer="${customer}">
  +    <c:expr value="${customer}"/><br>
     </ex:usCustomer>
   </c:forEach>
   
   <h4>Mutually Exclusive Conditional Execution</h4>
   
  -<c:forEach var="customer" items="$customers">
  -  <ex:usCustomer customer="$customer" var="isUsCustomer"/>
  +<c:forEach var="customer" items="${customers}">
  +  <ex:usCustomer customer="${customer}" var="isUsCustomer"/>
     <c:choose>
  -    <c:when test="$isUsCustomer">
  +    <c:when test="${isUsCustomer}">
         <font color="blue">
       </c:when>
       <c:otherwise>
         <font color="green">	
       </c:otherwise>	
     </c:choose>
  -  <c:expr value="$customer"/></font><br>
  +  <c:expr value="${customer}"/></font><br>
   </c:forEach>
   </body>
   </html>
  
  
  
  1.2       +4 -4      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FailureLocal.jsp	21 Nov 2001 07:34:28 -0000	1.1
  +++ FailureLocal.jsp	5 Mar 2002 21:17:43 -0000	1.2
  @@ -9,19 +9,19 @@
   
   <h4>USA:blue Canada:red Others:green</h4>
   
  -<c:forEach var="customer" items="$customers">
  +<c:forEach var="customer" items="${customers}">
     <c:choose>
       <c:otherwise>
         <font color="green">	
       </c:otherwise>	
  -    <c:when test="$customer.address.country == 'USA'">
  +    <c:when test="${customer.address.country == 'USA'}">
         <font color="blue">
       </c:when>
  -    <c:when test="$customer.address.country == 'Canada'">
  +    <c:when test="${customer.address.country == 'Canada'}">
         <font color="red">
       </c:when>
     </c:choose>
  -  <c:expr value="$customer"/></font><br>
  +  <c:expr value="${customer}"/></font><br>
   </c:forEach>
   </body>
   </html>
  
  
  
  1.3       +3 -3      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- If.jsp	21 Nov 2001 20:42:48 -0000	1.2
  +++ If.jsp	5 Mar 2002 21:17:43 -0000	1.3
  @@ -10,9 +10,9 @@
   
   <h4>Customers living in the USA</h4>
   
  -<c:forEach var="customer" items="$customers">
  -  <c:if test="$customer.address.country == 'USA'">
  -    <c:expr value="$customer"/><br>
  +<c:forEach var="customer" items="${customers}">
  +  <c:if test="${customer.address.country == 'USA'}">
  +    <c:expr value="${customer}"/><br>
     </c:if>
   </c:forEach>
   </body>
  
  
  
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Set.jsp	21 Nov 2001 20:32:07 -0000	1.2
  +++ Set.jsp	5 Mar 2002 21:17:43 -0000	1.3
  @@ -11,12 +11,12 @@
   
   <c:set var="customerTable" scope="application">
   <table border="1">
  -    <c:forEach var="customer" items="$customers">
  +    <c:forEach var="customer" items="${customers}">
       <tr>
  -	  <td><c:expr value="$customer.lastName"/></td>
  -	  <td><c:expr value="$customer.address" default="no address specified"/></td>
  +	  <td><c:expr value="${customer.lastName}"/></td>
  +	  <td><c:expr value="${customer.address}" default="no address specified"/></td>
   	  <td>
  -	    <c:expr value="$customer.address">
  +	    <c:expr value="${customer.address}">
   		  <font color="red">no address specified</font>
   		</c:expr>
         </td>
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Set2.jsp	21 Nov 2001 20:32:07 -0000	1.2
  +++ Set2.jsp	5 Mar 2002 21:17:43 -0000	1.3
  @@ -8,9 +8,9 @@
   <h3>&lt;set&gt;</h3>
   
   <h4>Using "customerTable" application scope attribute defined in Set.jsp a first
time</h4>
  -<c:expr value="$customerTable"/>
  +<c:expr value="${customerTable}"/>
   
   <h4>Using "customerTable" application scope attribute defined in Set.jsp a second
time</h4>
  -<c:expr value="$customerTable"/>
  +<c:expr value="${customerTable}"/>
   </body>
   </html>
  
  
  
  1.3       +4 -4      jakarta-taglibs/standard/examples/web/elsupport/Expr.jsp
  
  Index: Expr.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/elsupport/Expr.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Expr.jsp	21 Nov 2001 20:32:07 -0000	1.2
  +++ Expr.jsp	5 Mar 2002 21:17:43 -0000	1.3
  @@ -8,12 +8,12 @@
   <h3>&lt;expr&gt;</h3>
   
   <table border="1">
  -  <c:forEach var="customer" items="$customers">
  +  <c:forEach var="customer" items="${customers}">
       <tr>
  -	  <td><c:expr value="$customer.lastName"/></td>
  -	  <td><c:expr value="$customer.phoneHome" default="no home phone specified"/></td>
  +	  <td><c:expr value="${customer.lastName}"/></td>
  +	  <td><c:expr value="${customer.phoneHome}" default="no home phone specified"/></td>
   	  <td>
  -	    <c:expr value="$customer.phoneCell">
  +	    <c:expr value="${customer.phoneCell}">
   		  <font color="red">no cell phone specified</font>
   		</c:expr>
         </td>
  
  
  
  1.3       +2 -2      jakarta-taglibs/standard/examples/web/format/Exception.jsp
  
  Index: Exception.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/format/Exception.jsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Exception.jsp	21 Nov 2001 20:26:36 -0000	1.2
  +++ Exception.jsp	5 Mar 2002 21:17:44 -0000	1.3
  @@ -13,9 +13,9 @@
   <fmt:bundle basename="org.apache.taglibs.standard.examples.i18n.Resources" var="deBundle"/>
   <ul>
    <li> Localized exception message:<br>
  -  <fmt:exception bundle="$deBundle"/>
  +  <fmt:exception bundle="${deBundle}"/>
    <li> Localized exception message plus stack trace:<br>
  -  <fmt:exception bundle="$deBundle" stackTrace="true"/>
  +  <fmt:exception bundle="${deBundle}" stackTrace="true"/>
   </ul>
   
   </body>
  
  
  
  1.6       +11 -11    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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FormatDateTime.jsp	27 Feb 2002 19:01:50 -0000	1.5
  +++ FormatDateTime.jsp	5 Mar 2002 21:17:44 -0000	1.6
  @@ -18,24 +18,24 @@
         its date and time components:<br>
     <fmt:timeZone value="GMT+1:00">
      <fmt:formatDate type="both" dateStyle="full" timeStyle="full" var="formattedDateTime"/>
  -   <fmt:parseDate value="$formattedDateTime" type="both" dateStyle="full" timeStyle="full"
timeZone="PST" var="parsedDateTime"/>
  -   Parsed date: <fmt:formatDate value="$parsedDateTime" type="date" dateStyle="full"/><br>
  -   Parsed time: <fmt:formatDate value="$parsedDateTime" type="time" timeStyle="full"/>
  +   <fmt:parseDate value="${formattedDateTime}" type="both" dateStyle="full" timeStyle="full"
timeZone="PST" var="parsedDateTime"/>
  +   Parsed date: <fmt:formatDate value="${parsedDateTime}" type="date" dateStyle="full"/><br>
  +   Parsed time: <fmt:formatDate value="${parsedDateTime}" type="time" timeStyle="full"/>
     </fmt:timeZone>
   
    <li> Parsing SHORT version of current time in different time zones:<br>
     <fmt:formatDate type="both" timeStyle="short" var="formattedDateTime"/>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="short" timeZone="GMT"/>
(parsed in &quot;GMT&quot;)<br>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="short" timeZone="GMT+1:00"/>
(parsed in &quot;GMT+1:00&quot;)<br>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="short" timeZone="GMT+3:00"/>
(parsed in &quot;GMT+3:00&quot;)<br>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="short" timeZone="PST"/>
(parsed in &quot;PST&quot;)
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="short" timeZone="GMT"/>
(parsed in &quot;GMT&quot;)<br>
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="short" timeZone="GMT+1:00"/>
(parsed in &quot;GMT+1:00&quot;)<br>
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="short" timeZone="GMT+3:00"/>
(parsed in &quot;GMT+3:00&quot;)<br>
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="short" timeZone="PST"/>
(parsed in &quot;PST&quot;)
   
    <li> Parsing FULL version of current time in different time zones (should not be
affected):<br>
     <fmt:formatDate type="both" timeStyle="full" var="formattedDateTime"/>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="full" timeZone="GMT"/>
(parsed in &quot;GMT&quot;)<br>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="full" timeZone="GMT+1:00"/>
(parsed in &quot;GMT+1:00&quot;)<br>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="full" timeZone="GMT+3:00"/>
(parsed in &quot;GMT+3:00&quot;)<br>
  -  <fmt:parseDate value="$formattedDateTime" type="both" timeStyle="full" timeZone="PST"/>
(parsed in &quot;PST&quot;)
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="full" timeZone="GMT"/>
(parsed in &quot;GMT&quot;)<br>
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="full" timeZone="GMT+1:00"/>
(parsed in &quot;GMT+1:00&quot;)<br>
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="full" timeZone="GMT+3:00"/>
(parsed in &quot;GMT+3:00&quot;)<br>
  +  <fmt:parseDate value="${formattedDateTime}" type="both" timeStyle="full" timeZone="PST"/>
(parsed in &quot;PST&quot;)
   </ul>
   
   </body>
  
  
  
  1.8       +2 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FormatNumber.jsp	27 Feb 2002 00:35:15 -0000	1.7
  +++ FormatNumber.jsp	5 Mar 2002 21:17:44 -0000	1.8
  @@ -32,14 +32,14 @@
     <fmt:formatNumber value="123456789" type="currency"/><br>
         then parse it back in and print the parsed result:<br> 
     <fmt:formatNumber value="123456789" type="currency" var="cur"/>
  -  <fmt:parseNumber value="$cur" type="currency"/>
  +  <fmt:parseNumber value="${cur}" type="currency"/>
   
    <li> Format &quot;12345.67&quot; as US Dollar:<br>
     <fmt:locale value="en-US"/>
     <fmt:formatNumber value="12345.67" type="currency"/><br>
         then parse its integer portion only and output the result:<br>
     <fmt:formatNumber value="12345.67" type="currency" var="cur"/>
  -  <fmt:parseNumber value="$cur" type="currency" integerOnly="true"/>
  +  <fmt:parseNumber value="${cur}" type="currency" integerOnly="true"/>
   
    <li> Format &quot;12345.67&quot; as German currency (given string is
         parsed using &quot;en&quot; locale before it is formatted):<br>
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ItalianLocale.jsp	20 Feb 2002 23:53:42 -0000	1.2
  +++ ItalianLocale.jsp	5 Mar 2002 21:17:44 -0000	1.3
  @@ -9,7 +9,7 @@
   
   <fmt:locale value="it_IT"/>
   <fmt:bundle basename="org.apache.taglibs.standard.examples.i18n.Resources" var="itBundle"
scope="page"/>
  -<fmt:message key="greetingMorning" bundle="$itBundle"/>
  +<fmt:message key="greetingMorning" bundle="${itBundle}"/>
   
   </body>
   </html>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MissingResourceBundle.jsp	21 Nov 2001 07:34:35 -0000	1.1
  +++ MissingResourceBundle.jsp	5 Mar 2002 21:17:44 -0000	1.2
  @@ -15,7 +15,7 @@
   
    <li> Explicit collaboration with &lt;bundle&gt; (via <tt>var</tt>
attribute):<br>
     <fmt:bundle basename="org.apache.taglibs.standard.examples.i18n.Resources" var="enBundle"/>
  -  <fmt:message key="greetingEvening" bundle="$enBundle"/>
  +  <fmt:message key="greetingEvening" bundle="${enBundle}"/>
   </ul>
   
   </body>
  
  
  
  1.5       +9 -9      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ParametricReplacement.jsp	28 Feb 2002 00:54:05 -0000	1.4
  +++ ParametricReplacement.jsp	5 Mar 2002 21:17:44 -0000	1.5
  @@ -11,29 +11,29 @@
   <fmt:locale value="de"/>
   <fmt:bundle basename="org.apache.taglibs.standard.examples.i18n.Resources" var="deBundle"/>
   <fmt:formatDate type="both" var="currentDateString"/>
  -<fmt:parseDate value="$currentDateString" type="both" var="currentDate"/>
  +<fmt:parseDate value="${currentDateString}" type="both" var="currentDate"/>
   <ul>
    <li> Using single &lt;param&gt; with 'value' evaluating to String:<br>
  -  <fmt:message key="currentTime" bundle="$deBundle">
  -   <fmt:param value="$currentDateString"/>
  +  <fmt:message key="currentTime" bundle="${deBundle}">
  +   <fmt:param value="${currentDateString}"/>
     </fmt:message>
    
    <li> Using single &lt;param&gt; with 'value' evaluating to <tt>java.util.Date</tt>:<br>
  -  <fmt:message key="currentTime" bundle="$deBundle">
  -   <fmt:param value="$currentDate"/>
  +  <fmt:message key="currentTime" bundle="${deBundle}">
  +   <fmt:param value="${currentDate}"/>
     </fmt:message>
   
    <li> Using single &lt;param&gt; with body:<br>
  -  <fmt:message key="currentTime" bundle="$deBundle">
  +  <fmt:message key="currentTime" bundle="${deBundle}">
      <fmt:param>
       <fmt:formatDate type="both"/>
      </fmt:param>
     </fmt:message>
   
    <li> Using multiple parameters:<br>
  -  <fmt:message key="serverInfo" bundle="$deBundle">
  -   <c:forEach var="arg" items="$serverInfoArgs">
  -    <fmt:param value="$arg"/>
  +  <fmt:message key="serverInfo" bundle="${deBundle}">
  +   <c:forEach var="arg" items="${serverInfoArgs}">
  +    <fmt:param value="${arg}"/>
      </c:forEach>
     </fmt:message>
   </ul>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UndefinedKey.jsp	21 Nov 2001 07:34:35 -0000	1.1
  +++ UndefinedKey.jsp	5 Mar 2002 21:17:44 -0000	1.2
  @@ -9,7 +9,7 @@
   
   <fmt:locale value="it"/>
   <fmt:bundle basename="org.apache.taglibs.standard.examples.i18n.Resources" var="itBundle"/>
  -<fmt:message key="invalidKey" bundle="$itBundle"/>
  +<fmt:message key="invalidKey" bundle="${itBundle}"/>
   
   </body>
   </html>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExposeStringRelative.jsp	21 Nov 2001 07:34:30 -0000	1.1
  +++ ExposeStringRelative.jsp	5 Mar 2002 21:17:44 -0000	1.2
  @@ -9,7 +9,7 @@
   
   <c:import var="cnn" url="LocalSample.jsp"/>
   
  -<c:expr value="$cnn"/>
  +<c:expr value="${cnn}"/>
   
   </body>
   </html>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LocalQueryString.jsp	20 Dec 2001 00:45:31 -0000	1.1
  +++ LocalQueryString.jsp	5 Mar 2002 21:17:44 -0000	1.2
  @@ -11,7 +11,7 @@
       <td>Getting "name" query parameter:</td>
       <td>
         <div style="color: red">
  -        <c:expr value="$param:name"/><br>
  +        <c:expr value="${param:name}"/><br>
         </div>
       </td>
     </tr>
  @@ -19,7 +19,7 @@
       <td>Getting "email" query parameter:</td>
       <td>
         <div style="color: red">
  -        <c:expr value="$param:email"/>
  +        <c:expr value="${param:email}"/>
         </div>
       </td>
     </tr>
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ExposeString.jsp	21 Nov 2001 07:34:30 -0000	1.1
  +++ ExposeString.jsp	5 Mar 2002 21:17:44 -0000	1.2
  @@ -12,7 +12,7 @@
   <h4>CNN's RSS XML feed:</h4>
   <blockquote>
    <pre>
  -  <c:expr value="$cnn"/>
  +  <c:expr value="${cnn}"/>
    </pre>
   </blockquote>
   
  
  
  
  1.4       +1 -1      jakarta-taglibs/standard/examples/web/import/EncodeQueryString.jsp
  
  Index: EncodeQueryString.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/examples/web/import/EncodeQueryString.jsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EncodeQueryString.jsp	4 Feb 2002 03:17:19 -0000	1.3
  +++ EncodeQueryString.jsp	5 Mar 2002 21:17:44 -0000	1.4
  @@ -12,7 +12,7 @@
   <c:urlEncode var="name" value="horwat"/>
   <c:urlEncode var="email" value="horwat@fakeaddress.com"/>
   
  -<c:import url="$'LocalQueryString.jsp?name=' + name + '&email=' + email" />
  +<c:import url="${'LocalQueryString.jsp?name=' + name + '&email=' + email}" />
   
   <hr />
   <c:urlEncode value="http://foo">
  
  
  
  1.4       +7 -7      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EncodeContextRelative.jsp	4 Jan 2002 01:58:53 -0000	1.3
  +++ EncodeContextRelative.jsp	5 Mar 2002 21:17:44 -0000	1.4
  @@ -9,12 +9,12 @@
   
   <h4>&lt;urlEncode&gt;</h4>
   
  -<c:urlEncode var="param1" value="$_paramValue1"/>
  -<c:urlEncode var="param2" value="$_paramValue2"/>
  -<c:urlEncode var="param3" value="$_paramValue3"/>
  +<c:urlEncode var="param1" value="${_paramValue1}"/>
  +<c:urlEncode var="param2" value="${_paramValue2}"/>
  +<c:urlEncode var="param3" value="${_paramValue3}"/>
   
  -<c:import url="$_contextUrl" context="$_contextName">
  -    <c:param name="$_paramName1" value="$param1"/>
  -    <c:param name="$_paramName2" value="$param2"/>
  -    <c:param name="$_paramName3" value="$param3"/>
  +<c:import url="${_contextUrl}" context="${_contextName}">
  +    <c:param name="${_paramName1}" value="${param1}"/>
  +    <c:param name="${_paramName2}" value="${param2}"/>
  +    <c:param name="${_paramName3}" value="${param3}"/>
   </c:import>
  
  
  
  1.3       +4 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ContextRelative.jsp	20 Dec 2001 00:45:31 -0000	1.2
  +++ ContextRelative.jsp	5 Mar 2002 21:17:44 -0000	1.3
  @@ -7,9 +7,12 @@
   <body bgcolor="#FFFFFF">
   Assuming you have the "examples" webapp installed, here's a file from it...
   
  +URL:<c:expr value="${_contextUrl}"/><br>
  +Name:<c:expr value="${_contextName}"/>
  +
   <blockquote>
    <pre>
  -  <c:import url="$_contextUrl" context="$_contextName"/>
  +  <c:import url="${_contextUrl}" context="${_contextName}"/>
    </pre>
   </blockquote>
   
  
  
  
  1.5       +17 -17    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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Status.jsp	4 Feb 2002 02:39:49 -0000	1.4
  +++ Status.jsp	5 Mar 2002 21:17:44 -0000	1.5
  @@ -17,35 +17,35 @@
       <th>first?</th>
       <th>last?</th>
     </tr>
  -  <c:forEach var="customer" items="$customers" varStatus="status">
  +  <c:forEach var="customer" items="${customers}" varStatus="status">
       <tr>
  -      <td><c:expr value="$status.index"/></td>
  -      <td><c:expr value="$status.count"/></td>
  -      <td><c:expr value="$status.current.lastName"/></td>
  -      <td><c:expr value="$status.current.firstName"/></td>
  -      <td><c:expr value="$status.first"/></td>
  -      <td><c:expr value="$status.last"/></td>
  +      <td><c:expr value="${status.index}"/></td>
  +      <td><c:expr value="${status.count}"/></td>
  +      <td><c:expr value="${status.current.lastName}"/></td>
  +      <td><c:expr value="${status.current.firstName}"/></td>
  +      <td><c:expr value="${status.first}"/></td>
  +      <td><c:expr value="${status.last}"/></td>
       </tr>
  -    <c:if test="$status.last">
  -      <c:set var="count" value="$status.count"/>
  +    <c:if test="${status.last}">
  +      <c:set var="count" value="${status.count}"/>
       </c:if>  
     </c:forEach>
   </table>
  -<p>There are <c:expr value="$count"/> customers in the list.
  +<p>There are <c:expr value="${count}"/> customers in the list.
   
   <p>
   
   <h4>Iteration using range attributes</h4>
   <c:forEach var="i" begin="100" end="200" step="5" varStatus="status">
  -  <c:if test="$status.first">
  -    begin:<c:expr value="$status.begin">begin</c:expr> &nbsp; &nbsp;

  -      end:<c:expr value="$status.end">end</c:expr> &nbsp; &nbsp; 
  -     step:<c:expr value="$status.step">step</c:expr><br>
  +  <c:if test="${status.first}">
  +    begin:<c:expr value="${status.begin}">begin</c:expr> &nbsp; &nbsp;

  +      end:<c:expr value="${status.end}">end</c:expr> &nbsp; &nbsp;

  +     step:<c:expr value="${status.step}">step</c:expr><br>
       sequence: 
     </c:if>  
  -  <c:expr value="$i"/> 
  -  <c:if test="$status.last">
  -    <br>There are <c:expr value="$status.count"/> numbers in the list.
  +  <c:expr value="${i}"/> 
  +  <c:if test="${status.last}">
  +    <br>There are <c:expr value="${status.count}"/> numbers in the list.
     </c:if>  
   </c:forEach>
   <p>
  
  
  
  1.3       +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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleRange.jsp	21 Nov 2001 20:30:20 -0000	1.2
  +++ SimpleRange.jsp	5 Mar 2002 21:17:44 -0000	1.3
  @@ -10,7 +10,7 @@
   <h4>1 to 10</h4>
   
   <c:forEach var="i" begin="1" end="10">
  -  <c:expr value="$i"/> &#149;
  +  <c:expr value="${i}"/> &#149;
   </c:forEach>
   </body>
   </html>
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Simple.jsp	21 Nov 2001 20:30:20 -0000	1.2
  +++ Simple.jsp	5 Mar 2002 21:17:44 -0000	1.3
  @@ -9,8 +9,8 @@
   
   <h4>Customer list</h4>
   
  -<c:forEach var="customer" items="$customers">
  -  <c:expr value="$customer"/><br>
  +<c:forEach var="customer" items="${customers}">
  +  <c:expr value="${customer}"/><br>
   </c:forEach>
   </body>
   </html>
  
  
  
  1.2       +2 -2      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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ForTokens.jsp	21 Nov 2001 07:34:29 -0000	1.1
  +++ ForTokens.jsp	5 Mar 2002 21:17:44 -0000	1.2
  @@ -12,14 +12,14 @@
   
   <c:forTokens var="token" items="bleu,blanc,rouge|vert,jaune|blanc,rouge"
                 delims="|">
  -  <c:expr value="$token"/> &#149;
  +  <c:expr value="${token}"/> &#149;
   </c:forTokens>
   
   <h4>String with '|' and ',' delimiters</h4>
   
   <c:forTokens var="token" items="bleu,blanc,rouge|vert,jaune|blanc,rouge"
                 delims="|,">
  -  <c:expr value="$token"/> &#149;
  +  <c:expr value="${token}"/> &#149;
   </c:forTokens>
   </body>
   </html>
  
  
  
  1.4       +9 -9      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DataTypes.jsp	4 Feb 2002 02:39:49 -0000	1.3
  +++ DataTypes.jsp	5 Mar 2002 21:17:44 -0000	1.4
  @@ -9,32 +9,32 @@
   
   <h4>Array of primitives (int)</h4>
   
  -<c:forEach var="i" items="$intArray">
  -  <c:expr value="$i"/> &#149;
  +<c:forEach var="i" items="${intArray}">
  +  <c:expr value="${i}"/> &#149;
   </c:forEach>
   
   <h4>Array of objects (String)</h4>
   
  -<c:forEach var="string" items="$stringArray">
  -  <c:expr value="$string"/><br>
  +<c:forEach var="string" items="${stringArray}">
  +  <c:expr value="${string}"/><br>
   </c:forEach>
   
   <h4>Enumeration (warning: this only works until enumeration is exhausted!)</h4>
   
  -<c:forEach var="item" items="$enumeration" begin="2" end="10" step="2">
  -  <c:expr value="$item"/><br>
  +<c:forEach var="item" items="${enumeration}" begin="2" end="10" step="2">
  +  <c:expr value="${item}"/><br>
   </c:forEach>
   
   <h4>Properties (Map)</h4>
   
  -<c:forEach var="prop" items="$numberMap" begin="1" end="5">
  -  <c:expr value="$prop.key"/> = <c:expr value="$prop.value"/><br>
  +<c:forEach var="prop" items="${numberMap}" begin="1" end="5">
  +  <c:expr value="${prop.key}"/> = <c:expr value="${prop.value}"/><br>
   </c:forEach>
   
   <h4>String (Comma Separated Values)</h4>
   
   <c:forEach var="token" items="bleu,blanc,rouge">
  -  <c:expr value="$token"/><br>
  +  <c:expr value="${token}"/><br>
   </c:forEach>
   </body>
   </html>
  
  
  
  1.4       +4 -4      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Collaboration.jsp	4 Feb 2002 02:39:49 -0000	1.3
  +++ Collaboration.jsp	5 Mar 2002 21:17:44 -0000	1.4
  @@ -12,7 +12,7 @@
   <h4>Without custom tags</h4>
   
   <table>
  -<c:forEach var="customer" items="$customers" varStatus="status">
  +<c:forEach var="customer" items="${customers}" varStatus="status">
     <tr>
       <jsp:useBean type="javax.servlet.jsp.jstl.core.LoopTagStatus" id="status"/>
       <jr:choose>
  @@ -23,7 +23,7 @@
   	    <td bgcolor="#99FFCC">
   	  </jr:otherwise>
       </jr:choose>
  -    <c:expr value="$customer"/></td>
  +    <c:expr value="${customer}"/></td>
     </tr>
   </c:forEach> 
   </table>
  @@ -31,11 +31,11 @@
   <h4>Using custom tags &lt;even&gt; and &lt;odd&gt;</h4>
   
   <table>
  -<c:forEach var="customer" items="$customers">
  +<c:forEach var="customer" items="${customers}">
     <tr>
       <ex:odd><td bgcolor="#FFFF66"></ex:odd>
       <ex:even><td bgcolor="#99FFCC"></ex:even>
  -    <c:expr value="$customer"/></td>
  +    <c:expr value="${customer}"/></td>
     </tr>
   </c:forEach> 
   </table>
  
  
  
  1.3       +10 -10    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IteratorTest.jsp	4 Feb 2002 02:39:49 -0000	1.2
  +++ IteratorTest.jsp	5 Mar 2002 21:17:44 -0000	1.3
  @@ -11,7 +11,7 @@
   (illegal)
   <%--
   <c:forEach var="i" end="10">
  -  <c:expr value="$i"/> &#149; 
  +  <c:expr value="${i}"/> &#149; 
   </c:forEach>
   --%>
   
  @@ -19,24 +19,24 @@
   (illegal)
   <%--
   <c:forEach var="i" begin="10">
  -  <c:expr value="$i"/> &#149; 
  +  <c:expr value="${i}"/> &#149; 
   </c:forEach>
   --%>
   
   <h4>Iteration with only begin specified (with items): begin="2"</h4>
   
  -<c:forEach var="i" items="$customers" begin="2" varStatus="status">
  -  index: <c:expr value="$status.index"/> &#149; 
  -  count: <c:expr value="$status.count"/> &#149; 
  -  item: <c:expr value="$i"/><br>
  +<c:forEach var="i" items="${customers}" begin="2" varStatus="status">
  +  index: <c:expr value="${status.index}"/> &#149; 
  +  count: <c:expr value="${status.count}"/> &#149; 
  +  item: <c:expr value="${i}"/><br>
   </c:forEach>
   
   <h4>Iteration with only end specified (with items): end="1"</h4>
   
  -<c:forEach var="i" items="$customers" end="1" varStatus="status">
  -  index: <c:expr value="$status.index"/> &#149; 
  -  count: <c:expr value="$status.count"/> &#149; 
  -  item: <c:expr value="$i"/><br>
  +<c:forEach var="i" items="${customers}" end="1" varStatus="status">
  +  index: <c:expr value="${status.index}"/> &#149; 
  +  count: <c:expr value="${status.count}"/> &#149; 
  +  item: <c:expr value="${i}"/><br>
   </c:forEach>
   </body>
   </html>
  
  
  

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


Mime
View raw message