martinc 2003/02/22 07:19:53
Modified: conf/test struts-config.xml
Log:
This is a fix for the tests in Struts 1.1 RC1. Version 1.2 of this file
was originally tagged for RC1, and a problem was found in testing. In
the interim, many changes were checked in as version 1.3, while the fix
for the RC1 problem was checked in as version 1.4. This checkin applies
the diff between 1.3 and 1.4 to version 1.2, thus providing a version of
the file including only the change required for RC1. This version will be
re-tagged for RC1, and then the change reverted for HEAD.
Revision Changes Path
1.5 +54 -24 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- struts-config.xml 22 Feb 2003 07:39:23 -0000 1.4
+++ struts-config.xml 22 Feb 2003 15:19:53 -0000 1.5
@@ -11,19 +11,30 @@
<struts-config>
- <!-- ========== 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>
+ <!-- ========== 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>
+-->
- <!-- Registration form bean -->
- <form-bean name="testFormBean"
- type="org.apache.struts.taglib.SimpleFormBeanForTesting"/>
+ <!-- ========== Form Bean Definitions =================================== -->
+ <form-beans>
+ <!-- Example logon form bean
+ <form-bean name="logonForm"
+ type="org.apache.struts.webapp.example.LogonForm"/>
+ -->
</form-beans>
@@ -34,30 +45,49 @@
<!-- Example logon forward
<forward name="logon" path="/logon.jsp"/>
-->
- <forward name="testIncludeTagForward"
-
path="/test/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
-</global-forwards>
+
+ </global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
- <!-- 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"/>
+ <!-- Example logon action
+ <action path="/logon"
+ type="org.apache.struts.webapp.example.LogonAction"
+ name="logonForm"
+ scope="request"
+ input="/logon.jsp">
</action>
+ -->
- </action-mappings>
+ <!-- Example logoff action
+ <action path="/logoff"
+ type="org.apache.struts.webapp.example.LogoffAction">
+ <forward name="success" path="/index.jsp"/>
+ </action>
+ -->
- <message-resources
- parameter="org.apache.struts.taglib.bean.resources.ApplicationResources"/>
+ <!-- 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.AlternateApplicationResources"
- key="alternate"/>
+ </action-mappings>
</struts-config>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
