Author: jmitchell
Date: Fri Apr 14 01:29:42 2006
New Revision: 394048
URL: http://svn.apache.org/viewcvs?rev=394048&view=rev
Log:
Another set of fixes for the Struts Scripting mailreader app. Quite a few
things have changed from the current mailreader app.
The pages that work are the MainMenu, Edit and Save Registration, and Logon.
Once logged on, the user is not being displayed, but I'm looking at that next.
Added:
struts/action/trunk/apps/scripting-mailreader/src/main/java/struts-scripting.properties
- copied unchanged from r394010,
struts/action/trunk/apps/scripting-mailreader/src.tmp/main/webapp/WEB-INF/classes/struts-scripting.properties
Removed:
struts/action/trunk/apps/scripting-mailreader/src.tmp/main/webapp/WEB-INF/classes/struts-scripting.properties
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logon.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveRegistration.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv?rev=394048&r1=394047&r2=394048&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditRegistration.gv
Fri Apr 14 01:29:42 2006
@@ -1,9 +1,10 @@
import java.lang.reflect.InvocationTargetException;
import javax.servlet.ServletException;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.webapp.example.*;
+import org.apache.struts.apps.mailreader.*;
+import org.apache.struts.apps.mailreader.dao.*;
-act = request.getParameter("action");
+act = request.getParameter("task");
if (act == null) {
act = "Create";
if (log.isDebugEnabled()) {
@@ -21,7 +22,7 @@
log.debug(" User is not logged on in session "
+ session.getId());
}
- struts.setForwardName("logon");
+ struts.setForwardName("Logon");
return;
}
}
@@ -34,9 +35,9 @@
try {
PropertyUtils.copyProperties((Object)form, user);
- form.action=act;
- form.password=null;
- form.password2=null;
+ form.set("task", act);
+ form.set("password", null);
+ form.set("password2", null);
} catch (InvocationTargetException e) {
Throwable t = e.getTargetException();
if (t == null)
@@ -60,4 +61,4 @@
log.trace(" Forwarding to 'success' page");
}
-struts.setForwardName("success");
+struts.setForwardName("Success");
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv?rev=394048&r1=394047&r2=394048&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/EditSubscription.gv
Fri Apr 14 01:29:42 2006
@@ -1,7 +1,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.webapp.example.*;
+import org.apache.struts.apps.mailreader.*;
import javax.servlet.ServletException;
act = request.getParameter("action");
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logon.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logon.gv?rev=394048&r1=394047&r2=394048&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logon.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/Logon.gv
Fri Apr 14 01:29:42 2006
@@ -4,7 +4,7 @@
import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.ModuleException;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.webapp.example.*;
+import org.apache.struts.apps.mailreader.*;
form = struts.form;
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveRegistration.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveRegistration.gv?rev=394048&r1=394047&r2=394048&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveRegistration.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveRegistration.gv
Fri Apr 14 01:29:42 2006
@@ -1,11 +1,11 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.struts.action.*;
-import org.apache.struts.webapp.example.*;
+import org.apache.struts.apps.mailreader.*;
import javax.servlet.ServletException;
form = struts.getForm();
-String act = form.getAction();
+String act = form.get("task");
if (act == null) {
act = "Create";
}
@@ -22,7 +22,7 @@
log.trace(" User is not logged on in session "
+ session.getId());
}
- struts.setForwardName("logon");
+ struts.setForwardName("Logon");
return;
}
// Was this transact cancelled?
@@ -32,7 +32,7 @@
"' was cancelled");
}
session.removeAttribute(Constants.SUBSCRIPTION_KEY);
- struts.setForwardName("success");
+ struts.setForwardName("Success");
return;
}
@@ -42,8 +42,8 @@
log.trace(" Checking transactal control token");
}
if (!struts.action.isTokenValid(request)) {
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("error.transact.token"));
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("error.transaction.token"));
}
struts.action.resetToken(request);
@@ -51,23 +51,23 @@
if (log.isTraceEnabled()) {
log.trace(" Performing extra validations");
}
-value = form.getUsername();
+value = form.get("username");
if (("Create".equals(act)) &&
(database.findUser(value) != null)) {
errors.add("username",
- new ActionError("error.username.unique",
- form.getUsername()));
+ new ActionMessage("error.username.unique",
+ form.get("username")));
}
if ("Create".equals(act)) {
- value = form.password;
+ value = form.get("password");
if ((value == null) || (value.length() <1)) {
errors.add("password",
- new ActionError("error.password.required"));
+ new ActionMessage("error.password.required"));
}
- value = form.password2;
+ value = form.get("password2");
if ((value == null) || (value.length() < 1)) {
errors.add("password2",
- new ActionError("error.password2.required"));
+ new ActionMessage("error.password2.required"));
}
}
@@ -82,12 +82,12 @@
// Update the user's persistent profile information
try {
if ("Create".equals(act)) {
- user = database.createUser(form.username);
+ user = database.createUser(form.get("username"));
}
oldPassword = user.password;
PropertyUtils.copyProperties(user, form);
- if ((form.password == null) ||
- (form.password.length() < 1)) {
+ if ((form.get("password") == null) ||
+ (form.get("password").length() < 1)) {
user.setPassword(oldPassword);
}
} catch (InvocationTargetException e) {
@@ -130,5 +130,5 @@
log.trace(" Forwarding to success page");
}
-struts.setForwardName("success");
+struts.setForwardName("Success");
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv?rev=394048&r1=394047&r2=394048&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/scripts/SaveSubscription.gv
Fri Apr 14 01:29:42 2006
@@ -1,12 +1,12 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.struts.webapp.example.*;
+import org.apache.struts.apps.mailreader.*;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
form = struts.form;
-act = form.getAction();
+act = form.get("action")();
if (act == null) {
act = "?";
}
Modified:
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml?rev=394048&r1=394047&r2=394048&view=diff
==============================================================================
---
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/struts-config.xml
Fri Apr 14 01:29:42 2006
@@ -132,6 +132,7 @@
<action
path="/SubmitLogon"
type="org.apache.struts.scripting.ScriptAction"
+ parameter="/WEB-INF/scripts/Logon.gv"
name="LogonForm"
scope="request"
cancellable="true"
@@ -147,13 +148,8 @@
</action>
<!-- Display MainMenu -->
- <action
- path="/MainMenu"
- type="org.apache.struts.scripting.ScriptAction">
- <forward
- name="Success"
- path="/MainMenu.jsp"/>
- </action>
+ <action path="/MainMenu"
+ forward="/MainMenu.jsp"/>
<!-- Process a user logoff -->
<action
@@ -181,24 +177,27 @@
<action
path="/Delete*"
extends="//BaseAction"
- parameter="Delete"
+ parameter="/WEB-INF/scripts/Delete{1}.gv"
validate="false"/>
<action
path="/Edit*"
extends="//BaseAction"
- parameter="Edit"
+ parameter="/WEB-INF/scripts/Edit{1}.gv"
validate="false"/>
<action
path="/Save*"
extends="//BaseAction"
- parameter="Save"
+ parameter="/WEB-INF/scripts/Save{1}.gv"
cancellable="true"
validate="true">
<forward
name="Success"
path="/MainMenu.do"/>
+ <forward
+ name="Input"
+ path="/Edit{1}.do"/>
</action>
<!-- Matches SaveSubscription action -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
