You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2003/02/22 03:39:48 UTC

cvs commit: jakarta-struts/conf/test struts-config.xml web.xml

jmitchell    2003/02/21 18:39:48

  Modified:    conf/test struts-config.xml web.xml
  Log:
  The first of many changes to support the new tests for logic and bean.
  
  Revision  Changes    Path
  1.3       +24 -54    jakarta-struts/conf/test/struts-config.xml
  
  Index: struts-config.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/conf/test/struts-config.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- struts-config.xml	22 Dec 2002 06:10:04 -0000	1.2
  +++ struts-config.xml	22 Feb 2003 02:39:48 -0000	1.3
  @@ -11,30 +11,19 @@
   
   <struts-config>
   
  -
  -  <!-- ========== Data Source Configuration =============================== -->
  -<!--
  -  <data-sources>
  -    <data-source
  -       autoCommit="false"
  -      description="Example Data Source Configuration"
  -      driverClass="org.postgresql.Driver"
  -         maxCount="4"
  -         minCount="2"
  -         password="mypassword"
  -              url="jdbc:postgresql://localhost/mydatabase"
  -             user="myusername"
  -    />
  -  </data-sources>
  --->
  -
     <!-- ========== Form Bean Definitions =================================== -->
     <form-beans>
  +    <form-bean       name="testDynaFormBean"
  +                     type="org.apache.struts.validator.DynaValidatorForm">
  +      <form-property name="field1" type="java.lang.String"/>
  +      <form-property name="field2" type="java.lang.String"/>
  +    </form-bean>
  +
  +
  +    <!-- Registration form bean -->
  +    <form-bean      name="testFormBean"
  +                    type="org.apache.struts.taglib.SimpleFormBeanForTesting"/>
   
  -    <!-- Example logon form bean 
  -    <form-bean      name="logonForm"
  -                    type="org.apache.struts.webapp.example.LogonForm"/>
  -     -->
   
     </form-beans>
   
  @@ -45,49 +34,30 @@
       <!-- Example logon forward 
        <forward   name="logon"                path="/logon.jsp"/>
        -->
  -
  -  </global-forwards>
  +     <forward name="testIncludeTagForward" 
  +     			path="/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
  +</global-forwards>
   
   
     <!-- ========== Action Mapping Definitions ============================== -->
     <action-mappings>
   
  -    <!-- Example logon action 
  -    <action    path="/logon"
  -               type="org.apache.struts.webapp.example.LogonAction"
  -               name="logonForm"
  -              scope="request"
  -              input="/logon.jsp">
  +    <!-- Process a user logoff -->
  +    <action    path="/testIncludeTagTransaction"
  +               type="org.apache.struts.taglib.bean.resources.IncludeTagTransactionTestAction">
  +      <forward name="success"              
  +      			path="/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
       </action>
  -    -->
   
  -    <!-- Example logoff action 
  -    <action    path="/logoff"
  -               type="org.apache.struts.webapp.example.LogoffAction">
  -      <forward name="success"              path="/index.jsp"/>
  -    </action>
  -    -->
  +  </action-mappings>
   
   
  -    <!-- The standard administrative actions available with Struts -->
  -    <!-- These would be either omitted or protected by security -->
  -    <!-- in a real application deployment -->
  -    <action    path="/admin/addFormBean"
  -               type="org.apache.struts.actions.AddFormBeanAction"/>
  -    <action    path="/admin/addForward"
  -               type="org.apache.struts.actions.AddForwardAction"/>
  -    <action    path="/admin/addMapping"
  -               type="org.apache.struts.actions.AddMappingAction"/>
  -    <action    path="/admin/reload"
  -               type="org.apache.struts.actions.ReloadAction"/>
  -    <action    path="/admin/removeFormBean"
  -               type="org.apache.struts.actions.RemoveFormBeanAction"/>
  -    <action    path="/admin/removeForward"
  -               type="org.apache.struts.actions.RemoveForwardAction"/>
  -    <action    path="/admin/removeMapping"
  -               type="org.apache.struts.actions.RemoveMappingAction"/>
  +  <message-resources
  +    parameter="org.apache.struts.taglib.bean.resources.ApplicationResources"/>
   
  +  <message-resources
  +    parameter="org.apache.struts.taglib.bean.resources.AlternateApplicationResources"
  +    key="alternate"/>
   
  -  </action-mappings>
   
   </struts-config>
  
  
  
  1.4       +17 -0     jakarta-struts/conf/test/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/conf/test/web.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- web.xml	16 Jun 2002 04:02:38 -0000	1.3
  +++ web.xml	22 Feb 2003 02:39:48 -0000	1.4
  @@ -6,6 +6,17 @@
   
   <web-app>
   
  +  <!-- Action Servlet Configuration -->
  +  <servlet>
  +    <servlet-name>action</servlet-name>
  +    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
  +    <init-param>
  +      <param-name>config</param-name>
  +      <param-value>/WEB-INF/struts-config.xml</param-value>
  +    </init-param>
  +    <load-on-startup>1</load-on-startup>
  +  </servlet>
  +
   <!--
       <filter>
           <filter-name>FilterRedirectory</filter-name>
  @@ -42,4 +53,10 @@
           <url-pattern>/JspRedirector</url-pattern>
       </servlet-mapping>
       
  +  <!-- Action Servlet Mapping -->
  +  <servlet-mapping>
  +    <servlet-name>action</servlet-name>
  +    <url-pattern>*.do</url-pattern>
  +  </servlet-mapping>
  +
   </web-app>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org