Author: husted Date: Tue Aug 29 11:39:41 2006 New Revision: 438151 URL: http://svn.apache.org/viewvc?rev=438151&view=rev Log: WW-1353 Refactor mailreader-bang to make better use of validator.
Added: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Logon-validation.xml struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Registration-RegistrationSave-validation.xml - copied unchanged from r438095, struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/RegistrationSave-validation.xml struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Registration-validation.xml struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription-validation.xml struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave-validation.xml Removed: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/RegistrationSave-validation.xml struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/RegistrationSave.java struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/mailreader2/ Modified: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml Added: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Logon-validation.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Logon-validation.xml?rev=438151&view=auto ============================================================================== --- struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Logon-validation.xml (added) +++ struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Logon-validation.xml Tue Aug 29 11:39:41 2006 @@ -0,0 +1,14 @@ +<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + <field name="username"> + <field-validator type="requiredstring"> + <message key="error.username.required"/> + </field-validator> + </field> + <field name="password"> + <field-validator type="requiredstring"> + <message key="error.password.required"/> + </field-validator> + </field> +</validators> Added: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Registration-validation.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Registration-validation.xml?rev=438151&view=auto ============================================================================== --- struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Registration-validation.xml (added) +++ struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Registration-validation.xml Tue Aug 29 11:39:41 2006 @@ -0,0 +1,32 @@ +<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + + <field name="username"> + <field-validator type="requiredstring"> + <message key="error.username.required"/> + </field-validator> + </field> + + <field name="user.fullName"> + <field-validator type="requiredstring"> + <message key="error.fullName.required"/> + </field-validator> + </field> + + <field name="user.fromAddress"> + <field-validator type="requiredstring"> + <message key="error.fromAddress.required"/> + </field-validator> + <field-validator type="email"> + <message key="errors.email"/> + </field-validator> + </field> + + <field name="user.replyToAddress"> + <field-validator type="email"> + <message key="errors.email"/> + </field-validator> + </field> + +</validators> Added: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription-validation.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription-validation.xml?rev=438151&view=auto ============================================================================== --- struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription-validation.xml (added) +++ struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/Subscription-validation.xml Tue Aug 29 11:39:41 2006 @@ -0,0 +1,11 @@ +<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + + <field name="host"> + <field-validator type="requiredstring"> + <message key="error.host.required"/> + </field-validator> + </field> + +</validators> Added: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave-validation.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave-validation.xml?rev=438151&view=auto ============================================================================== --- struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave-validation.xml (added) +++ struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/java/mailreader2/SubscriptionSave-validation.xml Tue Aug 29 11:39:41 2006 @@ -0,0 +1,23 @@ +<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + + <field name="subscription.username"> + <field-validator type="requiredstring"> + <message key="error.username.required"/> + </field-validator> + </field> + + <field name="subscription.password"> + <field-validator type="requiredstring"> + <message key="error.password.required"/> + </field-validator> + </field> + + <field name="subscription.type"> + <field-validator type="requiredstring"> + <message key="error.type.invalid"/> + </field-validator> + </field> + +</validators> Modified: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties?rev=438151&r1=438150&r2=438151&view=diff ============================================================================== --- struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties (original) +++ struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.properties Tue Aug 29 11:39:41 2006 @@ -2,4 +2,4 @@ struts.devMode = true struts.action.extension = do struts.custom.i18n.resources = resources -struts.enable.DynamicMethodInvocation = false +struts.enable.DynamicMethodInvocation = true Modified: struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml?rev=438151&r1=438150&r2=438151&view=diff ============================================================================== --- struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml (original) +++ struts/sandbox/trunk/struts2/apps/mailreader-bang/src/main/resources/struts.xml Tue Aug 29 11:39:41 2006 @@ -10,8 +10,8 @@ <include file="struts-support.xml"/> <!-- - <include file="struts-bang.xml"/> - --> <include file="struts-wildcard.xml"/> + --> + <include file="struts-bang.xml"/> </struts>