dgraham 2003/08/16 11:07:41
Modified: src/tiles-documentation/org/apache/struts/webapp/tiles/rssChannel
RssChannelsAction.java Channels.java
Log:
Replaced ActionError with ActionMessage.
Revision Changes Path
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RssChannelsAction.java 16 Aug 2003 18:04:41 -0000 1.5
+++ RssChannelsAction.java 16 Aug 2003 18:07:41 -0000 1.6
@@ -71,11 +71,11 @@
import org.apache.commons.digester.rss.RSSDigester;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.tiles.ComponentContext;
import org.apache.struts.tiles.actions.TilesAction;
@@ -177,7 +177,8 @@
} catch (Throwable t) {
errors.add(
ActionErrors.GLOBAL_ERROR,
- new ActionError("rss.access.error"));
+ new ActionMessage("rss.access.error"));
+
servlet.log(t.toString());
}
1.6 +5 -7
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Channels.java 16 Aug 2003 17:59:34 -0000 1.5
+++ Channels.java 16 Aug 2003 18:07:41 -0000 1.6
@@ -61,7 +61,6 @@
package org.apache.struts.webapp.tiles.rssChannel;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -74,11 +73,11 @@
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.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
import org.apache.struts.tiles.ComponentContext;
/**
@@ -116,12 +115,12 @@
/**
* Main process of class. Reads, parses
*/
- public ActionForward perform(
+ public ActionForward execute(
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws Exception {
log.debug("Enter Rss Channel Action");
@@ -132,7 +131,6 @@
}
ActionErrors errors = new ActionErrors();
- org.apache.commons.digester.rss.Channel channel = null;
// -- Retrieve parameters --
// Urls can come from a list, or from a single attribute.
@@ -168,7 +166,7 @@
} catch (Throwable t) {
errors.add(
ActionErrors.GLOBAL_ERROR,
- new ActionError("rss.access.error"));
+ new ActionMessage("rss.access.error"));
servlet.log(t.toString());
}
@@ -194,7 +192,7 @@
// Use Tile context to pass channels
context.putAttribute(CHANNELS_KEY, channelBeans);
-
+
return mapping.findForward("continue");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
