jmitchell 2003/01/10 19:08:23 Modified: src/example/org/apache/struts/webapp/example CheckLogonTag.java EditRegistrationAction.java EditSubscriptionAction.java LinkSubscriptionTag.java LinkUserTag.java LogoffAction.java LogonAction.java LogonForm.java RegistrationForm.java SaveRegistrationAction.java SaveSubscriptionAction.java SubscriptionForm.java src/example/org/apache/struts/webapp/example/memory MemoryDatabasePlugIn.java MemoryUser.java MemoryUserDatabase.java Log: Fix my previous screwup Revision Changes Path 1.6 +11 -4 jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java Index: CheckLogonTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/CheckLogonTag.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- CheckLogonTag.java 10 Jan 2003 00:29:55 -0000 1.5 +++ CheckLogonTag.java 11 Jan 2003 03:08:23 -0000 1.6 @@ -63,8 +63,15 @@ package org.apache.struts.webapp.example; +import java.io.IOException; +import javax.servlet.http.HttpSession; import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.TagSupport; +import org.apache.struts.action.Action; +import org.apache.struts.util.MessageResources; +import org.apache.struts.config.ModuleConfig; /** 1.10 +10 -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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- EditRegistrationAction.java 10 Jan 2003 00:29:55 -0000 1.9 +++ EditRegistrationAction.java 11 Jan 2003 03:08:23 -0000 1.10 @@ -63,15 +63,20 @@ package org.apache.struts.webapp.example; +import java.lang.reflect.InvocationTargetException; +import java.util.Locale; +import javax.servlet.ServletException; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - +import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.struts.util.MessageResources; /** 1.10 +10 -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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- EditSubscriptionAction.java 10 Jan 2003 00:29:55 -0000 1.9 +++ EditSubscriptionAction.java 11 Jan 2003 03:08:23 -0000 1.10 @@ -63,15 +63,20 @@ package org.apache.struts.webapp.example; +import java.lang.reflect.InvocationTargetException; +import java.util.Locale; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; - +import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.struts.util.MessageResources; /** 1.4 +11 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java Index: LinkSubscriptionTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LinkSubscriptionTag.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LinkSubscriptionTag.java 10 Jan 2003 00:29:55 -0000 1.3 +++ LinkSubscriptionTag.java 11 Jan 2003 03:08:23 -0000 1.4 @@ -63,10 +63,16 @@ package org.apache.struts.webapp.example; +import java.io.IOException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.TagSupport; - import org.apache.struts.util.MessageResources; +import org.apache.struts.util.ResponseUtils; +import org.apache.struts.config.ModuleConfig; /** 1.5 +11 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/LinkUserTag.java Index: LinkUserTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LinkUserTag.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- LinkUserTag.java 10 Jan 2003 00:29:55 -0000 1.4 +++ LinkUserTag.java 11 Jan 2003 03:08:23 -0000 1.5 @@ -63,10 +63,16 @@ package org.apache.struts.webapp.example; +import java.io.IOException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.TagSupport; - import org.apache.struts.util.MessageResources; +import org.apache.struts.util.ResponseUtils; +import org.apache.struts.config.ModuleConfig; /** 1.7 +7 -5 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- LogoffAction.java 10 Jan 2003 00:29:55 -0000 1.6 +++ LogoffAction.java 11 Jan 2003 03:08:23 -0000 1.7 @@ -63,15 +63,17 @@ package org.apache.struts.webapp.example; +import java.util.Locale; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.struts.util.MessageResources; /** 1.14 +10 -6 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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- LogonAction.java 10 Jan 2003 00:29:55 -0000 1.13 +++ LogonAction.java 11 Jan 2003 03:08:23 -0000 1.14 @@ -62,17 +62,21 @@ package org.apache.struts.webapp.example; - +import java.util.Locale; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; - 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.util.ModuleException; +import org.apache.struts.util.MessageResources; +import org.apache.commons.beanutils.PropertyUtils; /** 1.4 +5 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/LogonForm.java Index: LogonForm.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/LogonForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- LogonForm.java 10 Jan 2003 00:29:56 -0000 1.3 +++ LogonForm.java 11 Jan 2003 03:08:23 -0000 1.4 @@ -64,7 +64,7 @@ import javax.servlet.http.HttpServletRequest; - +import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; 1.6 +6 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/RegistrationForm.java Index: RegistrationForm.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/RegistrationForm.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RegistrationForm.java 10 Jan 2003 00:29:56 -0000 1.5 +++ RegistrationForm.java 11 Jan 2003 03:08:23 -0000 1.6 @@ -64,8 +64,9 @@ import javax.servlet.http.HttpServletRequest; - +import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; +import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts.validator.ValidatorForm; 1.14 +12 -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.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- SaveRegistrationAction.java 10 Jan 2003 00:29:56 -0000 1.13 +++ SaveRegistrationAction.java 11 Jan 2003 03:08:23 -0000 1.14 @@ -63,15 +63,22 @@ package org.apache.struts.webapp.example; +import java.lang.reflect.InvocationTargetException; +import java.util.Locale; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; - +import org.apache.commons.beanutils.PropertyUtils; 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.util.MessageResources; /** 1.12 +12 -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.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- SaveSubscriptionAction.java 10 Jan 2003 00:29:56 -0000 1.11 +++ SaveSubscriptionAction.java 11 Jan 2003 03:08:23 -0000 1.12 @@ -63,15 +63,22 @@ package org.apache.struts.webapp.example; +import java.lang.reflect.InvocationTargetException; +import java.util.Locale; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletResponse; - +import org.apache.commons.beanutils.PropertyUtils; 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.util.MessageResources; /** 1.4 +5 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/SubscriptionForm.java Index: SubscriptionForm.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/SubscriptionForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SubscriptionForm.java 10 Jan 2003 00:29:56 -0000 1.3 +++ SubscriptionForm.java 11 Jan 2003 03:08:23 -0000 1.4 @@ -64,7 +64,7 @@ import javax.servlet.http.HttpServletRequest; - +import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; 1.7 +10 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java Index: MemoryDatabasePlugIn.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryDatabasePlugIn.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- MemoryDatabasePlugIn.java 10 Jan 2003 00:29:56 -0000 1.6 +++ MemoryDatabasePlugIn.java 11 Jan 2003 03:08:23 -0000 1.7 @@ -63,13 +63,18 @@ package org.apache.struts.webapp.example.memory; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import javax.servlet.ServletException; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts.action.ActionServlet; import org.apache.struts.action.PlugIn; import org.apache.struts.config.ModuleConfig; +import org.apache.struts.webapp.example.Constants; /** * <p><strong>MemoryDatabasePlugIn</strong> initializes and finalizes the 1.3 +5 -5 jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryUser.java Index: MemoryUser.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryUser.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MemoryUser.java 10 Jan 2003 00:29:56 -0000 1.2 +++ MemoryUser.java 11 Jan 2003 03:08:23 -0000 1.3 @@ -62,7 +62,7 @@ package org.apache.struts.webapp.example.memory; - +import java.util.HashMap; import org.apache.struts.webapp.example.Subscription; import org.apache.struts.webapp.example.User; import org.apache.struts.webapp.example.UserDatabase; 1.3 +13 -4 jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java Index: MemoryUserDatabase.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/example/org/apache/struts/webapp/example/memory/MemoryUserDatabase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MemoryUserDatabase.java 10 Jan 2003 00:29:56 -0000 1.2 +++ MemoryUserDatabase.java 11 Jan 2003 03:08:23 -0000 1.3 @@ -63,10 +63,19 @@ package org.apache.struts.webapp.example.memory; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.HashMap; import org.apache.commons.digester.Digester; import org.apache.commons.digester.ObjectCreationFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts.webapp.example.Subscription; import org.apache.struts.webapp.example.User; import org.apache.struts.webapp.example.UserDatabase; import org.xml.sax.Attributes;
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>