Menu
▾
▴
[Struts-cvs] dialogs/war/WEB-INF struts-config.xml,1.9,1.10 web.xml,1.2,1.3
|
From: <jm...@us...> - 2005-08-04 07:40:41
|
Update of /cvsroot/struts/dialogs/war/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19672/war/WEB-INF Modified Files: struts-config.xml web.xml Log Message: Index: struts-config.xml =================================================================== RCS file: /cvsroot/struts/dialogs/war/WEB-INF/struts-config.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** struts-config.xml 11 Jul 2005 07:13:04 -0000 1.9 --- struts-config.xml 4 Aug 2005 07:39:45 -0000 1.10 *************** *** 9,74 **** <form-beans> <!-- Struts requires, that action processing POST request, must have ! corresponding form bean. This is a dummy dynabean for such cases. --> ! <form-bean name="dummyForm" type="org.apache.struts.action.DynaActionForm"/> ! <form-bean name="dialogloginform" type="net.jspcontrols.dialogs.samples.dialogloginaction.DialogLoginForm"/> ! <form-bean name="crudform" type="net.jspcontrols.dialogs.samples.crudaction.CRUDFormSample"/> ! <form-bean name="wizardform" type="net.jspcontrols.dialogs.samples.wizardaction.wizardsimple.SimpleSignupForm"/> </form-beans> <action-mappings> <!-- **************************************************************** ! SelectAction sample, an improvement over standard DispatchAction **************************************************************** --> ! <action path="/selectaction" ! type = "net.jspcontrols.dialogs.samples.selectaction.SelectActionTest" ! name = "dummyForm" ! scope = "request" ! parameter = "app-submit"> ! <forward name = "addpage" path="/selectadd.html"/> ! <forward name = "deletepage" path="/selectdelete.html"/> ! <forward name = "loginpage" path="/selectlogin.html"/> ! <forward name = "cancelpage" path="/selectcancel.html"/> ! <forward name = "unspecifiedpage" path="/selectunspecified.html"/> </action> <!-- **************************************************************** ! DialogAction sample, login page **************************************************************** --> ! <action path="/dialogloginaction" ! type = "net.jspcontrols.dialogs.samples.dialogloginaction.DialogLoginAction" ! name = "dialogloginform" scope = "session" ! validate = "false" ! parameter = "DIALOG-EVENT"> ! <!-- Where to return on error, this entry is optional. See next example. --> ! <forward name = "DIALOG-RELOAD" path="/dialogloginaction.do" redirect="true"/> ! <!-- Default view --> ! <forward name="DIALOG-VIEW" path="/dialogloginaction.jsp"/> ! <!-- Jump to other location --> ! <forward name="userhome" path="/dialogloginuserpage.jsp" redirect="true"/> </action> <!-- **************************************************************** ! DialogAction sample, stateful login web control **************************************************************** --> ! <action path="/dialogloginactioncontrol" ! type = "net.jspcontrols.dialogs.samples.dialogloginaction.DialogLoginActionControl" ! name = "dialogloginform" scope = "session" ! validate = "false" ! parameter = "DIALOG-EVENT"> ! <!-- Notice, that DIALOG-RELOAD entry is omitted. Action is automatically reloaded. --> ! <!-- Log In page --> ! <forward name="notloggedin" path="/dialogloginactioncontrol-login.jsp"/> ! <!-- Log Out page --> ! <forward name="loggedin" path="/dialogloginactioncontrol-logout.jsp"/> ! <!-- Jump to other location --> ! <forward name="userhome" path="/dialoglogincontroluserpage.jsp" redirect="true"/> </action> <!-- **************************************************************** --- 9,106 ---- <form-beans> <!-- Struts requires, that action processing POST request, must have ! corresponding action form. This is a dummy dynabean for cases when ! target action does not use an action form. ! Used in SelectAction sample and in CRUD item list page. --> ! <form-bean name = "dummyForm" type="org.apache.struts.action.DynaActionForm"/> ! <!-- Used in login dialog, login component and embedded login control --> ! <form-bean name = "loginform" type="net.jspcontrols.dialogs.samples.login.LoginForm"/> ! <!-- Used in CRUD example --> ! <form-bean name = "crudform" type="net.jspcontrols.dialogs.samples.crud.CRUDFormSample"/> ! <!-- Used in wizard example. You can choose either SignupForm or SignupFormSimple for ! same results. SignupFormSimple extends base WizardForm, thus it is in fact very simple. --> ! <!-- ! <form-bean name = "wizardform" type="net.jspcontrols.dialogs.samples.wizard.signupfull.SignupForm"/> ! --> ! <form-bean name = "wizardform" type="net.jspcontrols.dialogs.samples.wizard.signupsimple.SignupFormSimple"/> </form-beans> + <action-mappings> <!-- **************************************************************** ! SelectAction sample, an improved DispatchAction. HTML is in war/selectaction. **************************************************************** --> ! <action path = "/sample-selectaction/selectaction" ! type = "net.jspcontrols.dialogs.samples.selectaction.SelectActionSample" ! name = "dummyForm"> ! ! <forward name = "result" path = "/sample-selectaction/selectresult.jsp"/> ! <forward name = "addpage" path = "/sample-selectaction/selectadd.html"/> ! <forward name = "deletepage" path = "/sample-selectaction/selectdelete.html"/> ! <forward name = "loginpage" path = "/sample-selectaction/selectlogin.html"/> ! <forward name = "cancelpage" path = "/sample-selectaction/selectcancel.html"/> ! <forward name = "unspecifiedpage" path = "/sample-selectaction/selectunspecified.html"/> </action> <!-- **************************************************************** ! Login Dialog sample. JSP are in war/logindialog. **************************************************************** --> ! <action path = "/sample-logindialog/logindialog" ! type = "net.jspcontrols.dialogs.samples.login.LoginDialog" ! name = "loginform" scope = "session" ! validate = "false"> ! <forward name = "DIALOG-RELOAD" path = "/sample-logindialog/logindialog.do" redirect = "true"/> ! <forward name = "DIALOG-VIEW" path = "/sample-logindialog/login.jsp"/> ! <forward name = "userhome" path = "/sample-logindialog/userpage.jsp" redirect = "true"/> </action> <!-- **************************************************************** ! Login/logout component sample. JSP in war/logincomponent. **************************************************************** --> ! <action path = "/sample-logincomponent/logincomponent" ! type = "net.jspcontrols.dialogs.samples.login.LoginComponent" ! name = "loginform" scope = "session" ! validate = "false"> ! <forward name = "DIALOG-RELOAD" path = "/sample-logincomponent/logincomponent.do" redirect = "true"/> ! <forward name = "notloggedin" path = "/sample-logincomponent/logincomponent-login.jsp"/> ! <forward name = "loggedin" path = "/sample-logincomponent/logincomponent-logout.jsp"/> ! <forward name = "userhome" path = "/sample-logincomponent/userpage.jsp" redirect = "true"/> </action> + <!-- **************************************************************** + Master page + login child control for containers, which exceed + JSP specifications in terms of included resources, like Resin. + JSP in See war/logincontrol directory. + **************************************************************** --> + + <action path = "/embedded-resin" forward = "/sample-logincontrol/resin/masterpage.jsp"/> + <action path = "/embeddedchild-resin" + type = "net.jspcontrols.dialogs.samples.embedded.EmbeddedControlResin" + name = "loginform" + scope = "session" + validate = "false"> + <forward name = "DIALOG-RELOAD" path = "/embedded-resin.do" redirect = "true"/> + <forward name = "notloggedin" path = "/sample-logincontrol/resin/embedded-child-login.jsp"/> + <forward name = "loggedin" path = "/sample-logincontrol/resin/embedded-child-logout.jsp"/> + </action> + + <!-- **************************************************************** + Master page + login child control for containers, which strictly + implement JSP specifications like Tomcat. + **************************************************************** --> + + <action path = "/embedded-tomcat" forward = "/sample-logincontrol/tomcat/masterpage.jsp"/> + <action path = "/embeddedchild-tomcat" + type = "net.jspcontrols.dialogs.samples.embedded.EmbeddedControlTomcat" + name = "loginform" + scope = "session" + validate = "false"> + <forward name = "DIALOG-RELOAD" path = "/embedded-tomcat.do" redirect = "true"/> + </action> <!-- **************************************************************** *************** *** 76,167 **** **************************************************************** --> ! <!-- CRUD action helper: item list --> ! <action path="/cruditemlist" ! type = "net.jspcontrols.dialogs.samples.crudaction.ItemListActionSample" ! name = "dummyForm"> ! <forward name = "showlist" path="/crudaction-list.jsp"/> </action> <!-- CRUD action --> ! <action path="/crudaction" type = "net.jspcontrols.dialogs.actions.crud.CRUDAction" name = "crudform" scope = "session" ! validate = "false" ! parameter = "DIALOG-EVENT"> ! <forward name="MENU" path="/allsamples.html" redirect="true"/> ! <!-- Where to hand control over after input phase (POST) --> ! ! <forward name="ON-CREATE-SUCCESS" path="/crudaction.do" redirect="true"/> ! <forward name="ON-DUPLICATE-SUCCESS" path="/crudaction.do" redirect="true"/> ! ! <forward name="ON-PREVIEW" path="/crudaction.do" redirect="true"/> ! <forward name="ON-EDIT" path="/crudaction.do" redirect="true"/> ! <forward name="ON-LOAD-FAILURE" path="/erroraction.do" redirect="true"/> ! ! <forward name="ON-DELETE-SUCCESS" path="/cruditemlist.do" redirect="true"/> ! <forward name="ON-DELETE-FAILURE" path="/erroraction.do" redirect="true"/> ! ! <forward name="ON-CANCEL" path="/cruditemlist.do" redirect="true"/> ! <forward name="ON-CLOSE" path="/cruditemlist.do" redirect="true"/> ! ! <forward name="ON-STORE-SUCCESS" path="/cruditemlist.do" redirect="true"/> ! ! <forward name="ON-STORE-FAILURE" path="/crudaction.do" redirect="true"/> ! <forward name="ON-INVALID-DATA" path="/crudaction.do" redirect="true"/> <!-- Which page to load on the output phase or on refresh (GET) --> ! ! <!-- Edit Mode --> ! <forward name="CRUD-UI-MODE-EDITABLE" path="/crudaction-edit.jsp"/> <!-- Preview Mode --> ! <forward name="CRUD-UI-MODE-READONLY" path="/crudaction-noedit.jsp"/> <!-- Illegal mode, item is not active --> ! <forward name="CRUD-UI-MODE-INACTIVE" path="/crudaction-notactive.jsp"/> ! </action> ! <action path="/erroraction" forward="/crudaction-error.jsp"/> <!-- **************************************************************** CRUD action 2: create, duplucate, edit, view, delete item **************************************************************** --> <!-- CRUD action --> ! <action path="/crudactionlite" ! type = "net.jspcontrols.dialogs.samples.crudaction.CRUDActionSample" name = "crudform" scope = "session" ! validate = "false" ! parameter = "DIALOG-EVENT"> ! ! <forward name="ON-CREATE-SUCCESS" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-DUPLICATE-SUCCESS" path="/crudactionlite.do" redirect="true"/> ! ! <forward name="ON-PREVIEW" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-EDIT" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-LOAD-FAILURE" path="/crudaction-error.jsp"/> ! ! <forward name="ON-DELETE-SUCCESS" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-DELETE-FAILURE" path="/crudaction-error.jsp"/> ! ! <forward name="ON-CANCEL" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-CLOSE" path="/crudactionlite.do" redirect="true"/> ! ! <forward name="ON-STORE-SUCCESS" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-STORE-FAILURE" path="/crudactionlite.do" redirect="true"/> ! <forward name="ON-INVALID-DATA" path="/crudactionlite.do" redirect="true"/> <!-- Which page to load on the output phase or on refresh (GET) --> ! <!-- Edit Mode --> ! <forward name="CRUD-UI-MODE-EDITABLE" path="/crudaction-lite-edit.jsp"/> <!-- Preview Mode --> ! <forward name="CRUD-UI-MODE-READONLY" path="/crudaction-lite-noedit.jsp"/> <!-- If item is not active, show item list --> ! <forward name="CRUD-UI-MODE-INACTIVE" path="/crudaction-lite-list.jsp"/> </action> - <action path="/erroraction" forward="/crudaction-error.jsp"/> <!-- **************************************************************** --- 108,186 ---- **************************************************************** --> ! <!-- CRUD helper: item list --> ! <action path = "/cruditemlist" ! type = "net.jspcontrols.dialogs.samples.crud.ItemListActionSample" ! name = "dummyForm"> ! <forward name = "showlist" path = "/sample-crud/crudaction-list.jsp"/> </action> <!-- CRUD action --> ! <action path = "/crudaction" type = "net.jspcontrols.dialogs.actions.crud.CRUDAction" name = "crudform" scope = "session" ! validate = "false"> <!-- Where to hand control over after input phase (POST) --> ! <forward name = "ON-CREATE-SUCCESS" path = "/crudaction.do" redirect = "true"/> ! <forward name = "ON-DUPLICATE-SUCCESS" path = "/crudaction.do" redirect = "true"/> ! <forward name = "ON-PREVIEW" path = "/crudaction.do" redirect = "true"/> ! <forward name = "ON-EDIT" path = "/crudaction.do" redirect = "true"/> ! <forward name = "ON-LOAD-FAILURE" path = "/erroraction.do" redirect = "true"/> ! <forward name = "ON-DELETE-SUCCESS" path = "/cruditemlist.do" redirect = "true"/> ! <forward name = "ON-DELETE-FAILURE" path = "/erroraction.do" redirect = "true"/> ! <forward name = "ON-CANCEL" path = "/cruditemlist.do" redirect = "true"/> ! <forward name = "ON-CLOSE" path = "/cruditemlist.do" redirect = "true"/> ! <forward name = "ON-STORE-SUCCESS" path = "/cruditemlist.do" redirect = "true"/> ! <forward name = "ON-STORE-FAILURE" path = "/crudaction.do" redirect = "true"/> ! <forward name = "ON-INVALID-DATA" path = "/crudaction.do" redirect = "true"/> <!-- Which page to load on the output phase or on refresh (GET) --> ! <!-- Edit Existing Item --> ! <forward name = "CRUD-UI-MODE-EDIT" path = "/sample-crud/crudaction-edit.jsp"/> ! <!-- Edit Newly Created Item --> ! <forward name = "CRUD-UI-MODE-CREATE" path = "/sample-crud/crudaction-edit.jsp"/> <!-- Preview Mode --> ! <forward name = "CRUD-UI-MODE-READONLY" path = "/sample-crud/crudaction-noedit.jsp"/> <!-- Illegal mode, item is not active --> ! <forward name = "CRUD-UI-MODE-INACTIVE" path = "/sample-crud/crudaction-notactive.jsp"/> </action> ! <action path = "/erroraction" forward="/sample-crud/crudaction-error.jsp"/> <!-- **************************************************************** CRUD action 2: create, duplucate, edit, view, delete item + Both item list and item details are serviced by one action. **************************************************************** --> <!-- CRUD action --> ! <action path = "/crudactionlite" ! type = "net.jspcontrols.dialogs.samples.crud.CRUDActionSample" name = "crudform" scope = "session" ! validate = "false"> ! <forward name = "ON-CREATE-SUCCESS" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-DUPLICATE-SUCCESS" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-PREVIEW" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-EDIT" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-LOAD-FAILURE" path = "/erroraction.do"/> ! <forward name = "ON-DELETE-SUCCESS" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-DELETE-FAILURE" path = "/erroraction.do"/> ! <forward name = "ON-CANCEL" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-CLOSE" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-STORE-SUCCESS" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-STORE-FAILURE" path = "/crudactionlite.do" redirect = "true"/> ! <forward name = "ON-INVALID-DATA" path = "/crudactionlite.do" redirect = "true"/> <!-- Which page to load on the output phase or on refresh (GET) --> ! <!-- Edit Existing Item --> ! <forward name = "CRUD-UI-MODE-EDIT" path = "/sample-crud/crudaction-lite-edit.jsp"/> ! <!-- Edit Newly Created Item --> ! <forward name = "CRUD-UI-MODE-CREATE" path = "/sample-crud/crudaction-lite-edit.jsp"/> <!-- Preview Mode --> ! <forward name = "CRUD-UI-MODE-READONLY" path = "/sample-crud/crudaction-lite-noedit.jsp"/> <!-- If item is not active, show item list --> ! <forward name = "CRUD-UI-MODE-INACTIVE" path = "/sample-crud/crudaction-lite-list.jsp"/> </action> <!-- **************************************************************** *************** *** 169,174 **** **************************************************************** --> ! <action path="/wizardaction" ! type = "net.jspcontrols.dialogs.samples.wizardaction.wizardsimple.SimpleSignupAction" name = "wizardform" scope = "session" --- 188,193 ---- **************************************************************** --> ! <action path = "/wizardaction" ! type = "net.jspcontrols.dialogs.actions.wizard.WizardAction" name = "wizardform" scope = "session" *************** *** 178,258 **** <!-- Where to hand control over after input phase (POST) --> ! <forward name="MAPPING_ON_BACK_SUCCESS" path="/wizardaction.do" redirect="true"/> ! <forward name="MAPPING_ON_BACK_FAILURE" path="/wizardaction.do" redirect="true"/> ! <forward name="MAPPING_ON_NEXT_SUCCESS" path="/wizardaction.do" redirect="true"/> ! <forward name="MAPPING_ON_NEXT_FAILURE" path="/wizarderroraction.do" redirect="true"/> ! <forward name="ON-CANCEL" path="/allsamples.html" redirect="true"/> ! <forward name="ON-DONE" path="/wizard-userpage.jsp" redirect="true"/> <!-- Which page to load on the output phase or on refresh (GET) --> ! <forward name="Signup Node" path="/wizard-signupstart.jsp"/> ! <forward name="Details Node" path="/wizard-signupdetails.jsp"/> ! <forward name="Confirmation Node" path="/wizard-signupconfirm.jsp"/> ! </action> ! <action path="/wizarderroraction" forward="/wizard-error.jsp"/> ! ! ! <!-- **************************************************************** ! Master page + login child control for containers, which exceed ! JSP specifications like Resin. ! **************************************************************** --> ! <action path="/embeddedmasterpage-resin" forward="/embedded-masterpage-resin.jsp"/> ! <action path="/embeddedchild-resin" ! type = "net.jspcontrols.dialogs.samples.childaction.EmbeddedActionResin" ! name = "dialogloginform" ! scope = "session" ! validate = "false" ! parameter = "DIALOG-EVENT"> ! <!-- Where to return after input is processed --> ! <forward name = "DIALOG-RELOAD" path="/embeddedmasterpage-resin.do" redirect="true"/> ! <!-- Log In page --> ! <forward name="notloggedin" path="/embedded-child-login.jsp"/> ! <!-- Log Out page --> ! <forward name="loggedin" path="/embedded-child-logout.jsp"/> ! </action> ! ! <!-- **************************************************************** ! Master page + login child control for containers, which strictly ! implement JSP specifications like Tomcat. ! **************************************************************** --> ! ! <action path="/embeddedmasterpage-tomcat" forward="/embedded-masterpage-tomcat.jsp"/> ! <action path="/embeddedchild-tomcat" ! type = "net.jspcontrols.dialogs.samples.childaction.EmbeddedActionTomcat" ! name = "dialogloginform" ! scope = "session" ! validate = "false" ! parameter = "DIALOG-EVENT"> ! <!-- Where to return after input is processed --> ! <forward name = "DIALOG-RELOAD" path="/embeddedmasterpage-tomcat.do" redirect="true"/> ! <!-- Component is rendered by Struts action --> ! </action> ! ! ! <action path="/tabcontrol" ! type = "net.jspcontrols.collab.TabControlAction"> ! <!-- Reload phase: base path, appended with sublevels --> ! <forward name = "MAINPAGE" path="main" redirect="true"/> ! <!-- Render phase: show tabs --> ! <forward name = "TABS" path="/tabs.jsp"/> ! </action> ! ! ! <action path="/main" ! type = "net.jspcontrols.collab.MasterPageAction"> ! <forward name = "FORWARD" path="main/" redirect="true"/> </action> - <!-- - Forward action does not allow to forward or redirect to location without - leading slash. Standard action prohibits forwarding without leading slash, - but allows redirecting. - <action path="/main*" forward="main/" redirect="true"/> - --> - <action path="/main/**" forward="/mainpage.jsp"/> - - </action-mappings> --- 197,215 ---- <!-- Where to hand control over after input phase (POST) --> ! <forward name = "ON-BACK-SUCCESS" path = "/wizardaction.do" redirect = "true"/> ! <forward name = "ON-BACK-FAILURE" path = "/wizardaction.do" redirect = "true"/> ! <forward name = "ON-NEXT-SUCCESS" path = "/wizardaction.do" redirect = "true"/> ! <forward name = "ON-NEXT-FAILURE" path = "/wizardaction.do" redirect = "true"/> ! <forward name = "ON-CANCEL" path = "/index.html" redirect = "true"/> ! <forward name = "ON-DONE" path = "/sample-wizardaction/wizard-userpage.jsp" redirect = "true"/> <!-- Which page to load on the output phase or on refresh (GET) --> ! <forward name = "Signup Node" path = "/sample-wizardaction/wizard-signupstart.jsp"/> ! <forward name = "Details Node" path = "/sample-wizardaction/wizard-signupdetails.jsp"/> ! <forward name = "Confirmation Node" path = "/sample-wizardaction/wizard-signupconfirm.jsp"/> </action> </action-mappings> *************** *** 261,264 **** </struts-config> - - --- 218,219 ---- Index: web.xml =================================================================== RCS file: /cvsroot/struts/dialogs/war/WEB-INF/web.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** web.xml 11 Jul 2005 06:49:04 -0000 1.2 --- web.xml 4 Aug 2005 07:39:45 -0000 1.3 *************** *** 6,10 **** <web-app> ! <display-name>Struts Dialogs Example Application</display-name> <servlet> --- 6,10 ---- <web-app> ! <display-name>Struts Dialogs Examples</display-name> <servlet> *************** *** 16,39 **** </init-param> <init-param> ! <param-name>chainConfig</param-name> ! <param-value>/WEB-INF/chain-config.xml</param-value> </init-param> <load-on-startup>1</load-on-startup> </servlet> - <!-- <servlet-mapping> <servlet-name>action</servlet-name> ! <url-pattern>/site/*</url-pattern> </servlet-mapping> - --> - <servlet-mapping> - <servlet-name>action</servlet-name> - <url-pattern>*.do</url-pattern> - </servlet-mapping> <welcome-file-list> ! <welcome-file>index.shtml</welcome-file> <welcome-file>index.htm</welcome-file> </welcome-file-list> --- 16,34 ---- </init-param> <init-param> ! <param-name>validating</param-name> ! <param-value>true</param-value> </init-param> <load-on-startup>1</load-on-startup> </servlet> <servlet-mapping> <servlet-name>action</servlet-name> ! <url-pattern>*.do</url-pattern> </servlet-mapping> <welcome-file-list> ! <welcome-file>index.html</welcome-file> <welcome-file>index.htm</welcome-file> + <welcome-file>index.jsp</welcome-file> </welcome-file-list> |
