You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by rl...@apache.org on 2001/04/11 04:08:22 UTC

cvs commit: jakarta-struts/web/example/WEB-INF web.xml struts-config.xml app.tld action.xml

rleland     01/04/10 19:08:22

  Modified:    web/example/WEB-INF web.xml struts-config.xml app.tld
                        action.xml
  Log:
  Move under struts.webapp.example
  
  Revision  Changes    Path
  1.11      +2 -2      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- web.xml	2001/01/07 00:16:29	1.10
  +++ web.xml	2001/04/11 02:08:19	1.11
  @@ -10,7 +10,7 @@
     <!-- Database Initialization Servlet Configuration -->
     <servlet>
       <servlet-name>database</servlet-name>
  -    <servlet-class>org.apache.struts.example.DatabaseServlet</servlet-class>
  +    <servlet-class>org.apache.struts.webapp.example.DatabaseServlet</servlet-class>
       <init-param>
         <param-name>debug</param-name>
         <param-value>2</param-value>
  @@ -25,7 +25,7 @@
       <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
       <init-param>
         <param-name>application</param-name>
  -      <param-value>org.apache.struts.example.ApplicationResources</param-value>
  +      <param-value>org.apache.struts.webapp.example.ApplicationResources</param-value>
       </init-param>
       <init-param>
         <param-name>config</param-name>
  
  
  
  1.10      +9 -9      jakarta-struts/web/example/WEB-INF/struts-config.xml
  
  Index: struts-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/struts-config.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- struts-config.xml	2001/04/08 03:54:53	1.9
  +++ struts-config.xml	2001/04/11 02:08:20	1.10
  @@ -40,15 +40,15 @@
   
       <!-- Logon form bean -->
       <form-bean      name="logonForm"
  -                    type="org.apache.struts.example.LogonForm"/>
  +                    type="org.apache.struts.webapp.example.LogonForm"/>
   
       <!-- Registration form bean -->
       <form-bean      name="registrationForm"
  -                    type="org.apache.struts.example.RegistrationForm"/>
  +                    type="org.apache.struts.webapp.example.RegistrationForm"/>
   
       <!-- Subscription form bean -->
       <form-bean      name="subscriptionForm"
  -                    type="org.apache.struts.example.SubscriptionForm"/>
  +                    type="org.apache.struts.webapp.example.SubscriptionForm"/>
   
     </form-beans>
   
  @@ -66,7 +66,7 @@
   
       <!-- Edit user registration -->
       <action    path="/editRegistration"
  -               type="org.apache.struts.example.EditRegistrationAction"
  +               type="org.apache.struts.webapp.example.EditRegistrationAction"
                  name="registrationForm"
                 scope="request"
              validate="false">
  @@ -75,7 +75,7 @@
   
       <!-- Edit mail subscription -->
       <action    path="/editSubscription"
  -               type="org.apache.struts.example.EditSubscriptionAction"
  +               type="org.apache.struts.webapp.example.EditSubscriptionAction"
                  name="subscriptionForm"
                 scope="request"
              validate="false">
  @@ -85,13 +85,13 @@
   
       <!-- Process a user logoff -->
       <action    path="/logoff"
  -               type="org.apache.struts.example.LogoffAction">
  +               type="org.apache.struts.webapp.example.LogoffAction">
         <forward name="success"              path="/index.jsp"/>
       </action>
   
       <!-- Process a user logon -->
       <action    path="/logon"
  -               type="org.apache.struts.example.LogonAction"
  +               type="org.apache.struts.webapp.example.LogonAction"
                  name="logonForm"
                 scope="request"
                 input="/logon.jsp">
  @@ -99,14 +99,14 @@
   
       <!-- Save user registration -->
       <action    path="/saveRegistration"
  -               type="org.apache.struts.example.SaveRegistrationAction"
  +               type="org.apache.struts.webapp.example.SaveRegistrationAction"
                  name="registrationForm"
                 scope="request"
                 input="/registration.jsp"/>
   
       <!-- Save mail subscription -->
       <action    path="/saveSubscription"
  -               type="org.apache.struts.example.SaveSubscriptionAction"
  +               type="org.apache.struts.webapp.example.SaveSubscriptionAction"
                  name="subscriptionForm"
                 scope="request"
                 input="/subscription.jsp">
  
  
  
  1.5       +194 -97   jakarta-struts/web/example/WEB-INF/app.tld
  
  Index: app.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/app.tld,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- app.tld	2000/11/18 22:11:57	1.4
  +++ app.tld	2001/04/11 02:08:20	1.5
  @@ -1,97 +1,194 @@
  -<?xml version="1.0" encoding="ISO-8859-1" ?>
  -<!DOCTYPE taglib
  -  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
  -  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
  -
  -<taglib>
  -
  -  <tlibversion>1.0</tlibversion>
  -  <jspversion>1.1</jspversion>
  -  <shortname>Application Tag Library</shortname>
  -  <uri>http://jakarta.apache.org/taglibs/struts-example-1.0</uri>
  -  <info>
  -    This tag library contains functionality specific to the Struts
  -    Example Application.
  -  </info>
  -
  -
  -  <tag>
  -    <name>checkLogon</name>
  -    <tagclass>org.apache.struts.example.CheckLogonTag</tagclass>
  -    <bodycontent>empty</bodycontent>
  -    <info>
  -      Validate that there is a currently logged on user, by checking for
  -      the existence of a session-scope bean under the specified name.
  -      If there is no such bean, forward control to the specified page,
  -      which will typically be a logon form.
  -
  -      name - Name of the session-scope bean to check for [user]
  -
  -      page - Context-relative path to the logon page [/logon.jsp]
  -    </info>
  -    <attribute>
  -      <name>name</name>
  -      <required>false</required>
  -      <rtexprvalue>false</rtexprvalue>
  -    </attribute>
  -    <attribute>
  -      <name>page</name>
  -      <required>false</required>
  -      <rtexprvalue>false</rtexprvalue>
  -    </attribute>
  -  </tag>
  -
  -
  -  <tag>
  -    <name>linkSubscription</name>
  -    <tagclass>org.apache.struts.example.LinkSubscriptionTag</tagclass>
  -    <info>
  -      Generate a URL-encoded hyperlink to the a URL made up of the
  -      specified base value, plus optional query parameters that
  -      select the specified Subscription object.
  -
  -      name     - Name of the attribute containing the specified
  -                 Subscription.  [subscription]
  -
  -      page     - Context-relative URL of the generated link
  -    </info>
  -    <attribute>
  -      <name>name</name>
  -      <required>false</required>
  -      <rtexprvalue>true</rtexprvalue>
  -    </attribute>
  -    <attribute>
  -      <name>page</name>
  -      <required>true</required>
  -      <rtexprvalue>true</rtexprvalue>
  -    </attribute>
  -  </tag>
  -
  -
  -  <tag>
  -    <name>linkUser</name>
  -    <tagclass>org.apache.struts.example.LinkUserTag</tagclass>
  -    <info>
  -      Generate a URL-encoded hyperlink to the a URL made up of the
  -      specified base value, plus optional query parameters that
  -      select the specified User object.
  -
  -      name     - Name of the attribute containing the specified user.
  -                 [user]
  -
  -      href     - Context-relative URL of the generated link
  -    </info>
  -    <attribute>
  -      <name>name</name>
  -      <required>false</required>
  -      <rtexprvalue>true</rtexprvalue>
  -    </attribute>
  -    <attribute>
  -      <name>page</name>
  -      <required>true</required>
  -      <rtexprvalue>true</rtexprvalue>
  -    </attribute>
  -  </tag>
  -
  -
  -</taglib>
  +<?xml version="1.0" encoding="ISO-8859-1" ?>
  +
  +<!DOCTYPE taglib
  +
  +  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
  +
  +  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
  +
  +
  +
  +<taglib>
  +
  +
  +
  +  <tlibversion>1.0</tlibversion>
  +
  +  <jspversion>1.1</jspversion>
  +
  +  <shortname>Application Tag Library</shortname>
  +
  +  <uri>http://jakarta.apache.org/taglibs/struts-example-1.0</uri>
  +
  +  <info>
  +
  +    This tag library contains functionality specific to the Struts
  +
  +    Example Application.
  +
  +  </info>
  +
  +
  +
  +
  +
  +  <tag>
  +
  +    <name>checkLogon</name>
  +
  +    <tagclass>org.apache.struts.webapp.example.CheckLogonTag</tagclass>
  +
  +    <bodycontent>empty</bodycontent>
  +
  +    <info>
  +
  +      Validate that there is a currently logged on user, by checking for
  +
  +      the existence of a session-scope bean under the specified name.
  +
  +      If there is no such bean, forward control to the specified page,
  +
  +      which will typically be a logon form.
  +
  +
  +
  +      name - Name of the session-scope bean to check for [user]
  +
  +
  +
  +      page - Context-relative path to the logon page [/logon.jsp]
  +
  +    </info>
  +
  +    <attribute>
  +
  +      <name>name</name>
  +
  +      <required>false</required>
  +
  +      <rtexprvalue>false</rtexprvalue>
  +
  +    </attribute>
  +
  +    <attribute>
  +
  +      <name>page</name>
  +
  +      <required>false</required>
  +
  +      <rtexprvalue>false</rtexprvalue>
  +
  +    </attribute>
  +
  +  </tag>
  +
  +
  +
  +
  +
  +  <tag>
  +
  +    <name>linkSubscription</name>
  +
  +    <tagclass>org.apache.struts.webapp.example.LinkSubscriptionTag</tagclass>
  +
  +    <info>
  +
  +      Generate a URL-encoded hyperlink to the a URL made up of the
  +
  +      specified base value, plus optional query parameters that
  +
  +      select the specified Subscription object.
  +
  +
  +
  +      name     - Name of the attribute containing the specified
  +
  +                 Subscription.  [subscription]
  +
  +
  +
  +      page     - Context-relative URL of the generated link
  +
  +    </info>
  +
  +    <attribute>
  +
  +      <name>name</name>
  +
  +      <required>false</required>
  +
  +      <rtexprvalue>true</rtexprvalue>
  +
  +    </attribute>
  +
  +    <attribute>
  +
  +      <name>page</name>
  +
  +      <required>true</required>
  +
  +      <rtexprvalue>true</rtexprvalue>
  +
  +    </attribute>
  +
  +  </tag>
  +
  +
  +
  +
  +
  +  <tag>
  +
  +    <name>linkUser</name>
  +
  +    <tagclass>org.apache.struts.webapp.example.LinkUserTag</tagclass>
  +
  +    <info>
  +
  +      Generate a URL-encoded hyperlink to the a URL made up of the
  +
  +      specified base value, plus optional query parameters that
  +
  +      select the specified User object.
  +
  +
  +
  +      name     - Name of the attribute containing the specified user.
  +
  +                 [user]
  +
  +
  +
  +      href     - Context-relative URL of the generated link
  +
  +    </info>
  +
  +    <attribute>
  +
  +      <name>name</name>
  +
  +      <required>false</required>
  +
  +      <rtexprvalue>true</rtexprvalue>
  +
  +    </attribute>
  +
  +    <attribute>
  +
  +      <name>page</name>
  +
  +      <required>true</required>
  +
  +      <rtexprvalue>true</rtexprvalue>
  +
  +    </attribute>
  +
  +  </tag>
  +
  +
  +
  +
  +
  +</taglib>
  +
  
  
  
  1.8       +11 -11    jakarta-struts/web/example/WEB-INF/action.xml
  
  Index: action.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/web/example/WEB-INF/action.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- action.xml	2001/01/25 19:04:51	1.7
  +++ action.xml	2001/04/11 02:08:20	1.8
  @@ -15,51 +15,51 @@
   
     <!-- Edit user registration -->
     <action    path="/editRegistration"
  -      actionClass="org.apache.struts.example.EditRegistrationAction"
  +      actionClass="org.apache.struts.webapp.example.EditRegistrationAction"
       formAttribute="registrationForm"
  -        formClass="org.apache.struts.example.RegistrationForm">
  +        formClass="org.apache.struts.webapp.example.RegistrationForm">
       <forward name="success"    path="/registration.jsp"/>
     </action>
   
     <!-- Edit mail subscription -->
     <action    path="/editSubscription"
  -      actionClass="org.apache.struts.example.EditSubscriptionAction"
  +      actionClass="org.apache.struts.webapp.example.EditSubscriptionAction"
       formAttribute="subscriptionForm"
  -        formClass="org.apache.struts.example.SubscriptionForm">
  +        formClass="org.apache.struts.webapp.example.SubscriptionForm">
       <forward name="failure"    path="/mainMenu.jsp"/>
       <forward name="success"    path="/subscription.jsp"/>
     </action>
   
     <!-- Process a user logoff -->
     <action    path="/logoff"
  -      actionClass="org.apache.struts.example.LogoffAction">
  +      actionClass="org.apache.struts.webapp.example.LogoffAction">
       <forward name="success"    path="/index.jsp"/>
     </action>
   
     <!-- Process a user logon -->
     <action    path="/logon"
  -      actionClass="org.apache.struts.example.LogonAction"
  +      actionClass="org.apache.struts.webapp.example.LogonAction"
       formAttribute="logonForm"
  -        formClass="org.apache.struts.example.LogonForm"
  +        formClass="org.apache.struts.webapp.example.LogonForm"
           inputForm="/logon.jsp">
       <forward name="success"    path="/mainMenu.jsp"/>
     </action>
   
     <!-- Save user registration -->
     <action    path="/saveRegistration"
  -      actionClass="org.apache.struts.example.SaveRegistrationAction"
  +      actionClass="org.apache.struts.webapp.example.SaveRegistrationAction"
       formAttribute="registrationForm"
  -        formClass="org.apache.struts.example.RegistrationForm"
  +        formClass="org.apache.struts.webapp.example.RegistrationForm"
           inputForm="/registration.jsp">
       <forward name="success"    path="/mainMenu.jsp"/>
     </action>
   
     <!-- Save mail subscription -->
     <action     path="/saveSubscription"
  -       actionClass="org.apache.struts.example.SaveSubscriptionAction">
  +       actionClass="org.apache.struts.webapp.example.SaveSubscriptionAction">
       <property name="formAttribute" value="subscriptionForm"/>
       <property name="formClass"
  -             value="org.apache.struts.example.SubscriptionForm"/>
  +             value="org.apache.struts.webapp.example.SubscriptionForm"/>
       <property name="inputForm"     value="/subscription.jsp"/>
       <forward  name="success"        path="/editRegistration.do?action=Edit"/>
     </action>