Author: mrdon
Date: Thu Apr 6 17:01:01 2006
New Revision: 392127
URL: http://svn.apache.org/viewcvs?rev=392127&view=rev
Log:
fixing compile errors on example2
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonForm.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/RegistrationForm.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SubscriptionForm.java
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java?rev=392127&r1=392126&r2=392127&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonAction.java
Thu Apr 6 17:01:01 2006
@@ -26,7 +26,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -90,15 +90,15 @@
UserDatabase database = (UserDatabase)
servlet.getServletContext().getAttribute(Constants.DATABASE_KEY);
if (database == null)
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("error.database.missing"));
+ errors.add(ActionErrors.GLOBAL_MESSAGE,
+ new ActionMessage("error.database.missing"));
else {
user = getUser(database, username);
if ((user != null) && !user.getPassword().equals(password))
user = null;
if (user == null)
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("error.password.mismatch"));
+ errors.add(ActionErrors.GLOBAL_MESSAGE,
+ new ActionMessage("error.password.mismatch"));
}
// Report any errors we have discovered back to the original form
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonForm.java?rev=392127&r1=392126&r2=392127&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonForm.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/LogonForm.java
Thu Apr 6 17:01:01 2006
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
@@ -134,9 +134,9 @@
ActionErrors errors = new ActionErrors();
if ((username == null) || (username.length() < 1))
- errors.add("username", new ActionError("error.username.required"));
+ errors.add("username", new
ActionMessage("error.username.required"));
if ((password == null) || (password.length() < 1))
- errors.add("password", new ActionError("error.password.required"));
+ errors.add("password", new
ActionMessage("error.password.required"));
return errors;
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/RegistrationForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/RegistrationForm.java?rev=392127&r1=392126&r2=392127&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/RegistrationForm.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/RegistrationForm.java
Thu Apr 6 17:01:01 2006
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.validator.ValidatorForm;
@@ -298,7 +298,7 @@
((password != null) && (password2 != null) &&
!password.equals(password2))) {
errors.add("password2",
- new ActionError("error.password.match"));
+ new ActionMessage("error.password.match"));
}
return errors;
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java?rev=392127&r1=392126&r2=392127&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SaveRegistrationAction.java
Thu Apr 6 17:01:01 2006
@@ -28,7 +28,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -124,8 +124,8 @@
log.trace(" Checking transactional control token");
}
if (!isTokenValid(request)) {
- errors.add(ActionErrors.GLOBAL_ERROR,
- new ActionError("error.transaction.token"));
+ errors.add(ActionErrors.GLOBAL_MESSAGE,
+ new ActionMessage("error.transaction.token"));
}
resetToken(request);
@@ -138,19 +138,19 @@
if (("Create".equals(action)) &&
(database.findUser(value) != null)) {
errors.add("username",
- new ActionError("error.username.unique",
+ new ActionMessage("error.username.unique",
regform.getUsername()));
}
if ("Create".equals(action)) {
value = regform.getPassword();
if ((value == null) || (value.length() <1)) {
errors.add("password",
- new ActionError("error.password.required"));
+ new ActionMessage("error.password.required"));
}
value = regform.getPassword2();
if ((value == null) || (value.length() < 1)) {
errors.add("password2",
- new ActionError("error.password2.required"));
+ new ActionMessage("error.password2.required"));
}
}
Modified:
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SubscriptionForm.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SubscriptionForm.java?rev=392127&r1=392126&r2=392127&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SubscriptionForm.java
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/java/org/apache/struts/webapp/example2/SubscriptionForm.java
Thu Apr 6 17:01:01 2006
@@ -19,7 +19,7 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.struts.action.ActionError;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
@@ -256,19 +256,19 @@
if ((host == null) || (host.length() < 1))
errors.add("host",
- new ActionError("error.host.required"));
+ new ActionMessage("error.host.required"));
if ((username == null) || (username.length() < 1))
errors.add("username",
- new ActionError("error.username.required"));
+ new ActionMessage("error.username.required"));
if ((password == null) || (password.length() < 1))
errors.add("password",
- new ActionError("error.password.required"));
+ new ActionMessage("error.password.required"));
if ((type == null) || (type.length() < 1))
errors.add("type",
- new ActionError("error.type.required"));
+ new ActionMessage("error.type.required"));
else if (!"imap".equals(type) && !"pop3".equals(type))
errors.add("type",
- new ActionError("error.type.invalid", type));
+ new ActionMessage("error.type.invalid", type));
return (errors);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
