tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From manv...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm SetUpUserDBRealmAction.java UserDBRealmForm.java
Date Fri, 08 Feb 2002 21:55:15 GMT
manveen     02/02/08 13:55:15

  Modified:    webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        ApplicationResources_en.properties
                        ApplicationResources_es.properties
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm
                        SetUpUserDBRealmAction.java UserDBRealmForm.java
  Log:
  Add a front end check from the tool to ensure that the resourceName in UserDatabase Realm
has "java:" prefix.
  
  Revision  Changes    Path
  1.23      +1 -0      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties
  
  Index: ApplicationResources_en.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_en.properties,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- ApplicationResources_en.properties	8 Feb 2002 21:37:27 -0000	1.22
  +++ ApplicationResources_en.properties	8 Feb 2002 21:55:15 -0000	1.23
  @@ -180,4 +180,5 @@
   realm.resource=Resource Name
   realm.pathName=Path Name
   error.resource.required=<li>Resource Name is required.</li>
  +error.resource.javaprefix=<li>Resource must have "java:" prefix.</li>
   error.pathName.required=<li>Path Name is required.</li>
  
  
  
  1.24      +1 -0      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties
  
  Index: ApplicationResources_es.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/ApplicationResources_es.properties,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ApplicationResources_es.properties	8 Feb 2002 21:37:27 -0000	1.23
  +++ ApplicationResources_es.properties	8 Feb 2002 21:55:15 -0000	1.24
  @@ -180,4 +180,5 @@
   realm.resource=Nombre Del Recurso
   realm.pathName=Nombre Del Path
   error.resource.required=<li>Se requiere el nombre del recurso.</li>
  +error.resource.javaprefix=<li>El recurso debe tener prefijo de "java:"</li>
   error.pathName.required=<li>Se requiere el nombre del path.</li>
  
  
  
  1.2       +5 -7      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java
  
  Index: SetUpUserDBRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SetUpUserDBRealmAction.java	7 Feb 2002 05:06:53 -0000	1.1
  +++ SetUpUserDBRealmAction.java	8 Feb 2002 21:55:15 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java,v
1.1 2002/02/07 05:06:53 manveen Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/02/07 05:06:53 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SetUpUserDBRealmAction.java,v
1.2 2002/02/08 21:55:15 manveen Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/02/08 21:55:15 $
    *
    * ====================================================================
    *
  @@ -92,7 +92,7 @@
    * a UserDatabase realm is chosen.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2002/02/07 05:06:53 $
  + * @version $Revision: 1.2 $ $Date: 2002/02/08 21:55:15 $
    */
   
   public class SetUpUserDBRealmAction extends Action {
  @@ -197,9 +197,7 @@
               t.printStackTrace(System.out);
               //forward to error page
           }
  -        
  -        // Stash the form bean and forward to the display page
  -        request.setAttribute("userdbRealmForm", realmFm);
  + 
           // Forward back to the appropriate Realm page
           return (mapping.findForward("UserDBRealm"));
           
  
  
  
  1.2       +7 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmForm.java
  
  Index: UserDBRealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UserDBRealmForm.java	7 Feb 2002 05:06:53 -0000	1.1
  +++ UserDBRealmForm.java	8 Feb 2002 21:55:15 -0000	1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmForm.java,v
1.1 2002/02/07 05:06:53 manveen Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/02/07 05:06:53 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDBRealmForm.java,v
1.2 2002/02/08 21:55:15 manveen Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/02/08 21:55:15 $
    *
    * ====================================================================
    *
  @@ -76,7 +76,7 @@
    * Form bean for the User Database realm page.
    *
    * @author Manveen Kaur
  - * @version $Revision: 1.1 $ $Date: 2002/02/07 05:06:53 $
  + * @version $Revision: 1.2 $ $Date: 2002/02/08 21:55:15 $
    */
   
   public final class UserDBRealmForm extends ActionForm {
  @@ -263,6 +263,9 @@
               if ((resource == null) || (resource.length() < 1)) {
                   errors.add("resource",
                   new ActionError("error.resource.required"));
  +            } else if (!resource.startsWith("java:")) {
  +                errors.add("resource",
  +                new ActionError("error.resource.javaprefix"));
               }
           }
           return errors;
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message