You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by nb...@apache.org on 2003/07/22 07:16:41 UTC
cvs commit: jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3 ContinueAction.java LogoffAction.java LogonAction.java
nbubna 2003/07/21 22:16:41
Modified: examples/struts/WEB-INF/src/examples/app1 AddressAction.java
examples/struts/WEB-INF/src/examples/app2 DemoAction.java
examples/struts/WEB-INF/src/examples/app3
ContinueAction.java LogoffAction.java
LogonAction.java
Log:
upgrade deprecated Struts 1.0.x methods and constants
Revision Changes Path
1.2 +5 -4 jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app1/AddressAction.java
Index: AddressAction.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app1/AddressAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AddressAction.java 6 Mar 2003 00:05:18 -0000 1.1
+++ AddressAction.java 22 Jul 2003 05:16:40 -0000 1.2
@@ -16,6 +16,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import org.apache.struts.Globals;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
@@ -60,7 +61,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -115,9 +116,9 @@
{
String locale = ((AddressForm)form).getLocale();
if (locale.equals("Deutsch"))
- session.setAttribute(Action.LOCALE_KEY, new Locale("de", ""));
+ session.setAttribute(Globals.LOCALE_KEY, new Locale("de", ""));
else
- session.setAttribute(Action.LOCALE_KEY, new Locale("en", ""));
+ session.setAttribute(Globals.LOCALE_KEY, new Locale("en", ""));
// forward to edit formular
return (mapping.findForward("showAddress"));
1.2 +2 -2 jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app2/DemoAction.java
Index: DemoAction.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app2/DemoAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DemoAction.java 6 Mar 2003 00:05:18 -0000 1.1
+++ DemoAction.java 22 Jul 2003 05:16:40 -0000 1.2
@@ -49,7 +49,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
1.2 +2 -2 jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3/ContinueAction.java
Index: ContinueAction.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3/ContinueAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContinueAction.java 6 Mar 2003 00:05:18 -0000 1.1
+++ ContinueAction.java 22 Jul 2003 05:16:41 -0000 1.2
@@ -88,7 +88,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
1.2 +10 -20 jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3/LogoffAction.java
Index: LogoffAction.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3/LogoffAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogoffAction.java 6 Mar 2003 00:05:18 -0000 1.1
+++ LogoffAction.java 22 Jul 2003 05:16:41 -0000 1.2
@@ -98,7 +98,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -113,29 +113,19 @@
// Log this user logoff
if (user != null)
{
-
- if (servlet.getDebug() >= Constants.DEBUG)
- {
- StringBuffer message =
- new StringBuffer("LogoffAction: User '");
- message.append(user.getUsername());
- message.append("' logged off in session ");
- message.append(session.getId());
- servlet.log(message.toString());
- }
+ StringBuffer message = new StringBuffer("LogoffAction: User '");
+ message.append(user.getUsername());
+ message.append("' logged off in session ");
+ message.append(session.getId());
+ servlet.log(message.toString());
}
else
{
- if (servlet.getDebug() >= Constants.DEBUG)
- {
- StringBuffer message =
- new StringBuffer("LogoffAction: User '");
- message.append(session.getId());
- servlet.log(message.toString());
- }
-
+ StringBuffer message = new StringBuffer("LogoffAction: User '");
+ message.append(session.getId());
+ servlet.log(message.toString());
}
// Remove user login; invalidate session
1.2 +8 -12 jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3/LogonAction.java
Index: LogonAction.java
===================================================================
RCS file: /home/cvs/jakarta-velocity-tools/examples/struts/WEB-INF/src/examples/app3/LogonAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogonAction.java 6 Mar 2003 00:05:18 -0000 1.1
+++ LogonAction.java 22 Jul 2003 05:16:41 -0000 1.2
@@ -100,7 +100,7 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet exception occurs
*/
- public ActionForward perform(ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
@@ -115,16 +115,12 @@
HttpSession session = request.getSession();
session.setAttribute(Constants.USER_KEY, form);
- // Log this event, if appropriate
- if (servlet.getDebug() >= Constants.DEBUG)
- {
- StringBuffer message =
- new StringBuffer("LogonAction: User '");
- message.append(username);
- message.append("' logged on in session ");
- message.append(session.getId());
- servlet.log(message.toString());
- }
+ // Log this event
+ StringBuffer message = new StringBuffer("LogonAction: User '");
+ message.append(username);
+ message.append("' logged on in session ");
+ message.append(session.getId());
+ servlet.log(message.toString());
// Forward control to the success URI
// specified in struts-config.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org