martinc 02/03/10 22:13:13
Modified: src/example/org/apache/struts/webapp/example
EditRegistrationAction.java
EditSubscriptionAction.java LogoffAction.java
LogonAction.java SaveRegistrationAction.java
SaveSubscriptionAction.java
src/exercise-taglib/org/apache/struts/webapp/exercise
HtmlSettersAction.java
src/upload/org/apache/struts/webapp/upload UploadAction.java
Log:
Don't use deprecated Struts methods in web apps included with Struts.
I didn't touch Tiles, since it has a life of its own independent of Struts.
Cedric is in a much better position to know whether these should be changed
or not.
Revision Changes Path
1.7 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java
Index: EditRegistrationAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EditRegistrationAction.java 5 Mar 2002 04:55:51 -0000 1.6
+++ EditRegistrationAction.java 11 Mar 2002 06:13:13 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
1.6 2002/03/05 04:55:51 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/05 04:55:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditRegistrationAction.java,v
1.7 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* User (if any).
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/11 06:13:13 $
*/
public final class EditRegistrationAction extends Action {
@@ -131,7 +131,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources();
+ MessageResources messages = getResources(request);
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null)
1.7 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java
Index: EditSubscriptionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EditSubscriptionAction.java 5 Mar 2002 04:55:51 -0000 1.6
+++ EditSubscriptionAction.java 11 Mar 2002 06:13:13 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
1.6 2002/03/05 04:55:51 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/05 04:55:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/EditSubscriptionAction.java,v
1.7 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* <code>SubscriptionForm</code> from the currently specified subscription.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/11 06:13:13 $
*/
public final class EditSubscriptionAction extends Action {
@@ -130,7 +130,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources();
+ MessageResources messages = getResources(request);
HttpSession session = request.getSession();
String action = request.getParameter("action");
if (action == null) {
1.4 +8 -11
jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java
Index: LogoffAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LogoffAction.java 5 Mar 2002 04:55:51 -0000 1.3
+++ LogoffAction.java 11 Mar 2002 06:13:13 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java,v
1.3 2002/03/05 04:55:51 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2002/03/05 04:55:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogoffAction.java,v
1.4 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -63,12 +63,10 @@
package org.apache.struts.webapp.example;
-import java.io.IOException;
import java.util.Hashtable;
import java.util.Locale;
import java.util.Vector;
import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
@@ -87,7 +85,7 @@
* user logoff.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2002/03/05 04:55:51 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/11 06:13:13 $
*/
public final class LogoffAction extends Action {
@@ -118,18 +116,17 @@
* @param request The HTTP request we are processing
* @param response The HTTP response we are creating
*
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
+ * @exception Exception if business logic throws an exception
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws Exception {
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources();
+ MessageResources messages = getResources(request);
HttpSession session = request.getSession();
User user = (User) session.getAttribute(Constants.USER_KEY);
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LogonAction.java 5 Mar 2002 04:55:51 -0000 1.6
+++ LogonAction.java 11 Mar 2002 06:13:13 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v
1.6 2002/03/05 04:55:51 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/05 04:55:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonAction.java,v
1.7 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* Implementation of <strong>Action</strong> that validates a user logon.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/11 06:13:13 $
*/
public final class LogonAction extends Action {
@@ -129,7 +129,7 @@
// Extract attributes we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources();
+ MessageResources messages = getResources(request);
User user = null;
// Validate the request parameters specified by the user
1.7 +5 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveRegistrationAction.java 5 Mar 2002 04:55:51 -0000 1.6
+++ SaveRegistrationAction.java 11 Mar 2002 06:13:13 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
1.6 2002/03/05 04:55:51 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/05 04:55:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
1.7 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -90,7 +90,7 @@
* registration is created, the user is also implicitly logged on.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/11 06:13:13 $
*/
public final class SaveRegistrationAction extends Action {
@@ -132,7 +132,7 @@
// Extract attributes and parameters we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources();
+ MessageResources messages = getResources(request);
HttpSession session = request.getSession();
RegistrationForm regform = (RegistrationForm) form;
String action = request.getParameter("action");
1.7 +5 -5
jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
Index: SaveSubscriptionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SaveSubscriptionAction.java 5 Mar 2002 04:55:51 -0000 1.6
+++ SaveSubscriptionAction.java 11 Mar 2002 06:13:13 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
1.6 2002/03/05 04:55:51 craigmcc Exp $
- * $Revision: 1.6 $
- * $Date: 2002/03/05 04:55:51 $
+ * $Header:
/home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
1.7 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -89,7 +89,7 @@
* updates the mail subscription entered by the user.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.6 $ $Date: 2002/03/05 04:55:51 $
+ * @version $Revision: 1.7 $ $Date: 2002/03/11 06:13:13 $
*/
public final class SaveSubscriptionAction extends Action {
@@ -131,7 +131,7 @@
// Extract attributes and parameters we will need
Locale locale = getLocale(request);
- MessageResources messages = getResources();
+ MessageResources messages = getResources(request);
HttpSession session = request.getSession();
SubscriptionForm subform = (SubscriptionForm) form;
String action = request.getParameter("action");
1.2 +6 -9
jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java
Index: HtmlSettersAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HtmlSettersAction.java 11 Apr 2001 01:55:37 -0000 1.1
+++ HtmlSettersAction.java 11 Mar 2002 06:13:13 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java,v
1.1 2001/04/11 01:55:37 rleland Exp $
- * $Revision: 1.1 $
- * $Date: 2001/04/11 01:55:37 $
+ * $Header:
/home/cvs/jakarta-struts/src/exercise-taglib/org/apache/struts/webapp/exercise/HtmlSettersAction.java,v
1.2 2002/03/11 06:13:13 martinc Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -63,8 +63,6 @@
package org.apache.struts.webapp.exercise;
-import java.io.IOException;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.Action;
@@ -79,7 +77,7 @@
* or the main menu (if "Cancel" was pressed).
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1 $ $Date: 2001/04/11 01:55:37 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/11 06:13:13 $
*/
public class HtmlSettersAction extends Action {
@@ -94,14 +92,13 @@
* @param request The servlet request we are processing
* @param response The servlet response we are creating
*
- * @exception IOException if an input/output error occurs
- * @exception ServletException if a servlet exception occurs
+ * @exception Exception if business logic throws an exception
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
- throws IOException, ServletException {
+ throws Exception {
if (isCancelled(request))
return (mapping.findForward("index"));
1.6 +9 -7
jakarta-struts/src/upload/org/apache/struts/webapp/upload/UploadAction.java
Index: UploadAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/upload/org/apache/struts/webapp/upload/UploadAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UploadAction.java 6 Mar 2002 19:39:08 -0000 1.5
+++ UploadAction.java 11 Mar 2002 06:13:13 -0000 1.6
@@ -1,7 +1,7 @@
/*
-* $Header:
/home/cvs/jakarta-struts/src/upload/org/apache/struts/webapp/upload/UploadAction.java,v
1.5 2002/03/06 19:39:08 mschachter Exp $
-* $Revision: 1.5 $
-* $Date: 2002/03/06 19:39:08 $
+* $Header:
/home/cvs/jakarta-struts/src/upload/org/apache/struts/webapp/upload/UploadAction.java,v
1.6 2002/03/11 06:13:13 martinc Exp $
+* $Revision: 1.6 $
+* $Date: 2002/03/11 06:13:13 $
*
* ====================================================================
*
@@ -87,15 +87,17 @@
* page to display them
*
* @author Mike Schachter
- * @version $Revision: 1.5 $ $Date: 2002/03/06 19:39:08 $
+ * @version $Revision: 1.6 $ $Date: 2002/03/11 06:13:13 $
*/
public class UploadAction extends Action
{
- public ActionForward perform(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse
response)
- {
+ public ActionForward execute(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response)
+ throws Exception {
if (form instanceof UploadForm) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
