struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@locus.apache.org
Subject cvs commit: jakarta-struts/web/example/WEB-INF web.xml
Date Sat, 04 Nov 2000 00:51:20 GMT
craigmcc    00/11/03 16:51:20

  Modified:    .        TODO
               web/example index.jsp logon.jsp mainMenu.jsp
                        registration.jsp subscription.jsp
               web/example/WEB-INF web.xml
  Log:
  Update the Struts Example Application so that it uses only the new
  (separated) custom tag libraries, rather than the old combined one.
  
  The old combined library will remain in the Struts 1.0 distribution, but
  it should be considered deprecated.  New development based on Struts
  should use only the new tag libraries.
  
  Revision  Changes    Path
  1.7       +1 -16     jakarta-struts/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/TODO,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TODO	2000/10/19 01:00:34	1.6
  +++ TODO	2000/11/04 00:51:17	1.7
  @@ -1,4 +1,4 @@
  -$Id: TODO,v 1.6 2000/10/19 01:00:34 craigmcc Exp $
  +$Id: TODO,v 1.7 2000/11/04 00:51:17 craigmcc Exp $
   
   
   			    Struts TODO List
  @@ -18,18 +18,7 @@
     tags) more amenable to a WML environment, as well as environments not using
     HTTP (and therefore not using HttpServletRequest/HttpServletResponse).
   
  -- Think about segregating the various tags into logically divided sublibraries,
  -  with the "struts.tld" library still containing all-in-one for backwards
  -  compatibility.  Considerations for separate libraries:
  -	* "form" - <struts:form> and all its related tags
  -	* "i18n" - <struts:message> and other tags specifically related to
  -          internationalization
  -	* "logic" - Logical flow of control tags: conditionals, loops
  -	* "beans" - General access to properties of beans, including
  -          representation of beans and properties as collections
  -	* "template" - The template library contributed by David Geary
   
  -
   MVC Framework [org.apache.struts.action]:
   ----------------------------------------
   
  @@ -101,10 +90,6 @@
   - Improve the mechanism by which you define values and corresponding labels
     for <struts:options>.  Motivation:  STRUTS-DEV (07/27/2000) David
     Winterfeldt, STRUTS-DEV (08/02/2000) David Winterfeldt.
  -
  -- Add conditionals like ifPropertyLessThan (a specified value),
  -  ifPropertyTrue (for booleans), ....  Motivation:  See also
  -  ifAttributeEquals: STRUTS-DEV (07/27/2000) David Winterfeldt.
   
   - Enhance the form management tags to optionally generate JavaScript code
     for client side validation of things like required fields.  Background:
  
  
  
  1.6       +6 -5      jakarta-struts/web/example/index.jsp
  
  Index: index.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/index.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- index.jsp	2000/11/03 20:57:54	1.5
  +++ index.jsp	2000/11/04 00:51:18	1.6
  @@ -1,10 +1,11 @@
   <%@ page language="java" %>
  -<%@ taglib uri="/WEB-INF/struts.tld" prefix="struts" %>
  +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  +<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
   
   <html>
   <head>
  -<title><struts:message key="index.title"/></title>
  +<title><bean:message key="index.title"/></title>
   </head>
   <body bgcolor="white">
   
  @@ -23,10 +24,10 @@
     </font>
   </logic:notPresent>
   
  -<h3><struts:message key="index.heading"/></h3>
  +<h3><bean:message key="index.heading"/></h3>
   <ul>
  -<li><struts:link href="editRegistration.do?action=Create"><struts:message
key="index.registration"/></struts:link>
  -<li><struts:link href="logon.jsp"><struts:message key="index.logon"/></struts:link>
  +<li><form:link href="editRegistration.do?action=Create"><bean:message key="index.registration"/></form:link></li>
  +<li><form:link href="logon.jsp"><bean:message key="index.logon"/></form:link></li>
   </ul>
   
   </body>
  
  
  
  1.7       +4 -3      jakarta-struts/web/example/logon.jsp
  
  Index: logon.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/logon.jsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- logon.jsp	2000/11/03 20:57:56	1.6
  +++ logon.jsp	2000/11/04 00:51:18	1.7
  @@ -1,10 +1,11 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/struts.tld" prefix="struts" %>
  +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
   
   <html>
   <head>
  -<title><struts:message key="logon.title"/></title>
  +<title><bean:message key="logon.title"/></title>
   </head>
   <body bgcolor="white">
   
  @@ -16,7 +17,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.username"/>
  +      <bean:message key="prompt.username"/>
       </th>
       <td align="left">
         <form:text property="username" size="16" maxlength="16"/>
  @@ -25,7 +26,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.password"/>
  +      <bean:message key="prompt.password"/>
       </th>
       <td align="left">
         <form:password property="password" size="16" maxlength="16"/>
  
  
  
  1.5       +6 -5      jakarta-struts/web/example/mainMenu.jsp
  
  Index: mainMenu.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/mainMenu.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- mainMenu.jsp	2000/08/01 20:04:04	1.4
  +++ mainMenu.jsp	2000/11/04 00:51:18	1.5
  @@ -1,20 +1,21 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/app.tld" prefix="app" %>
  -<%@ taglib uri="/WEB-INF/struts.tld" prefix="struts" %>
  +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  +<%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
   <app:checkLogon/>
   <jsp:useBean id="user" scope="session" type="org.apache.struts.example.User"/>
   
   <html>
   <head>
  -<title><struts:message key="mainMenu.title"/></title>
  +<title><bean:message key="mainMenu.title"/></title>
   </head>
   <body bgcolor="white">
   
  -<h3><struts:message key="mainMenu.heading"/>
  +<h3><bean:message key="mainMenu.heading"/>
   <jsp:getProperty name="user" property="username"/></h3>
   <ul>
  -<li><struts:link href="editRegistration.do?action=Edit"><struts:message
key="mainMenu.registration"/></struts:link>
  -<li><struts:link href="logoff.do"><struts:message key="mainMenu.logoff"/></struts:link>
  +<li><form:link href="editRegistration.do?action=Edit"><bean:message key="mainMenu.registration"/></form:link></li>
  +<li><form:link href="logoff.do"><bean:message key="mainMenu.logoff"/></form:link></li>
   </ul>
   
   </body>
  
  
  
  1.10      +24 -25    jakarta-struts/web/example/registration.jsp
  
  Index: registration.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/registration.jsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- registration.jsp	2000/11/03 20:57:57	1.9
  +++ registration.jsp	2000/11/04 00:51:19	1.10
  @@ -1,28 +1,27 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/app.tld"    prefix="app" %>
  -<%@ taglib uri="/WEB-INF/struts.tld" prefix="struts" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  -<struts:ifPropertyEquals name="registrationForm" scope="request"
  -                         property="action" value="Edit">
  +<logic:equal name="registrationForm" property="action"
  +            scope="request" value="Edit">
     <app:checkLogon/>
  -</struts:ifPropertyEquals>
  +</logic:equal>
   
   <html>
   <head>
   <logic:equal name="registrationForm" property="action"
               scope="request" value="Create">
  -  <title><struts:message key="registration.title.create"/></title>
  +  <title><bean:message key="registration.title.create"/></title>
   </logic:equal>
   <logic:equal name="registrationForm" property="action"
               scope="request" value="Edit">
  -  <title><struts:message key="registration.title.edit"/></title>
  +  <title><bean:message key="registration.title.edit"/></title>
   </logic:equal>
   </head>
   <body bgcolor="white">
   
  -<struts:errors/>
  +<form:errors/>
   
   <form:form action="saveRegistration.do" name="registrationForm"
               scope="request" type="org.apache.struts.example.RegistrationForm">
  @@ -31,7 +30,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.username"/>
  +      <bean:message key="prompt.username"/>
       </th>
       <td align="left">
         <logic:equal name="registrationForm" property="action"
  @@ -49,7 +48,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.password"/>
  +      <bean:message key="prompt.password"/>
       </th>
       <td align="left">
         <form:password property="password" size="16" maxlength="16"/>
  @@ -58,7 +57,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.password2"/>
  +      <bean:message key="prompt.password2"/>
       </th>
       <td align="left">
         <form:password property="password2" size="16" maxlength="16"/>
  @@ -67,7 +66,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.fullName"/>
  +      <bean:message key="prompt.fullName"/>
       </th>
       <td align="left">
         <form:text property="fullName" size="50"/>
  @@ -76,7 +75,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.fromAddress"/>
  +      <bean:message key="prompt.fromAddress"/>
       </th>
       <td align="left">
         <form:text property="fromAddress" size="50"/>
  @@ -85,7 +84,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.replyToAddress"/>
  +      <bean:message key="prompt.replyToAddress"/>
       </th>
       <td align="left">
         <form:text property="replyToAddress" size="50"/>
  @@ -95,16 +94,16 @@
     <tr>
       <td align="right">
         <form:submit>
  -        <struts:message key="button.save"/>
  +        <bean:message key="button.save"/>
         </form:submit>
       </td>
       <td align="left">
         <form:reset>
  -        <struts:message key="button.reset"/>
  +        <bean:message key="button.reset"/>
         </form:reset>
         &nbsp;
         <form:cancel>
  -        <struts:message key="button.cancel"/>
  +        <bean:message key="button.cancel"/>
         </form:cancel>
       </td>
     </tr>
  @@ -116,26 +115,26 @@
               scope="request" value="Edit">
   
   <div align="center">
  -<h3><struts:message key="heading.subscriptions"/></h3>
  +<h3><bean:message key="heading.subscriptions"/></h3>
   </div>
   
   <table border="1" width="100%">
   
     <tr>
       <th align="center" width="30%">
  -      <struts:message key="heading.host"/>
  +      <bean:message key="heading.host"/>
       </th>
       <th align="center" width="25%">
  -      <struts:message key="heading.user"/>
  +      <bean:message key="heading.user"/>
       </th>
       <th align="center" width="10%">
  -      <struts:message key="heading.type"/>
  +      <bean:message key="heading.type"/>
       </th>
       <th align="center" width="10%">
  -      <struts:message key="heading.autoConnect"/>
  +      <bean:message key="heading.autoConnect"/>
       </th>
       <th align="center" width="15%">
  -      <struts:message key="heading.action"/>
  +      <bean:message key="heading.action"/>
       </th>
     </tr>
   
  @@ -155,10 +154,10 @@
       </td>
       <td align="center">
         <app:linkSubscription href="editSubscription.do?action=Delete">
  -        <struts:message key="registration.deleteSubscription"/>
  +        <bean:message key="registration.deleteSubscription"/>
         </app:linkSubscription>
         <app:linkSubscription href="editSubscription.do?action=Edit">
  -        <struts:message key="registration.editSubscription"/>
  +        <bean:message key="registration.editSubscription"/>
         </app:linkSubscription>
       </td>
     </tr>
  @@ -167,7 +166,7 @@
   </table>
   
   <app:linkUser href="editSubscription.do?action=Create">
  -  <struts:message key="registration.addSubscription"/>
  +  <bean:message key="registration.addSubscription"/>
   </app:linkUser>
   
   </logic:equal>
  
  
  
  1.15      +15 -16    jakarta-struts/web/example/subscription.jsp
  
  Index: subscription.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/subscription.jsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- subscription.jsp	2000/11/03 20:57:59	1.14
  +++ subscription.jsp	2000/11/04 00:51:19	1.15
  @@ -1,6 +1,5 @@
   <%@ page language="java" %>
   <%@ taglib uri="/WEB-INF/app.tld"    prefix="app" %>
  -<%@ taglib uri="/WEB-INF/struts.tld" prefix="struts" %>
   <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
   <%@ taglib uri="/WEB-INF/struts-form.tld" prefix="form" %>
   <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  @@ -18,20 +17,20 @@
   <head>
   <logic:equal name="subscriptionForm" property="action"
               scope="request" value="Create">
  -  <title><struts:message key="subscription.title.create"/></title>
  +  <title><bean:message key="subscription.title.create"/></title>
   </logic:equal>
   <logic:equal name="subscriptionForm" property="action"
               scope="request" value="Delete">
  -  <title><struts:message key="subscription.title.delete"/></title>
  +  <title><bean:message key="subscription.title.delete"/></title>
   </logic:equal>
   <logic:equal name="subscriptionForm" property="action"
               scope="request" value="Edit">
  -  <title><struts:message key="subscription.title.edit"/></title>
  +  <title><bean:message key="subscription.title.edit"/></title>
   </logic:equal>
   </head>
   <body bgcolor="white">
   
  -<struts:errors/>
  +<form:errors/>
   
   <form:form action="saveSubscription.do" name="subscriptionForm"
               focus="host"
  @@ -42,7 +41,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.username"/>
  +      <bean:message key="prompt.username"/>
       </th>
       <td align="left">
           <bean:write name="user" property="username" filter="true"/>
  @@ -51,7 +50,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.mailHostname"/>
  +      <bean:message key="prompt.mailHostname"/>
       </th>
       <td align="left">
         <form:textarea property="host" cols="50" rows="1"/>
  @@ -60,7 +59,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.mailUsername"/>
  +      <bean:message key="prompt.mailUsername"/>
       </th>
       <td align="left">
         <form:text property="username" size="50"/>
  @@ -69,7 +68,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.mailPassword"/>
  +      <bean:message key="prompt.mailPassword"/>
       </th>
       <td align="left">
         <form:password property="password" size="50"/>
  @@ -78,7 +77,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.mailServerType"/>
  +      <bean:message key="prompt.mailServerType"/>
       </th>
       <td align="left">
         <form:select property="type">
  @@ -90,7 +89,7 @@
   
     <tr>
       <th align="right">
  -      <struts:message key="prompt.autoConnect"/>
  +      <bean:message key="prompt.autoConnect"/>
       </th>
       <td align="left">
         <form:checkbox property="autoConnect"/>
  @@ -102,19 +101,19 @@
         <logic:equal name="subscriptionForm" property="action"
                     scope="request" value="Create">
           <form:submit>
  -          <struts:message key="button.save"/>
  +          <bean:message key="button.save"/>
           </form:submit>
         </logic:equal>
         <logic:equal name="subscriptionForm" property="action"
                     scope="request" value="Delete">
           <form:submit>
  -          <struts:message key="button.confirm"/>
  +          <bean:message key="button.confirm"/>
           </form:submit>
         </logic:equal>
         <logic:equal name="subscriptionForm" property="action"
                     scope="request" value="Edit">
           <form:submit>
  -          <struts:message key="button.save"/>
  +          <bean:message key="button.save"/>
           </form:submit>
         </logic:equal>
       </td>
  @@ -122,12 +121,12 @@
         <logic:notEqual name="subscriptionForm" property="action"
                        scope="request" value="Delete">
           <form:reset>
  -          <struts:message key="button.reset"/>
  +          <bean:message key="button.reset"/>
           </form:reset>
         </logic:notEqual>
         &nbsp;
         <form:cancel>
  -        <struts:message key="button.cancel"/>
  +        <bean:message key="button.cancel"/>
         </form:cancel>
       </td>
     </tr>
  
  
  
  1.9       +0 -5      jakarta-struts/web/example/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/web.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- web.xml	2000/11/03 20:58:13	1.8
  +++ web.xml	2000/11/04 00:51:20	1.9
  @@ -67,11 +67,6 @@
   
     <!-- Struts Tag Library Descriptors -->
     <taglib>
  -    <taglib-uri>/WEB-INF/struts.tld</taglib-uri>
  -    <taglib-location>/WEB-INF/struts.tld</taglib-location>
  -  </taglib>
  -
  -  <taglib>
       <taglib-uri>/WEB-INF/struts-bean.tld</taglib-uri>
       <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
     </taglib>
  
  
  

Mime
View raw message