tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
Date Fri, 19 Jul 2002 00:23:21 GMT
amyroh      2002/07/18 17:23:20

  Modified:    catalina/src/share/org/apache/catalina/mbeans
                        mbeans-descriptors.xml
               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
                        AddRealmAction.java DeleteRealmAction.java
                        DeleteRealmForm.java DeleteRealmsAction.java
                        EditRealmAction.java JDBCRealmForm.java
                        JNDIRealmForm.java MemoryRealmForm.java
                        RealmForm.java RealmsForm.java
                        SaveJDBCRealmAction.java SaveJNDIRealmAction.java
                        SaveMemoryRealmAction.java
                        SaveUserDatabaseRealmAction.java
                        UserDatabaseRealmForm.java
               webapps/admin/realm jndiRealm.jsp
  Log:
  Minor addition of userBase element to JNDIRealm admin page.
  
  Revision  Changes    Path
  1.65      +5 -1      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml
  
  Index: mbeans-descriptors.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/mbeans/mbeans-descriptors.xml,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mbeans-descriptors.xml	15 Jul 2002 21:05:19 -0000	1.64
  +++ mbeans-descriptors.xml	19 Jul 2002 00:23:17 -0000	1.65
  @@ -1047,6 +1047,10 @@
                           memberships?"
                    type="boolean"/>
   
  +    <attribute   name="userBase"
  +          description="The base element for user searches"
  +                 type="java.lang.String"/>
  +
       <attribute   name="userSubtree"
             description="Should we search the entire subtree for matching 
                          users?"
  
  
  
  1.65      +2 -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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- ApplicationResources_en.properties	20 Jun 2002 02:31:05 -0000	1.64
  +++ ApplicationResources_en.properties	19 Jul 2002 00:23:18 -0000	1.65
  @@ -223,6 +223,7 @@
   realm.user.roleName=User Role Name
   realm.pattern=Role Search Pattern
   realm.role.subtree=Search Role Subtree
  +realm.userBase=User Base Element
   realm.user.subtree=Search User Subtree
   realm.userPassword=User Password
   realm.userPattern=User Search Pattern
  @@ -254,6 +255,7 @@
   error.digest.required=<li>Digest algorithm is required.</li>
   error.roleBase.required=<li>Role base element is required.</li>
   error.rolePattern.required=<li>Role search pattern is required.</li>
  +error.userBase.required=<li>User base element is required.</li>
   error.userPassword.required=<li>User Password is required.</li>
   error.userPattern.required=<li>User search pattern is required.</li>
   error.contextFactory.required=<li>Context Factory is required.</li>
  
  
  
  1.54      +2 -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.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- ApplicationResources_es.properties	21 Jun 2002 19:19:52 -0000	1.53
  +++ ApplicationResources_es.properties	19 Jul 2002 00:23:18 -0000	1.54
  @@ -223,6 +223,7 @@
   realm.user.roleName=User Role Name
   realm.pattern=Modelo De la Busqueda Del Papel
   realm.role.subtree=Search Role Subtree
  +realm.userBase=User Base Element
   realm.user.subtree=Search User Subtree
   realm.userPassword=Palabra de paso Del Utilizador
   realm.userPattern=User Search Pattern
  @@ -254,6 +255,7 @@
   error.digest.required=<li>Se requiere el algoritmo del digest</li>
   error.roleBase.required=<li>Se requiere el elemento bajo del papel.</li>
   error.rolePattern.required=<li>Se requiere el modelo de la busqueda del papel.</li>
  +error.userBase.required=<li>Se requiere el elemento bajo del usuario.</li>
   error.userPassword.required=<li>Se requiere la palabra de paso del utilizador.</li>
   error.userPattern.required=<li>Se requiere el modelo de la busqueda del utilizador.</li>
   error.contextFactory.required=<li>Se requiere la factory del contexto.</li>
  
  
  
  1.4       +5 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java
  
  Index: AddRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AddRealmAction.java	30 May 2002 19:42:23 -0000	1.3
  +++ AddRealmAction.java	19 Jul 2002 00:23:18 -0000	1.4
  @@ -202,6 +202,7 @@
           realmFm.setRoleName("");        
           realmFm.setRoleBase("");        
           realmFm.setContextFactory("");
  +        realmFm.setUserBase("");
           realmFm.setUserPattern("");
           realmFm.setUserPassword("");
           realmFm.setConnectionName("");
  
  
  
  1.3       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java
  
  Index: DeleteRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmAction.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  
  
  
  1.2       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmForm.java
  
  Index: DeleteRealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  
  
  
  1.2       +3 -3      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java
  
  Index: DeleteRealmsAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/DeleteRealmsAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  
  
  
  1.10      +7 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java
  
  Index: EditRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EditRealmAction.java	30 May 2002 19:42:23 -0000	1.9
  +++ EditRealmAction.java	19 Jul 2002 00:23:18 -0000	1.10
  @@ -404,6 +404,9 @@
               attribute = "contextFactory";
               realmFm.setContextFactory
                   ((String) mBServer.getAttribute(rname, attribute));
  +            attribute = "userBase";
  +            realmFm.setUserBase
  +                ((String) mBServer.getAttribute(rname, attribute));
               attribute = "userPassword";
               realmFm.setUserPassword
                   ((String) mBServer.getAttribute(rname, attribute));
  
  
  
  1.7       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java
  
  Index: JDBCRealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JDBCRealmForm.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  
  
  
  1.8       +36 -5     jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java
  
  Index: JNDIRealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JNDIRealmForm.java	30 May 2002 19:42:23 -0000	1.7
  +++ JNDIRealmForm.java	19 Jul 2002 00:23:18 -0000	1.8
  @@ -142,6 +142,11 @@
        * The text for the user Password.
        */
       private String userPassword = null;
  +
  +    /**
  +     * The text for the user Base.
  +     */
  +    private String userBase = null;
       
       /**
        * The text for the user search Pattern.
  @@ -263,6 +268,24 @@
           this.roleName  = roleName ;
           
       }
  +
  +    /**
  +     * Return the userBase.
  +     */
  +    public String getUserBase() {
  +        
  +        return this.userBase ;
  +        
  +    }
  +    
  +    /**
  +     * Set the userBase.
  +     */
  +    public void setUserBase(String userBase ) {
  +        
  +        this.userBase  = userBase ;
  +        
  +    }
       
       /**
        * Return the user role name.
  @@ -435,6 +458,7 @@
           
           this.rolePattern = null;
           this.roleBase = null;
  +        this.userBase = null;
           this.userPassword = null;
           this.userPattern = null;
           this.contextFactory = null;
  @@ -471,6 +495,8 @@
           sb.append(roleBase);
           sb.append("',userPassword='");
           sb.append(userPassword);
  +        sb.append(",userBase=");
  +        sb.append(userBase);        
           sb.append("',userPattern=");
           sb.append(userPattern);
           sb.append(",contextFactory=");
  @@ -530,7 +556,12 @@
                   errors.add("roleBase",
                   new ActionError("error.roleBase.required"));
               }
  -            
  +             
  +            if ((userBase == null) || (userBase.length() < 1)) {
  +                errors.add("userBase",
  +                new ActionError("error.userBase.required"));
  +            }
  +           
               if ((userPassword == null) || (userPassword.length() < 1)) {
                   errors.add("userPassword",
                   new ActionError("error.userPassword.required"));
  
  
  
  1.6       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java
  
  Index: MemoryRealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/MemoryRealmForm.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  
  
  
  1.2       +3 -3      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java
  
  Index: RealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  
  
  
  1.2       +3 -3      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmsForm.java
  
  Index: RealmsForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/RealmsForm.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  
  
  
  1.5       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java
  
  Index: SaveJDBCRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJDBCRealmAction.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  
  
  
  1.7       +8 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java
  
  Index: SaveJNDIRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SaveJNDIRealmAction.java	30 May 2002 19:42:23 -0000	1.6
  +++ SaveJNDIRealmAction.java	19 Jul 2002 00:23:18 -0000	1.7
  @@ -318,6 +318,10 @@
               mBServer.setAttribute(roname,
                                     new Attribute("userPassword",  rform.getUserPassword()));
   
  +            attribute = "userBase";
  +            mBServer.setAttribute(roname,
  +                                  new Attribute("userBase",  rform.getUserBase()));   
        
  +
               attribute = "userPattern";
               mBServer.setAttribute(roname,
                                     new Attribute("userPattern",  rform.getUserPattern()));
  
  
  
  1.4       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java
  
  Index: SaveMemoryRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveMemoryRealmAction.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  
  
  
  1.6       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java
  
  Index: SaveUserDatabaseRealmAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveUserDatabaseRealmAction.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  
  
  
  1.7       +4 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java
  
  Index: UserDatabaseRealmForm.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/UserDatabaseRealmForm.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  
  
  
  1.10      +7 -0      jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp
  
  Index: jndiRealm.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- jndiRealm.jsp	30 May 2002 19:42:23 -0000	1.9
  +++ jndiRealm.jsp	19 Jul 2002 00:23:20 -0000	1.10
  @@ -161,6 +161,13 @@
           </controls:row>
   
           <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
  +            <controls:label><bean:message key="realm.userBase"/>:</controls:label>
  +            <controls:data>
  +                <html:text property="userBase" size="30"/>
  +            </controls:data>
  +        </controls:row>
  +
  +        <controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
               <controls:label><bean:message key="realm.user.roleName"/>:</controls:label>
               <controls:data>
                   <html:text property="userRoleName" size="30"/>
  
  
  

--
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