Author: husted
Date: Sat Mar 25 18:54:18 2006
New Revision: 388871
URL: http://svn.apache.org/viewcvs?rev=388871&view=rev
Log:
Action2 Apps
* Mailreader - Work in progress
** Add validation for Subscription.
Added:
struts/sandbox/trunk/action2/STATUS.txt (with props)
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml
(with props)
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml
(with props)
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave-validation.xml
(with props)
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave.java
(with props)
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Error.jsp
(with props)
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
Added: struts/sandbox/trunk/action2/STATUS.txt
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/STATUS.txt?rev=388871&view=auto
==============================================================================
--- struts/sandbox/trunk/action2/STATUS.txt (added)
+++ struts/sandbox/trunk/action2/STATUS.txt Sat Mar 25 18:54:18 2006
@@ -0,0 +1,3 @@
+STATUS - /sandbox/Action2
+
+Pending the arrival of other Action2 material from the
\ No newline at end of file
Propchange: struts/sandbox/trunk/action2/STATUS.txt
------------------------------------------------------------------------------
svn:eol-style = native
Added:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml?rev=388871&view=auto
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml
(added)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml
Sat Mar 25 18:54:18 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>
Propchange:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml?rev=388871&view=auto
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml
(added)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml
Sat Mar 25 18:54:18 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>
Propchange:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java?rev=388871&r1=388870&r2=388871&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java
Sat Mar 25 18:54:18 2006
@@ -9,7 +9,7 @@
* <p> Provide an Edit method for retrieving an existing subscription, and a
* Save method for updating or inserting a subscription. </p>
*/
-public final class Subscription extends MailreaderSupport
+public class Subscription extends MailreaderSupport
implements Preparable {
/**
@@ -105,7 +105,7 @@
* @return SUCCESS
* @throws Exception on a database error
*/
- public String execute() throws Exception {
+ public String save() throws Exception {
if (Constants.DELETE.equals(getTask())) {
removeSubscription();
Added:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave-validation.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave-validation.xml?rev=388871&view=auto
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave-validation.xml
(added)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave-validation.xml
Sat Mar 25 18:54:18 2006
@@ -0,0 +1,29 @@
+<!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>
+
+ <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>
Propchange:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave.java?rev=388871&view=auto
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave.java
(added)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave.java
Sat Mar 25 18:54:18 2006
@@ -0,0 +1,12 @@
+package mailreader2;
+
+/**
+ * <p> Workaround class. Submitting to an alias doesn't seem to work. </p>
+ */
+public final class SubscriptionSave extends Subscription {
+
+ public String execute() throws Exception {
+ return save();
+ }
+
+}
Propchange:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/SubscriptionSave.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml?rev=388871&r1=388870&r2=388871&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml Sat Mar 25
18:54:18 2006
@@ -7,6 +7,18 @@
<!-- default-action-ref name="Welcome"/ -->
+ <global-results>
+ <result name="error">/pages/Error.jsp</result>
+ </global-results>
+
+ <global-exception-mappings>
+
+ <exception-mapping
+ result="error"
+ exception="java.lang.Exception"/>
+
+ </global-exception-mappings>
+
<action name="Welcome">
<result>/pages/Welcome.jsp</result>
</action>
@@ -50,6 +62,11 @@
<result type="redirect-action">Registration!input</result>
</action>
+ <action name="SubscriptionSave" class="mailreader2.SubscriptionSave">
+ <result name="input">/pages/Subscription.jsp</result>
+ <result type="redirect-action">Registration!input</result>
+ </action>
+
<action name="Logoff" class="mailreader2.Logoff">
<result type="redirect-action">Welcome</result>
</action>
Added: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Error.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Error.jsp?rev=388871&view=auto
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Error.jsp
(added)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Error.jsp Sat
Mar 25 18:54:18 2006
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
+<head>
+ <title>Unexpected Error</title>
+</head>
+
+<body>
+<h3>An unexpected error has occured</h3>
+
+<jsp:include page="Footer.jsp"/>
+
+</body>
+</html>
Propchange:
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp?rev=388871&r1=388870&r2=388871&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
Sat Mar 25 18:54:18 2006
@@ -17,7 +17,7 @@
</head>
<body>
-<saf:form method="POST" action="Subscription" validate="true">
+<saf:form method="POST" action="SubscriptionSave" validate="true">
<saf:hidden name="task"/>
<saf:label label="%{getText('prompt.username')}" name="user.username"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
