Author: husted
Date: Wed Aug 30 07:34:37 2006
New Revision: 438498
URL: http://svn.apache.org/viewvc?rev=438498&view=rev
Log:
WW-1349 MailReader: Conform class names
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
---
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
(original)
+++
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
Wed Aug 30 07:34:37 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>
+ * Update method for updating or inserting a subscription. </p>
*/
public class Support extends MailreaderSupport
implements Preparable {
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
---
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
(original)
+++
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/subscription/Update.java
Wed Aug 30 07:34:37 2006
@@ -5,7 +5,7 @@
/**
* <p> Workaround class. Submitting to an alias doesn't seem to work. </p>
*/
-public final class Save extends Edit {
+public final class Update extends Edit {
public void prepare() {
super.prepare();
Modified: struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/struts.xml Wed Aug 30
07:34:37 2006
@@ -26,7 +26,7 @@
<!-- goto actions: Exit to another workflow -->
- <action name="subscription/Save" class="mailreader2.subscription.Save">
+ <action name="subscription/Save"
class="mailreader2.subscription.Update">
<result name="input">/pages/subscription.jsp</result>
<result type="redirect-action">registration/+Input</result>
</action>
@@ -43,7 +43,7 @@
<result>/pages/{1}.jsp</result>
</action>
- <!-- execute actions: Create, Retrieve, Update, Save -->
+ <!-- execute actions: Create, Retrieve, Update, Update -->
<action name="*/*" class="mailreader2.{1}.{2}">
<result name="input">/pages/{1}.jsp</result>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/logon.jsp Wed
Aug 30 07:34:37 2006
@@ -9,10 +9,10 @@
type="text/css"/>
</head>
-<body onLoad="self.focus();document.Retrieve.username.focus()">
+<body
onLoad="self.focus();document.logon_Retrieve.logon_Retrieve_username.focus()">
<s:actionerror/>
-<s:form id="Retrieve" action="logon/Retrieve" validate="true">
+<s:form id="logon_Retrieve" action="logon/Retrieve" validate="true">
<s:textfield label="%{getText('username')}" name="username"/>
<s:password label="%{getText('password')}" name="password"
showPassword="true"/>
Modified:
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/registration.jsp
Wed Aug 30 07:34:37 2006
@@ -14,10 +14,10 @@
type="text/css"/>
</head>
-<body onLoad="self.focus();document.form1.username.focus()">
+<body
onLoad="self.focus();document.registration_Update.registration_Update_username.focus()">
<s:actionerror/>
-<s:form id="form1" action="registration/Update" validate="true">
+<s:form id="registration_Update" action="registration/Update" validate="true">
<s:token/>
<s:hidden name="task"/>
<s:if test="task == 'Create'">
Modified:
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/subscription.jsp
Wed Aug 30 07:34:37 2006
@@ -17,10 +17,10 @@
type="text/css"/>
</head>
-<body onLoad="self.focus();document.form1.username.focus()">
+<body
onLoad="self.focus();document.subscription_Update.subscription_Update_username.focus()">
<s:actionerror/>
-<s:form id="form1" action="subscription/Save" validate="true">
+<s:form id="subscription_Update" action="subscription/Update" validate="true">
<s:token/>
<s:hidden name="task"/>
<s:label label="%{getText('username')}" name="user.username"/>
Modified:
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java?rev=438498&r1=438497&r2=438498&view=diff
==============================================================================
---
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
(original)
+++
struts/struts2/trunk/apps/mailreader/src/test/java/mailreader2/ConfigTest.java
Wed Aug 30 07:34:37 2006
@@ -39,7 +39,7 @@
}
public void testSubscriptionSave() throws Exception {
- ActionConfig config = assertClass("subscription/Save",
"mailreader2.subscription.Save");
+ ActionConfig config = assertClass("subscription/Update",
"mailreader2.subscription.Update");
assertResult(config, ActionSupport.SUCCESS, "registration/+Input");
assertResult(config, ActionSupport.INPUT, "/pages/subscription.jsp");
}
