Author: husted
Date: Sat Mar 25 12:01:20 2006
New Revision: 388808
URL: http://svn.apache.org/viewcvs?rev=388808&view=rev
Log:
Action2 Apps
* Mailreader
** xwork - Change result-types from chain to result-action, per exchange with
Toby on WW Dev.
** Registration - Turn off client-side validation until I can find out why we
are getting "stacked" messages.
** Subscription - Add local host property to compensate for immutable DAO
property.
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
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/Registration.jsp
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java?rev=388808&r1=388807&r2=388808&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
Sat Mar 25 12:01:20 2006
@@ -270,4 +270,12 @@
getSession().remove(Constants.SUBSCRIPTION_KEY);
}
+
+ public String getSubscriptionHost() {
+ Subscription sub = getSubscription();
+ if (null == sub) {
+ return null;
+ }
+ return sub.getHost();
+ }
}
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=388808&r1=388807&r2=388808&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 12:01:20 2006
@@ -13,11 +13,24 @@
return types;
}
+ private String host;
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String value) {
+ host = value;
+ }
+
public void prepare() {
+
Map m = new LinkedHashMap();
m.put("imap", "IMAP Protocol");
m.put("pop3", "POP3 Protocol");
types = m;
+
+ setHost(getSubscriptionHost());
}
public String input() {
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=388808&r1=388807&r2=388808&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
12:01:20 2006
@@ -8,14 +8,14 @@
<!-- default-action-ref name="Welcome"/ -->
<global-results>
- <result name="error" type="chain">Error</result>
+ <result name="error">/pages/Error.jsp</result>
</global-results>
<global-exception-mappings>
<exception-mapping
- result="Error"
- exception="Exception"/>
+ result="error"
+ exception="java.lang.Exception"/>
</global-exception-mappings>
@@ -44,16 +44,16 @@
<action name="Registration" class="mailreader2.Registration">
<result name="input">/pages/Registration.jsp</result>
- <result type="chain">MainMenu</result>
+ <result type="redirect-action">MainMenu</result>
</action>
<action name="Subscription" class="mailreader2.Subscription">
<result name="input">/pages/Subscription.jsp</result>
- <result type="chain">MainMenu</result>
+ <result type="redirect-action">Registration!input</result>
</action>
<action name="Logoff" class="mailreader2.Logoff">
- <result type="chain">Welcome</result>
+ <result type="redirect-action">Welcome</result>
</action>
</package>
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp?rev=388808&r1=388807&r2=388808&view=diff
==============================================================================
---
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
(original)
+++
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
Sat Mar 25 12:01:20 2006
@@ -10,9 +10,10 @@
<title><a2:text name="registration.title.edit"/></title>
</a2:if>
</head>
+
<body>
-<a2:form method="POST" validate="true">
+<a2:form method="POST" validate="false">
<a2:hidden name="task"/>
<a2:if test="task == 'Create'">
<a2:textfield label="%{getText('prompt.username')}" name="username"/>
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=388808&r1=388807&r2=388808&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 12:01:20 2006
@@ -23,8 +23,8 @@
<ui:textfield label="%{getText('prompt.mailHostname')}"
name="subscription.host"/>
</ui:if>
<ui:else>
- <ui:label label="%{getText('prompt.mailHostname')}"
name="subscription.host"/>
- <ui:hidden name="subscription.host"/>
+ <ui:label label="%{getText('prompt.mailHostname')}" name="host"/>
+ <ui:hidden name="host"/>
</ui:else>
<ui:textfield label="%{getText('prompt.mailUsername')}"
name="subscription.username"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
