You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/09/24 00:53:54 UTC
cvs commit: jakarta-struts/src/example/org/apache/struts/example EditRegistrationAction.java EditSubscriptionAction.java LogoffAction.java LogonAction.java SaveRegistrationAction.java SaveSubscriptionAction.java
craigmcc 00/09/23 15:53:54
Modified: src/example/org/apache/struts/example
EditRegistrationAction.java
EditSubscriptionAction.java LogoffAction.java
LogonAction.java SaveRegistrationAction.java
SaveSubscriptionAction.java
Log:
Adapt the example application to the recent changes in Action. Basically,
three changes are involved for a user Action that extended ActionBase:
* Change the base class from ActionBase to Action.
* Remove the "servlet" parameter from the perform() method.
* If you are using ActionBase.getResource() -- which has become
Action.getResource() -- the servlet argument is no longer required.
Revision Changes Path
1.6 +8 -10 jakarta-struts/src/example/org/apache/struts/example/EditRegistrationAction.java
Index: EditRegistrationAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/EditRegistrationAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditRegistrationAction.java 2000/08/01 20:03:23 1.5
+++ EditRegistrationAction.java 2000/09/23 22:53:52 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/EditRegistrationAction.java,v 1.5 2000/08/01 20:03:23 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/08/01 20:03:23 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/EditRegistrationAction.java,v 1.6 2000/09/23 22:53:52 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/09/23 22:53:52 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionBase;
+import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -85,10 +85,10 @@
* User (if any).
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/08/01 20:03:23 $
+ * @version $Revision: 1.6 $ $Date: 2000/09/23 22:53:52 $
*/
-public final class EditRegistrationAction extends ActionBase {
+public final class EditRegistrationAction extends Action {
// --------------------------------------------------------- Public Methods
@@ -101,7 +101,6 @@
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
- * @param servlet The ActionServlet making this request
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
@@ -110,8 +109,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionServlet servlet,
- ActionMapping mapping,
+ public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -119,7 +117,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources(servlet);
+ MessageResources messages = getResources();
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null)
1.6 +8 -10 jakarta-struts/src/example/org/apache/struts/example/EditSubscriptionAction.java
Index: EditSubscriptionAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/EditSubscriptionAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EditSubscriptionAction.java 2000/08/01 20:03:23 1.5
+++ EditSubscriptionAction.java 2000/09/23 22:53:53 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/EditSubscriptionAction.java,v 1.5 2000/08/01 20:03:23 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2000/08/01 20:03:23 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/EditSubscriptionAction.java,v 1.6 2000/09/23 22:53:53 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/09/23 22:53:53 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionBase;
+import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -84,10 +84,10 @@
* <code>SubscriptionForm</code> from the currently specified subscription.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2000/08/01 20:03:23 $
+ * @version $Revision: 1.6 $ $Date: 2000/09/23 22:53:53 $
*/
-public final class EditSubscriptionAction extends ActionBase {
+public final class EditSubscriptionAction extends Action {
// --------------------------------------------------------- Public Methods
@@ -100,7 +100,6 @@
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
- * @param servlet The ActionServlet making this request
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
@@ -109,8 +108,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionServlet servlet,
- ActionMapping mapping,
+ public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -118,7 +116,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources(servlet);
+ MessageResources messages = getResources();
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null)
1.4 +8 -10 jakarta-struts/src/example/org/apache/struts/example/LogoffAction.java
Index: LogoffAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/LogoffAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogoffAction.java 2000/08/01 20:03:23 1.3
+++ LogoffAction.java 2000/09/23 22:53:53 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/LogoffAction.java,v 1.3 2000/08/01 20:03:23 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2000/08/01 20:03:23 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/LogoffAction.java,v 1.4 2000/09/23 22:53:53 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/09/23 22:53:53 $
*
* ====================================================================
*
@@ -72,7 +72,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionBase;
+import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -85,10 +85,10 @@
* user logoff.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2000/08/01 20:03:23 $
+ * @version $Revision: 1.4 $ $Date: 2000/09/23 22:53:53 $
*/
-public final class LogoffAction extends ActionBase {
+public final class LogoffAction extends Action {
// --------------------------------------------------------- Public Methods
@@ -101,7 +101,6 @@
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
- * @param servlet The ActionServlet making this request
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
@@ -110,8 +109,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionServlet servlet,
- ActionMapping mapping,
+ public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -119,7 +117,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources(servlet);
+ MessageResources messages = getResources();
HttpSession session = request.getSession();
User user = (User) session.getAttribute(Constants.USER_KEY);
1.7 +8 -10 jakarta-struts/src/example/org/apache/struts/example/LogonAction.java
Index: LogonAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/LogonAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogonAction.java 2000/08/01 20:03:23 1.6
+++ LogonAction.java 2000/09/23 22:53:53 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/LogonAction.java,v 1.6 2000/08/01 20:03:23 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2000/08/01 20:03:23 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/LogonAction.java,v 1.7 2000/09/23 22:53:53 craigmcc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2000/09/23 22:53:53 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionBase;
+import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -84,10 +84,10 @@
* Implementation of <strong>Action</strong> that validates a user logon.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2000/08/01 20:03:23 $
+ * @version $Revision: 1.7 $ $Date: 2000/09/23 22:53:53 $
*/
-public final class LogonAction extends ActionBase {
+public final class LogonAction extends Action {
// --------------------------------------------------------- Public Methods
@@ -100,7 +100,6 @@
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
- * @param servlet The ActionServlet making this request
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
@@ -109,8 +108,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionServlet servlet,
- ActionMapping mapping,
+ public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -118,7 +116,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources(servlet);
+ MessageResources messages = getResources();
User user = null;
// Validate the request parameters specified by the user
1.8 +11 -13 jakarta-struts/src/example/org/apache/struts/example/SaveRegistrationAction.java
Index: SaveRegistrationAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/SaveRegistrationAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveRegistrationAction.java 2000/08/01 20:03:24 1.7
+++ SaveRegistrationAction.java 2000/09/23 22:53:53 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/SaveRegistrationAction.java,v 1.7 2000/08/01 20:03:24 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2000/08/01 20:03:24 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/SaveRegistrationAction.java,v 1.8 2000/09/23 22:53:53 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2000/09/23 22:53:53 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionBase;
+import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -81,15 +81,15 @@
/**
- * Implementation of <strong>Action</strong> that validates and creates or updates
- * the user registration information entered by the user. If a new registration is
- * created, the user is also implicitly logged on.
+ * Implementation of <strong>Action</strong> that validates and creates or
+ * updates the user registration information entered by the user. If a new
+ * registration is created, the user is also implicitly logged on.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2000/08/01 20:03:24 $
+ * @version $Revision: 1.8 $ $Date: 2000/09/23 22:53:53 $
*/
-public final class SaveRegistrationAction extends ActionBase {
+public final class SaveRegistrationAction extends Action {
// --------------------------------------------------------- Public Methods
@@ -102,7 +102,6 @@
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
- * @param servlet The ActionServlet making this request
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
@@ -111,8 +110,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionServlet servlet,
- ActionMapping mapping,
+ public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -120,7 +118,7 @@
// Extract attributes and parameters we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources(servlet);
+ MessageResources messages = getResources();
HttpSession session = request.getSession();
RegistrationForm regform = (RegistrationForm) form;
String action = request.getParameter("action");
1.8 +10 -12 jakarta-struts/src/example/org/apache/struts/example/SaveSubscriptionAction.java
Index: SaveSubscriptionAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/SaveSubscriptionAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SaveSubscriptionAction.java 2000/08/01 20:03:24 1.7
+++ SaveSubscriptionAction.java 2000/09/23 22:53:53 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/SaveSubscriptionAction.java,v 1.7 2000/08/01 20:03:24 craigmcc Exp $
- * $Revision: 1.7 $
- * $Date: 2000/08/01 20:03:24 $
+ * $Header: /home/cvs/jakarta-struts/src/example/org/apache/struts/example/SaveSubscriptionAction.java,v 1.8 2000/09/23 22:53:53 craigmcc Exp $
+ * $Revision: 1.8 $
+ * $Date: 2000/09/23 22:53:53 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.ActionBase;
+import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -81,14 +81,14 @@
/**
- * Implementation of <strong>Action</strong> that validates and creates or updates
- * the mail subscription entered by the user.
+ * Implementation of <strong>Action</strong> that validates and creates or
+ * updates the mail subscription entered by the user.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.7 $ $Date: 2000/08/01 20:03:24 $
+ * @version $Revision: 1.8 $ $Date: 2000/09/23 22:53:53 $
*/
-public final class SaveSubscriptionAction extends ActionBase {
+public final class SaveSubscriptionAction extends Action {
// --------------------------------------------------------- Public Methods
@@ -101,7 +101,6 @@
* control should be forwarded, or <code>null</code> if the response has
* already been completed.
*
- * @param servlet The ActionServlet making this request
* @param mapping The ActionMapping used to select this instance
* @param actionForm The optional ActionForm bean for this request (if any)
* @param request The HTTP request we are processing
@@ -110,8 +109,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionServlet servlet,
- ActionMapping mapping,
+ public ActionForward perform(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -119,7 +117,7 @@
// Extract attributes and parameters we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources(servlet);
+ MessageResources messages = getResources();
HttpSession session = request.getSession();
SubscriptionForm subform = (SubscriptionForm) form;
String action = request.getParameter("action");