amyroh      2004/03/08 08:51:51

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources
                        DataSourceForm.java EnvEntryForm.java
                        MailSessionForm.java ResourceLinkForm.java
                        UserDatabaseForm.java
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
                        GroupForm.java RoleForm.java UserForm.java
  Log:
  Fix validation.
  
  Revision  Changes    Path
  1.6       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java
  
  Index: DataSourceForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/DataSourceForm.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DataSourceForm.java       20 Jun 2002 22:53:16 -0000      1.5
  +++ DataSourceForm.java       8 Mar 2004 16:51:50 -0000       1.6
  @@ -342,7 +342,7 @@
   
           String submit = request.getParameter("submit");
   
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // url is a required field
               if ((url == null) || (url.length() < 1)) {
  @@ -391,7 +391,7 @@
                   errors.add("password",
                              new ActionError("users.error.quotes"));
               }
  -         }
  +         //}
           return (errors);
       }
    
  
  
  
  1.8       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java
  
  Index: EnvEntryForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/EnvEntryForm.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EnvEntryForm.java 14 Jun 2002 13:29:29 -0000      1.7
  +++ EnvEntryForm.java 8 Mar 2004 16:51:50 -0000       1.8
  @@ -307,7 +307,7 @@
           errors = new ActionErrors();
   
           String submit = request.getParameter("submit");
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // name is a required field
               if ((name == null) || (name.length() < 1)) {
  @@ -346,7 +346,7 @@
                      errors.add("value",
                              new ActionError("resources.error.value.mismatch"));
               }
  -        }
  +        //}
           return (errors);
       }
   
  
  
  
  1.2       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java
  
  Index: MailSessionForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/MailSessionForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MailSessionForm.java      20 Jun 2002 02:31:05 -0000      1.1
  +++ MailSessionForm.java      8 Mar 2004 16:51:50 -0000       1.2
  @@ -239,14 +239,14 @@
   
           String submit = request.getParameter("submit");
   
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // mailSmtpHost is a required field
               if ((mailhost == null) || (mailhost.length() < 1)) {
                   errors.add("mailhost",
                         new ActionError("resources.error.mailhost.required"));
               }
  -         }
  +         //}
           
           return (errors);
       }
  
  
  
  1.3       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java
  
  Index: ResourceLinkForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/ResourceLinkForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ResourceLinkForm.java     14 Jun 2002 13:29:29 -0000      1.2
  +++ ResourceLinkForm.java     8 Mar 2004 16:51:50 -0000       1.3
  @@ -239,7 +239,7 @@
   
           String submit = request.getParameter("submit");
   
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // name is a required field
               if ((name == null) || (name.length() < 1)) {
  @@ -259,7 +259,7 @@
                              new ActionError("resources.error.type.required"));
               }
               
  -         }
  +         //}
   
           return (errors);
   
  
  
  
  1.3       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java
  
  Index: UserDatabaseForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/resources/UserDatabaseForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserDatabaseForm.java     7 May 2002 21:13:27 -0000       1.2
  +++ UserDatabaseForm.java     8 Mar 2004 16:51:50 -0000       1.3
  @@ -193,7 +193,7 @@
           errors = new ActionErrors();
   
           String submit = request.getParameter("submit");
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // name is a required field
               if ((name == null) || (name.length() < 1)) {
  @@ -224,7 +224,7 @@
                   errors.add("description",
                              new ActionError("users.error.quotes"));
               }
  -        }
  +        //}
           return (errors);
       }
       
  
  
  
  1.3       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java
  
  Index: GroupForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GroupForm.java    10 Feb 2002 08:06:20 -0000      1.2
  +++ GroupForm.java    8 Mar 2004 16:51:51 -0000       1.3
  @@ -166,7 +166,7 @@
           ActionErrors errors = new ActionErrors();
   
           String submit = request.getParameter("submit");
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // groupname is a required field
               if ((groupname == null) || (groupname.length() < 1)) {
  @@ -186,7 +186,7 @@
                              new ActionError("users.error.quotes"));
               }
   
  -        }
  +        //}
   
           return (errors);
   
  
  
  
  1.2       +5 -5      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java
  
  Index: RoleForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RoleForm.java     10 Feb 2002 03:18:37 -0000      1.1
  +++ RoleForm.java     8 Mar 2004 16:51:51 -0000       1.2
  @@ -148,7 +148,7 @@
           ActionErrors errors = new ActionErrors();
   
           String submit = request.getParameter("submit");
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // rolename is a required field
               if ((rolename == null) || (rolename.length() < 1)) {
  @@ -168,7 +168,7 @@
                              new ActionError("users.error.quotes"));
               }
   
  -        }
  +        //}
   
           return (errors);
   
  
  
  
  1.3       +6 -6      
jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java
  
  Index: UserForm.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UserForm.java     10 Feb 2002 08:06:20 -0000      1.2
  +++ UserForm.java     8 Mar 2004 16:51:51 -0000       1.3
  @@ -198,7 +198,7 @@
           ActionErrors errors = new ActionErrors();
   
           String submit = request.getParameter("submit");
  -        if (submit != null) {
  +        //if (submit != null) {
   
               // username is a required field
               if ((username == null) || (username.length() < 1)) {
  @@ -230,7 +230,7 @@
                              new ActionError("users.error.quotes"));
               }
   
  -        }
  +        //}
   
           return (errors);
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to