Menu
▾
▴
[Struts-cvs] dialogs/war/WEB-INF database.xml,1.1,1.2 struts-config.xml,1.11,1.12 validation.xml,1.1,1.2
|
From: <jm...@us...> - 2005-11-09 03:20:50
|
Update of /cvsroot/struts/dialogs/war/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29970/war/WEB-INF Modified Files: database.xml struts-config.xml validation.xml Log Message: Index: database.xml =================================================================== RCS file: /cvsroot/struts/dialogs/war/WEB-INF/database.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** database.xml 23 Sep 2005 06:37:56 -0000 1.1 --- database.xml 9 Nov 2005 03:20:42 -0000 1.2 *************** *** 3,33 **** <user username="www" fromAddress="fr...@ma..." fullName="qwerty" password="www" replyToAddress="to...@ma..."> </user> - <user username="ttt" fromAddress="fr...@ma..." fullName="qwerty" password="ttt" replyToAddress="to...@ma..."> - </user> <user username="uuu" fromAddress="fr...@ma..." fullName="qwerty" password="uuu" replyToAddress="to...@ma..."> </user> <user username="user" fromAddress="Joh...@so..." fullName="John Q. User2" password="pass" replyToAddress="to...@ma..."> <subscription host="mail.com" autoConnect="false" password="john" type="imap" username="john"> </subscription> ! <subscription host="mail5.com" autoConnect="false" password="ffff" type="pop3" username="ffff"> </subscription> <subscription host="mail.ru" autoConnect="true" password="JohnQ" type="pop3" username="JohnQ"> </subscription> ! <subscription host="yahoo.com" autoConnect="false" password="JohnDoe" type="pop3" username="JohnDoe"> </subscription> <subscription host="mail4.com" autoConnect="true" password="ssss" type="imap" username="ssss"> </subscription> </user> - <user username="ooo" fromAddress="Joh...@so..." fullName="UUU John Q. User" password="ooo" replyToAddress="to...@ma..."> - </user> <user username="wwwww" fromAddress="fr...@ma..." fullName="Quark Express" password="wwwww" replyToAddress=""> </user> <user username="scott" fromAddress="fr...@ma..." fullName="qwerty" password="tiger" replyToAddress="to...@ma..."> </user> ! <user username="cccc" fromAddress="fr...@ma..." fullName="UUU John Q. User" password="cccc" replyToAddress=""> </user> <user username="eee" fromAddress="fr...@ma..." fullName="qwerty" password="eee" replyToAddress="to...@ma..."> </user> ! <user username="sysdba" fromAddress="fr...@ma..." fullName="qwerty" password="aaa" replyToAddress="to...@ma..."> </user> <user username="aaaaa" fromAddress="fr...@ma..." fullName="qwerty" password="bbbbb" replyToAddress="to...@ma..."> --- 3,33 ---- <user username="www" fromAddress="fr...@ma..." fullName="qwerty" password="www" replyToAddress="to...@ma..."> </user> <user username="uuu" fromAddress="fr...@ma..." fullName="qwerty" password="uuu" replyToAddress="to...@ma..."> </user> + <user username="ttt" fromAddress="fr...@ma..." fullName="qwerty" password="ttt" replyToAddress="to...@ma..."> + </user> <user username="user" fromAddress="Joh...@so..." fullName="John Q. User2" password="pass" replyToAddress="to...@ma..."> <subscription host="mail.com" autoConnect="false" password="john" type="imap" username="john"> </subscription> ! <subscription host="yahoo.com" autoConnect="false" password="JohnDoe" type="pop3" username="JohnDoe"> </subscription> <subscription host="mail.ru" autoConnect="true" password="JohnQ" type="pop3" username="JohnQ"> </subscription> ! <subscription host="mail5.com" autoConnect="false" password="ffff" type="pop3" username="ffff"> </subscription> <subscription host="mail4.com" autoConnect="true" password="ssss" type="imap" username="ssss"> </subscription> </user> <user username="wwwww" fromAddress="fr...@ma..." fullName="Quark Express" password="wwwww" replyToAddress=""> </user> + <user username="ooo" fromAddress="Joh...@so..." fullName="UUU John Q. User" password="ooo" replyToAddress="to...@ma..."> + </user> <user username="scott" fromAddress="fr...@ma..." fullName="qwerty" password="tiger" replyToAddress="to...@ma..."> </user> ! <user username="sysdba" fromAddress="fr...@ma..." fullName="qwerty" password="aaa" replyToAddress="to...@ma..."> </user> <user username="eee" fromAddress="fr...@ma..." fullName="qwerty" password="eee" replyToAddress="to...@ma..."> </user> ! <user username="cccc" fromAddress="fr...@ma..." fullName="UUU John Q. User" password="cccc" replyToAddress=""> </user> <user username="aaaaa" fromAddress="fr...@ma..." fullName="qwerty" password="bbbbb" replyToAddress="to...@ma..."> Index: struts-config.xml =================================================================== RCS file: /cvsroot/struts/dialogs/war/WEB-INF/struts-config.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** struts-config.xml 23 Sep 2005 06:37:56 -0000 1.11 --- struts-config.xml 9 Nov 2005 03:20:42 -0000 1.12 *************** *** 52,56 **** view = "/mailreaderpages/home.jsp" type = "net.jspcontrols.mailreader.HomeAction"> ! <event name = "subscriptions" path = "/Subscriptions.do?DIALOG-EVENT-INIT"/> <render name = "failure" path = "/mailreaderpages/error.jsp" /> </component> --- 52,66 ---- view = "/mailreaderpages/home.jsp" type = "net.jspcontrols.mailreader.HomeAction"> ! ! <!-- Input events (request key for submit button) --> ! <event name = "DIALOG-EVENT-LOGON" handler = "onLogon"/> ! <event name = "DIALOG-EVENT-SIGNUP" handler = "onAccountSignup"/> ! <event name = "DIALOG-EVENT-ACCUPDATE" handler = "onAccountUpdate"/> ! <event name = "DIALOG-EVENT-SUBSCRIPTIONS" handler = "onSubscriptions"/> ! ! <!-- Transfer from one action to another, usually using redirection --> ! <transfer name = "subscriptions" path = "/Subscriptions.do?DIALOG-EVENT-INIT"/> ! ! <!-- Render a view, usually by forwarding to a JSP page --> <render name = "failure" path = "/mailreaderpages/error.jsp" /> </component> *************** *** 60,65 **** type = "net.jspcontrols.mailreader.LogonAction" form = "LogonForm"> ! <event name = "error" path = "/Logon.do" /> ! <event name = "success, cancel, logout" path = "/Home.do" /> <render name = "notloggedin" path = "/mailreaderpages/logon.jsp" /> <render name = "loggedin" path = "/mailreaderpages/logoff.jsp" /> --- 70,75 ---- type = "net.jspcontrols.mailreader.LogonAction" form = "LogonForm"> ! <transfer name = "error" path = "/Logon.do" /> ! <transfer name = "success, cancel, logout" path = "/Home.do" /> <render name = "notloggedin" path = "/mailreaderpages/logon.jsp" /> <render name = "loggedin" path = "/mailreaderpages/logoff.jsp" /> *************** *** 71,78 **** type = "net.jspcontrols.dialogs.actions.crud.CRUDAction" form = "RegistrationForm"> ! <event name = "ON-CREATE-SUCCESS, ON-EDIT" path = "/Registration.do" /> ! <event name = "ON-LOAD-FAILURE" path = "/erroraction.do"/> ! <event name = "ON-CANCEL, ON-CLOSE, ON-STORE-SUCCESS" path = "/Home.do"/> ! <event name = "ON-STORE-FAILURE, ON-INVALID-DATA" path = "/Registration.do"/> <render name = "CRUD-UI-MODE-NEW, CRUD-UI-MODE-UPDATE" path = "/mailreaderpages/registration.jsp"/> <render name = "CRUD-UI-MODE-INACTIVE" path = "/Home.do" redirect="true"/> --- 81,88 ---- type = "net.jspcontrols.dialogs.actions.crud.CRUDAction" form = "RegistrationForm"> ! <transfer name = "ON-CREATE-SUCCESS, ON-EDIT" path = "/Registration.do" /> ! <transfer name = "ON-LOAD-FAILURE" path = "/erroraction.do"/> ! <transfer name = "ON-CANCEL, ON-CLOSE, ON-STORE-SUCCESS" path = "/Home.do"/> ! <transfer name = "ON-STORE-FAILURE, ON-INVALID-DATA" path = "/Registration.do"/> <render name = "CRUD-UI-MODE-NEW, CRUD-UI-MODE-UPDATE" path = "/mailreaderpages/registration.jsp"/> <render name = "CRUD-UI-MODE-INACTIVE" path = "/Home.do" redirect="true"/> *************** *** 85,95 **** type = "net.jspcontrols.mailreader.SubscriptionAction" form = "SubscriptionForm"> ! <event name="ON-CREATE-SUCCESS, ON-DUPLICATE-SUCCESS" path="/Subscriptions.do" /> ! <event name="ON-PREVIEW, ON-EDIT" path="/Subscriptions.do"/> ! <event name="ON-LOAD-FAILURE, ON-DELETE-FAILURE" path="/mailreaderpages/crudaction-error.jsp" redirect="false"/> ! <event name="ON-DELETE-SUCCESS, ON-STORE-SUCCESS, ON-STORE-FAILURE, ON-INVALID-DATA" path="/Subscriptions.do" /> ! <event name="ON-CANCEL, ON-CLOSE" path="/Subscriptions.do"/> ! <event name="ON-PREVPAGE, ON-NEXTPAGE" path="/Subscriptions.do"/> ! <event name="ON-HOME" path="/Home.do"/> <render name="CRUD-UI-MODE-NEW, CRUD-UI-MODE-UPDATE" path="/mailreaderpages/subscription.jsp"/> <render name="CRUD-UI-MODE-INACTIVE" path="/mailreaderpages/subscriptions.jsp"/> --- 95,123 ---- type = "net.jspcontrols.mailreader.SubscriptionAction" form = "SubscriptionForm"> ! ! <!-- Input events (request key for submit button) --> ! <event name = "DIALOG-EVENT-INIT" handler = "onInit"/> ! <event name = "DIALOG-EVENT-PREVPAGE" handler = "onPrevPage"/> ! <event name = "DIALOG-EVENT-NEXTPAGE" handler = "onNextPage"/> ! <event name = "DIALOG-EVENT-BACKHOME" handler = "onBackHome"/> ! ! <event name = "DIALOG-EVENT-CREATE" ! handler = "onCreate" ! outcome = "ON-CREATE-SUCCESS, ON-CREATE-FAILURE"/> ! ! <event name = "DIALOG-EVENT-UPDATE" handler = "onEdit"/> ! <event name = "DIALOG-EVENT-DELETE" handler = "onDelete"/> ! <event name = "DIALOG-EVENT-SAVE" handler = "onSave"/> ! ! <!-- Transfer from one action to another, usually using redirection --> ! <transfer name="ON-CREATE-SUCCESS, ON-DUPLICATE-SUCCESS" path="/Subscriptions.do" /> ! <transfer name="ON-PREVIEW, ON-EDIT" path="/Subscriptions.do"/> ! <transfer name="ON-LOAD-FAILURE, ON-DELETE-FAILURE" path="/mailreaderpages/crudaction-error.jsp" redirect="false"/> ! <transfer name="ON-DELETE-SUCCESS, ON-STORE-SUCCESS, ON-STORE-FAILURE, ON-INVALID-DATA" path="/Subscriptions.do" /> ! <transfer name="ON-CANCEL, ON-CLOSE" path="/Subscriptions.do"/> ! <transfer name="ON-PREVPAGE, ON-NEXTPAGE" path="/Subscriptions.do"/> ! <transfer name="ON-HOME" path="/Home.do"/> ! ! <!-- Render a view, usually by forwarding to a JSP page --> <render name="CRUD-UI-MODE-NEW, CRUD-UI-MODE-UPDATE" path="/mailreaderpages/subscription.jsp"/> <render name="CRUD-UI-MODE-INACTIVE" path="/mailreaderpages/subscriptions.jsp"/> Index: validation.xml =================================================================== RCS file: /cvsroot/struts/dialogs/war/WEB-INF/validation.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** validation.xml 23 Sep 2005 06:37:56 -0000 1.1 --- validation.xml 9 Nov 2005 03:20:42 -0000 1.2 *************** *** 56,60 **** --- 56,63 ---- <field property="nestedUser.fromAddress" depends="required,email"> + <!-- <arg key="prompt.fromAddress"/> + --> + <arg key="${RegistrationForm.nestedUser.fromAddress}" resource="false"/> </field> *************** *** 66,70 **** --- 69,76 ---- <field property="nestedUser.replyToAddress" depends="email"> + <!-- <arg key="prompt.replyToAddress"/> + --> + <arg key="RegistrationForm.nestedUser.replyToAddress" resource="false"/> </field> |
