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 Changes Path
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.properties 30 May 2002 18:30:35 -0000 1.60
+++ ApplicationResources_en.properties 30 May 2002 19:42:22 -0000 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=<li>Database password is required.</li>
error.connectionURL.required=<li>Database URL is required.</li>
error.connectionName.required=<li>Database username is required.</li>
-error.roleAttribute.required=<li>Role name attribute is required.</li>
+error.roleName.required=<li>Role name is required.</li>
+error.userRoleName.required=<li>User Role name is required.</li>
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>
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.properties 30 May 2002 18:30:35 -0000 1.51
+++ ApplicationResources_es.properties 30 May 2002 19:42:23 -0000 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=<li>Se requiere la palabra de paso de la base de
datos.</li>
error.connectionURL.required=<li>Se requiere el URL de la base de datos.</li>
error.connectionName.required=<li>Se requiere el username de la base de datos.</li>
-error.roleAttribute.required=<li>Se requiere el atributo del nombre del role.</li>
+error.roleName.required=<li>Role name attribute requiredo.</li>
+error.userRoleName.required=<li>User Role name attribute requiredo.</li>
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>
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 -0000 1.2
+++ AddRealmAction.java 30 May 2002 19:42:23 -0000 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 <code>Action</code> that sets up <em>Add Realm</em> transactions.
*
* @author Manveen Kaur
- * @version $Revision: 1.2 $ $Date: 2002/05/30 18:30:35 $
+ * @version $Revision: 1.3 $ $Date: 2002/05/30 19:42:23 $
*/
public class AddRealmAction extends Action {
@@ -198,7 +198,8 @@
realmFm.setUserSubtree("false");
realmFm.setRoleSubtree("false");
realmFm.setRolePattern("");
- realmFm.setRoleAttribute("");
+ realmFm.setUserRoleName("");
+ realmFm.setRoleName("");
realmFm.setRoleBase("");
realmFm.setContextFactory("");
realmFm.setUserPattern("");
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- EditRealmAction.java 30 May 2002 18:30:35 -0000 1.8
+++ EditRealmAction.java 30 May 2002 19:42:23 -0000 1.9
@@ -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.8 2002/05/30 18:30:35 manveen Exp $
- * $Revision: 1.8 $
- * $Date: 2002/05/30 18:30:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/EditRealmAction.java,v
1.9 2002/05/30 19:42:23 manveen Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/05/30 19:42:23 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* Realm </em> transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.8 $ $Date: 2002/05/30 18:30:35 $
+ * @version $Revision: 1.9 $ $Date: 2002/05/30 19:42:23 $
*/
public class EditRealmAction extends Action {
@@ -389,8 +389,11 @@
attribute = "roleSubtree";
realmFm.setRoleSubtree
(((Boolean) mBServer.getAttribute(rname,
attribute)).toString());
+ attribute = "userRoleName";
+ realmFm.setUserRoleName
+ ((String) mBServer.getAttribute(rname, attribute));
attribute = "roleName";
- realmFm.setRoleAttribute
+ realmFm.setRoleName
((String) mBServer.getAttribute(rname, attribute));
attribute = "roleBase";
realmFm.setRoleBase
1.7 +49 -18
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JNDIRealmForm.java 30 May 2002 18:30:35 -0000 1.6
+++ JNDIRealmForm.java 30 May 2002 19:42:23 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
1.6 2002/05/30 18:30:35 manveen Exp $
- * $Revision: 1.6 $
- * $Date: 2002/05/30 18:30:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/JNDIRealmForm.java,v
1.7 2002/05/30 19:42:23 manveen Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/30 19:42:23 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the JNDI realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.6 $ $Date: 2002/05/30 18:30:35 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/30 19:42:23 $
*/
public final class JNDIRealmForm extends RealmForm {
@@ -104,9 +104,14 @@
private String roleBase = null;
/**
- * The text for the role Attribute.
+ * The text for the user role name.
*/
- private String roleAttribute = null;
+ private String userRoleName = null;
+
+ /**
+ * The text for the role name.
+ */
+ private String roleName = null;
/**
* The text for the role Pattern.
@@ -242,20 +247,38 @@
}
/**
- * Return the role Attribute .
+ * Return the role name.
+ */
+ public String getRoleName() {
+
+ return this.roleName ;
+
+ }
+
+ /**
+ * Set the role name Attribute .
+ */
+ public void setRoleName(String roleName) {
+
+ this.roleName = roleName ;
+
+ }
+
+ /**
+ * Return the user role name.
*/
- public String getRoleAttribute() {
+ public String getUserRoleName() {
- return this.roleAttribute ;
+ return this.userRoleName ;
}
/**
- * Set the role Attribute .
+ * Set the user role name Attribute .
*/
- public void setRoleAttribute(String roleAttribute ) {
+ public void setUserRoleName(String userRoleName) {
- this.roleAttribute = roleAttribute ;
+ this.userRoleName = userRoleName ;
}
@@ -403,7 +426,8 @@
this.userSubtree="false";
this.digest = null;
- this.roleAttribute = null;
+ this.roleName = null;
+ this.userRoleName = null;
this.connectionName = null;
this.connectionPassword = null;
@@ -431,8 +455,10 @@
sb.append(roleSubtree);
sb.append(",digest=");
sb.append(digest);
- sb.append("',roleAttribute='");
- sb.append(roleAttribute);
+ sb.append("',userRoleName='");
+ sb.append(userRoleName);
+ sb.append("',roleName='");
+ sb.append(roleName);
sb.append("',connectionName=");
sb.append(connectionName);
sb.append(",connectionPassword=");
@@ -485,11 +511,16 @@
new ActionError("error.digest.required"));
}
- if ((roleAttribute == null) || (roleAttribute.length() < 1)) {
- errors.add("roleAttribute",
- new ActionError("error.roleAttribute.required"));
+ if ((roleName == null) || (roleName.length() < 1)) {
+ errors.add("roleName",
+ new ActionError("error.roleName.required"));
}
+ if ((userRoleName == null) || (userRoleName.length() < 1)) {
+ errors.add("userRoleName",
+ new ActionError("error.userRoleName.required"));
+ }
+
if ((rolePattern == null) || (rolePattern.length() < 1)) {
errors.add("rolePattern",
new ActionError("error.rolePattern.required"));
1.6 +9 -5
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SaveJNDIRealmAction.java 30 May 2002 18:30:35 -0000 1.5
+++ SaveJNDIRealmAction.java 30 May 2002 19:42:23 -0000 1.6
@@ -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.5 2002/05/30 18:30:35 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/30 18:30:35 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/realm/SaveJNDIRealmAction.java,v
1.6 2002/05/30 19:42:23 manveen Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/05/30 19:42:23 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for JNDI realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/05/30 18:30:35 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/30 19:42:23 $
*/
public final class SaveJNDIRealmAction extends Action {
@@ -292,7 +292,11 @@
attribute = "roleName";
mBServer.setAttribute(roname,
- new Attribute("roleName",
rform.getRoleAttribute()));
+ new Attribute("roleName", rform.getRoleName()));
+
+ attribute = "userRoleName";
+ mBServer.setAttribute(roname,
+ new Attribute("userRoleName",
rform.getUserRoleName()));
attribute = "contextFactory";
mBServer.setAttribute(roname,
1.9 +9 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jndiRealm.jsp 30 May 2002 18:30:36 -0000 1.8
+++ jndiRealm.jsp 30 May 2002 19:42:23 -0000 1.9
@@ -136,9 +136,9 @@
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
- <controls:label><bean:message key="realm.Attribute"/>:</controls:label>
+ <controls:label><bean:message key="realm.roleName"/>:</controls:label>
<controls:data>
- <html:text property="roleAttribute" size="30"/>
+ <html:text property="roleName" size="30"/>
</controls:data>
</controls:row>
@@ -158,6 +158,13 @@
labelProperty="label"/>
</html:select>
</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"/>
+ </controls:data>
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
