dgraham 2003/08/22 17:12:40
Modified: src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel
RssChannelsAction.java Channels.java
src/example/org/apache/struts/webapp/example
SaveRegistrationAction.java LogonAction.java
src/share/org/apache/struts/taglib TagUtils.java
src/share/org/apache/struts/action ActionErrors.java
Log:
Deprecated ActionErrors.GLOBAL_ERROR in favor of
ActionMessages.GLOBAL_MESSAGE.
Revision Changes Path
1.7 +7 -6
jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java
Index: RssChannelsAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/RssChannelsAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RssChannelsAction.java 16 Aug 2003 18:07:41 -0000 1.6
+++ RssChannelsAction.java 23 Aug 2003 00:12:39 -0000 1.7
@@ -76,6 +76,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.tiles.ComponentContext;
import org.apache.struts.tiles.actions.TilesAction;
@@ -176,9 +177,9 @@
}
} catch (Throwable t) {
errors.add(
- ActionErrors.GLOBAL_ERROR,
+ ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("rss.access.error"));
-
+
servlet.log(t.toString());
}
1.7 +6 -5
jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java
Index: Channels.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel/Channels.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Channels.java 16 Aug 2003 18:07:41 -0000 1.6
+++ Channels.java 23 Aug 2003 00:12:39 -0000 1.7
@@ -78,6 +78,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.tiles.ComponentContext;
/**
@@ -165,7 +166,7 @@
}
} catch (Throwable t) {
errors.add(
- ActionErrors.GLOBAL_ERROR,
+ ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("rss.access.error"));
servlet.log(t.toString());
1.16 +6 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
Index: SaveRegistrationAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SaveRegistrationAction.java 16 Aug 2003 18:29:09 -0000 1.15
+++ SaveRegistrationAction.java 23 Aug 2003 00:12:39 -0000 1.16
@@ -77,6 +77,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
/**
* Implementation of <strong>Action</strong> that validates and creates or
@@ -162,7 +163,7 @@
if (!isTokenValid(request)) {
errors.add(
- ActionErrors.GLOBAL_ERROR,
+ ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.transaction.token"));
}
1.16 +15 -10
jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java
Index: LogonAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- LogonAction.java 16 Aug 2003 18:29:09 -0000 1.15
+++ LogonAction.java 23 Aug 2003 00:12:39 -0000 1.16
@@ -74,6 +74,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.ModuleException;
/**
@@ -125,18 +126,22 @@
(UserDatabase) servlet.getServletContext().getAttribute(
Constants.DATABASE_KEY);
- if (database == null)
+ if (database == null){
errors.add(
- ActionErrors.GLOBAL_ERROR,
+ ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.database.missing"));
- else {
+ } else {
user = getUser(database, username);
- if ((user != null) && !user.getPassword().equals(password))
+
+ if ((user != null) && !user.getPassword().equals(password)){
user = null;
- if (user == null)
+ }
+
+ if (user == null) {
errors.add(
- ActionErrors.GLOBAL_ERROR,
+ ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("error.password.mismatch"));
+ }
}
// Report any errors we have discovered back to the original form
1.24 +6 -6 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java
Index: TagUtils.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- TagUtils.java 16 Aug 2003 18:35:41 -0000 1.23
+++ TagUtils.java 23 Aug 2003 00:12:40 -0000 1.24
@@ -643,13 +643,13 @@
} else if (value instanceof String) {
errors.add(
- ActionErrors.GLOBAL_ERROR,
+ ActionMessages.GLOBAL_MESSAGE,
new ActionMessage((String) value));
} else if (value instanceof String[]) {
String keys[] = (String[]) value;
for (int i = 0; i < keys.length; i++) {
- errors.add(ActionErrors.GLOBAL_ERROR, new
ActionMessage(keys[i]));
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new
ActionMessage(keys[i]));
}
} else if (value instanceof ActionErrors) {
1.13 +6 -4
jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java
Index: ActionErrors.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionErrors.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ActionErrors.java 16 Aug 2003 18:37:33 -0000 1.12
+++ ActionErrors.java 23 Aug 2003 00:12:40 -0000 1.13
@@ -92,6 +92,8 @@
/**
* The "property name" marker to use for global errors, as opposed to
* those related to a specific property.
+ * @deprecated Use ActionMessages.GLOBAL_MESSAGE instead. This will be
+ * removed after Struts 1.2.
*/
public static final String GLOBAL_ERROR =
"org.apache.struts.action.GLOBAL_ERROR";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
