cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
amyroh 2002/08/13 15:35:20 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 AddRealmAction.java EditRealmAction.java JNDIRealmForm.java SaveJNDIRealmAction.java webapps/admin/realm jndiRealm.jsp Log: Minor changes in validation of required fields in JNDIRealm. Revision ChangesPath 1.66 +4 -2 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.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- ApplicationResources_en.properties19 Jul 2002 00:23:18 - 1.65 +++ ApplicationResources_en.properties13 Aug 2002 22:35:20 - 1.66 @@ -226,7 +226,8 @@ realm.userBase=User Base Element realm.user.subtree=Search User Subtree realm.userPassword=User Password -realm.userPattern=User Search Pattern +realm.userPattern=User Pattern +realm.userSearch=User Search valve.access.properties=Access Logger Properties valve.request.properties=Request Filter Properties valve.single.properties=Single SignOn Valve Properties @@ -257,7 +258,8 @@ error.rolePattern.required=Role search pattern is required. error.userBase.required=User base element is required. error.userPassword.required=User Password is required. -error.userPattern.required=User search pattern is required. +error.userPattern.required=User pattern is required. +error.userSearch.required=User search is required. error.contextFactory.required=Context Factory is required. error.connPassword.required=Connection password is required. error.connURL.required=Connection URL is required. 1.55 +19 -18 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.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ApplicationResources_es.properties19 Jul 2002 00:23:18 - 1.54 +++ ApplicationResources_es.properties13 Aug 2002 22:35:20 - 1.55 @@ -11,7 +11,7 @@ button.cancel=Reajuste button.commit=Confie Cambiar button.logout=Log Out -login.enter=Introduzca un nombre de usuario y una contrase\u00f1a para iniciar una nueva sesi\u00f3n +login.enter=Introduzca un nombre de usuario y una contrase\u00f1a para iniciar una nueva sesi\u00f3n login.changeLanguage=Cambio de idioma error.login=Nombre de usuario o contrase\u00f1a inv\u00e1lidos error.tryagain=Para intentar de nuevo, presione @@ -226,7 +226,8 @@ realm.userBase=User Base Element realm.user.subtree=Search User Subtree realm.userPassword=Palabra de paso Del Utilizador -realm.userPattern=User Search Pattern +realm.userPattern=User Pattern +realm.userSearch=User Search valve.access.properties=Propiedades del Access Logger valve.request.properties=Propiedades del Request Filter valve.single.properties=Propiedades del Single SignOn Valve @@ -257,7 +258,8 @@ error.rolePattern.required=Se requiere el modelo de la busqueda del papel. error.userBase.required=Se requiere el elemento bajo del usuario. error.userPassword.required=Se requiere la palabra de paso del utilizador. -error.userPattern.required=Se requiere el modelo de la busqueda del utilizador. +error.userPattern.required=Se requiere el patrón del usuario. +error.userSearch.required=Se requiere la búsqueda del usuario. error.contextFactory.required=Se requiere la factory del contexto. error.connPassword.required=Se requiere la palabra de paso de la conexion. error.connURL.required=Se requiere el URL de la conexion. @@ -279,7 +281,7 @@ resources.datasrc.jdbc=JDBC Driver resources.actions.datasrc=Datasources resources.actions.datasrc.create=Cree La Nueva Fuente De Datos -resources.actions.datasrc.delete=Fuentes De Datos De la Cancelación +resources.actions.datasrc.delete=Fuentes De Datos De la Cancelaci=n resources.actions.datasrc.edit=Corrija La Fuente De Datos resources.datasrc.url=Datasource URL resources.datasrc.jdbcclass=JDBC Driver Class @@ -290,37 +292,37 @@ resources.datasrc.validation=Validation Query resources.datasrc.jndi=JNDI Name resources.actions.mailsession=Sesione
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
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 ChangesPath 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.xml15 Jul 2002 21:05:19 - 1.64 +++ mbeans-descriptors.xml19 Jul 2002 00:23:17 - 1.65 @@ -1047,6 +1047,10 @@ memberships?" type="boolean"/> + + Digest algorithm is required. error.roleBase.required=Role base element is required. error.rolePattern.required=Role search pattern is required. +error.userBase.required=User base element is required. error.userPassword.required=User Password is required. error.userPattern.required=User search pattern is required. error.contextFactory.required=Context Factory is required. 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.properties21 Jun 2002 19:19:52 - 1.53 +++ ApplicationResources_es.properties19 Jul 2002 00:23:18 - 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=Se requiere el algoritmo del digest error.roleBase.required=Se requiere el elemento bajo del papel. error.rolePattern.required=Se requiere el modelo de la busqueda del papel. +error.userBase.required=Se requiere el elemento bajo del usuario. error.userPassword.required=Se requiere la palabra de paso del utilizador. error.userPattern.required=Se requiere el modelo de la busqueda del utilizador. error.contextFactory.required=Se requiere la factory del contexto. 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 - 1.3 +++ AddRealmAction.java 19 Jul 2002 00:23:18 - 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
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
manveen 02/05/30 12:42:23 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 AddRealmAction.java EditRealmAction.java JNDIRealmForm.java SaveJNDIRealmAction.java webapps/admin/realm jndiRealm.jsp Log: Add the userRoleName attribute to jndirealm. Revision ChangesPath 1.61 +4 -2 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.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- ApplicationResources_en.properties30 May 2002 18:30:35 - 1.60 +++ ApplicationResources_en.properties30 May 2002 19:42:22 - 1.61 @@ -219,7 +219,8 @@ realm.connURL=Connection URL realm.connFactory=Context Factory realm.roleBase=Role Base Element -realm.Attribute=Role Name Attribute +realm.roleName=Role Name +realm.user.roleName=User Role Name realm.pattern=Role Search Pattern realm.role.subtree=Search Role Subtree realm.user.subtree=Search User Subtree @@ -248,7 +249,8 @@ error.connectionPassword.required=Database password is required. error.connectionURL.required=Database URL is required. error.connectionName.required=Database username is required. -error.roleAttribute.required=Role name attribute is required. +error.roleName.required=Role name is required. +error.userRoleName.required=User Role name is required. error.digest.required=Digest algorithm is required. error.roleBase.required=Role base element is required. error.rolePattern.required=Role search pattern is required. 1.52 +4 -2 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.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ApplicationResources_es.properties30 May 2002 18:30:35 - 1.51 +++ ApplicationResources_es.properties30 May 2002 19:42:23 - 1.52 @@ -219,7 +219,8 @@ realm.connURL=URL De la Conexion realm.connFactory=Fabrica Del Contexto realm.roleBase=Elemento Bajo Del Papel -realm.Attribute=Role Name Attribute +realm.roleName=Role Name +realm.user.roleName=User Role Name realm.pattern=Modelo De la Busqueda Del Papel realm.role.subtree=Search Role Subtree realm.user.subtree=Search User Subtree @@ -248,7 +249,8 @@ error.connectionPassword.required=Se requiere la palabra de paso de la base de datos. error.connectionURL.required=Se requiere el URL de la base de datos. error.connectionName.required=Se requiere el username de la base de datos. -error.roleAttribute.required=Se requiere el atributo del nombre del role. +error.roleName.required=Role name attribute requiredo. +error.userRoleName.required=User Role name attribute requiredo. error.digest.required=Se requiere el algoritmo del digest error.roleBase.required=Se requiere el elemento bajo del papel. error.rolePattern.required=Se requiere el modelo de la busqueda del papel. 1.3 +6 -5 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AddRealmAction.java 30 May 2002 18:30:35 - 1.2 +++ AddRealmAction.java 30 May 2002 19:42:23 - 1.3 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v 1.2 2002/05/30 18:30:35 manveen Exp $ - * $Revision: 1.2 $ - * $Date: 2002/05/30 18:30:35 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v 1.3 2002/05/30 19:42:23 manveen Exp $ + * $Revision: 1.3 $ + * $Date: 2002/05/30 19:42:23 $ * * * @@ -82,7 +82,7 @@ * The Action that sets up Add Realm transactions.
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
manveen 02/05/30 11:30:36 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 AddRealmAction.java EditRealmAction.java JNDIRealmForm.java SaveJNDIRealmAction.java webapps/admin/realm jndiRealm.jsp Log: Add provision to be able to set userSubtree property from the admintool. Revision ChangesPath 1.60 +2 -1 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.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- ApplicationResources_en.properties30 May 2002 06:23:08 - 1.59 +++ ApplicationResources_en.properties30 May 2002 18:30:35 - 1.60 @@ -221,7 +221,8 @@ realm.roleBase=Role Base Element realm.Attribute=Role Name Attribute realm.pattern=Role Search Pattern -realm.search=Search Subtrees +realm.role.subtree=Search Role Subtree +realm.user.subtree=Search User Subtree realm.userPassword=User Password realm.userPattern=User Search Pattern valve.access.properties=Access Logger Properties 1.51 +2 -1 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.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ApplicationResources_es.properties30 May 2002 06:23:08 - 1.50 +++ ApplicationResources_es.properties30 May 2002 18:30:35 - 1.51 @@ -221,7 +221,8 @@ realm.roleBase=Elemento Bajo Del Papel realm.Attribute=Role Name Attribute realm.pattern=Modelo De la Busqueda Del Papel -realm.search=Search Subtrees +realm.role.subtree=Search Role Subtree +realm.user.subtree=Search User Subtree realm.userPassword=Palabra de paso Del Utilizador realm.userPattern=User Search Pattern valve.access.properties=Propiedades del Access Logger 1.2 +7 -6 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AddRealmAction.java 16 Apr 2002 06:00:17 - 1.1 +++ AddRealmAction.java 30 May 2002 18:30:35 - 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v 1.1 2002/04/16 06:00:17 manveen Exp $ - * $Revision: 1.1 $ - * $Date: 2002/04/16 06:00:17 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/AddRealmAction.java,v 1.2 2002/05/30 18:30:35 manveen Exp $ + * $Revision: 1.2 $ + * $Date: 2002/05/30 18:30:35 $ * * * @@ -82,7 +82,7 @@ * The Action that sets up Add Realm transactions. * * @author Manveen Kaur - * @version $Revision: 1.1 $ $Date: 2002/04/16 06:00:17 $ + * @version $Revision: 1.2 $ $Date: 2002/05/30 18:30:35 $ */ public class AddRealmAction extends Action { @@ -194,8 +194,9 @@ realmFm.setRealmType(realmType); realmFm.setDebugLvl("0"); realmFm.setDigest(""); -realmFm.setRoleBase(""); -realmFm.setSearch("false"); +realmFm.setRoleBase(""); +realmFm.setUserSubtree("false"); +realmFm.setRoleSubtree("false"); realmFm.setRolePattern(""); realmFm.setRoleAttribute(""); realmFm.setRoleBase(""); 1.8 +8 -5 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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Edi
cvs commit: jakarta-tomcat-4.0/webapps/admin/realm jndiRealm.jsp
manveen 02/05/30 10:22:04 Modified:webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm EditRealmAction.java SaveJNDIRealmAction.java webapps/admin/realm jndiRealm.jsp Log: Fix for jndi realm throwing exception while adding a new realm. Revision ChangesPath 1.7 +7 -7 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.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- EditRealmAction.java 30 May 2002 06:23:08 - 1.6 +++ EditRealmAction.java 30 May 2002 17:22:04 - 1.7 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v 1.6 2002/05/30 06:23:08 manveen Exp $ - * $Revision: 1.6 $ - * $Date: 2002/05/30 06:23:08 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v 1.7 2002/05/30 17:22:04 manveen Exp $ + * $Revision: 1.7 $ + * $Date: 2002/05/30 17:22:04 $ * * * @@ -92,7 +92,7 @@ * Realm transactions, based on the type of Realm. * * @author Manveen Kaur - * @version $Revision: 1.6 $ $Date: 2002/05/30 06:23:08 $ + * @version $Revision: 1.7 $ $Date: 2002/05/30 17:22:04 $ */ public class EditRealmAction extends Action { @@ -383,16 +383,16 @@ attribute = "digest"; realmFm.setDigest ((String) mBServer.getAttribute(rname, attribute)); -attribute = "roleSearch"; +attribute = "roleSubtree"; realmFm.setSearch -((String) mBServer.getAttribute(rname, attribute)); +(((Boolean) mBServer.getAttribute(rname, attribute)).toString()); attribute = "roleName"; realmFm.setRoleAttribute ((String) mBServer.getAttribute(rname, attribute)); attribute = "roleBase"; realmFm.setRoleBase ((String) mBServer.getAttribute(rname, attribute)); -attribute = "roleSubtree"; +attribute = "roleSearch"; realmFm.setRolePattern ((String) mBServer.getAttribute(rname, attribute)); attribute = "contextFactory"; 1.4 +6 -6 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.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SaveJNDIRealmAction.java 9 May 2002 01:07:31 - 1.3 +++ SaveJNDIRealmAction.java 30 May 2002 17:22:04 - 1.4 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v 1.3 2002/05/09 01:07:31 manveen Exp $ - * $Revision: 1.3 $ - * $Date: 2002/05/09 01:07:31 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v 1.4 2002/05/30 17:22:04 manveen Exp $ + * $Revision: 1.4 $ + * $Date: 2002/05/30 17:22:04 $ * * * @@ -96,7 +96,7 @@ * Edit Realm transactions for JNDI realm. * * @author Manveen Kaur - * @version $Revision: 1.3 $ $Date: 2002/05/09 01:07:31 $ + * @version $Revision: 1.4 $ $Date: 2002/05/30 17:22:04 $ */ public final class SaveJNDIRealmAction extends Action { @@ -288,7 +288,7 @@ attribute = "roleSearch"; mBServer.setAttribute(roname, - new Attribute("roleSearch", rform.getSearch())); + new Attribute("roleSearch", rform.getRolePattern())); attribute = "roleName"; mBServer.setAttribute(roname, @@ -300,7 +300,7 @@ attribute = "roleSubtree"; mBServer.setAttribute(roname, - new Attribute("roleSubtree", rform.getRolePattern())); + new Attribute("roleSubtree", new Boolean(rform.getSearch(; attribute = "roleBase"; mBServer.setAttribute(roname, 1.7 +1 -1 jakarta-tomcat-4.0/webapps/adm