martinc     2003/02/22 07:27:29

  Modified:    conf/test struts-config.xml
  Log:
  This checkin results in exactly the same content as version 1.4 of this
  file. It's just reverting the temporary change needed to get the fix for
  the tests into the 1.1 RC1 release.
  
  Revision  Changes    Path
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- struts-config.xml 22 Feb 2003 15:19:53 -0000      1.5
  +++ struts-config.xml 22 Feb 2003 15:27:29 -0000      1.6
  @@ -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>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to