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 Changes Path
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.properties 30 May 2002 06:23:08 -0000 1.59
+++ ApplicationResources_en.properties 30 May 2002 18:30:35 -0000 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.properties 30 May 2002 06:23:08 -0000 1.50
+++ ApplicationResources_es.properties 30 May 2002 18:30:35 -0000 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 -0000 1.1
+++ AddRealmAction.java 30 May 2002 18:30:35 -0000 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 <code>Action</code> that sets up <em>Add Realm</em> 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
--- EditRealmAction.java 30 May 2002 17:22:04 -0000 1.7
+++ EditRealmAction.java 30 May 2002 18:30:35 -0000 1.8
@@ -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.7 2002/05/30 17:22:04 manveen Exp $
- * $Revision: 1.7 $
- * $Date: 2002/05/30 17:22:04 $
+ * $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 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* Realm </em> transactions, based on the type of Realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.7 $ $Date: 2002/05/30 17:22:04 $
+ * @version $Revision: 1.8 $ $Date: 2002/05/30 18:30:35 $
*/
public class EditRealmAction extends Action {
@@ -383,8 +383,11 @@
attribute = "digest";
realmFm.setDigest
((String) mBServer.getAttribute(rname, attribute));
+ attribute = "userSubtree";
+ realmFm.setUserSubtree
+ (((Boolean) mBServer.getAttribute(rname,
attribute)).toString());
attribute = "roleSubtree";
- realmFm.setSearch
+ realmFm.setRoleSubtree
(((Boolean) mBServer.getAttribute(rname,
attribute)).toString());
attribute = "roleName";
realmFm.setRoleAttribute
1.6 +42 -16
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JNDIRealmForm.java 3 May 2002 18:34:14 -0000 1.5
+++ JNDIRealmForm.java 30 May 2002 18:30:35 -0000 1.6
@@ -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.5 2002/05/03 18:34:14 manveen Exp $
- * $Revision: 1.5 $
- * $Date: 2002/05/03 18:34:14 $
+ * $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 $
*
* ====================================================================
*
@@ -76,7 +76,7 @@
* Form bean for the JNDI realm page.
*
* @author Manveen Kaur
- * @version $Revision: 1.5 $ $Date: 2002/05/03 18:34:14 $
+ * @version $Revision: 1.6 $ $Date: 2002/05/30 18:30:35 $
*/
public final class JNDIRealmForm extends RealmForm {
@@ -84,9 +84,14 @@
// ----------------------------------------------------- Instance Variables
/**
- * The text for the search subtree.
+ * Should we search the entire subtree for matching roles?
*/
- private String search = "false";
+ private String roleSubtree = "false";
+
+ /**
+ * Should we search the entire subtree for matching users?
+ */
+ private String userSubtree = "false";
/**
* The text for the digest algorithm.
@@ -165,24 +170,42 @@
}
/**
- * Return the search boolean Text.
+ * Return the roleSubtree boolean Text.
*/
- public String getSearch() {
+ public String getRoleSubtree() {
- return this.search;
+ return this.roleSubtree;
}
/**
- * Set the search Text.
+ * Set the roleSubtree Text.
+ */
+ public void setRoleSubtree(String roleSubtree) {
+
+ this.roleSubtree = roleSubtree;
+
+ }
+
+ /**
+ * Return the userSubtree boolean Text.
*/
- public void setSearch(String search) {
+ public String getUserSubtree() {
- this.search = search;
+ return this.userSubtree;
}
/**
+ * Set the userSubtree Text.
+ */
+ public void setUserSubtree(String userSubtree) {
+
+ this.userSubtree = userSubtree;
+
+ }
+
+ /**
* Return the digest.
*/
public String getDigest() {
@@ -376,7 +399,8 @@
public void reset(ActionMapping mapping, HttpServletRequest request) {
super.reset(mapping, request);
- this.search="false";
+ this.roleSubtree="false";
+ this.userSubtree="false";
this.digest = null;
this.roleAttribute = null;
@@ -392,7 +416,7 @@
this.contextFactory = null;
}
- /**
+ /**
* Render this object as a String.
*/
public String toString() {
@@ -401,8 +425,10 @@
sb.append(getAdminAction());
sb.append(",debugLvl=");
sb.append(getDebugLvl());
- sb.append(",search=");
- sb.append(search);
+ sb.append(",userSubtree=");
+ sb.append(userSubtree);
+ sb.append(",roleSubtree=");
+ sb.append(roleSubtree);
sb.append(",digest=");
sb.append(digest);
sb.append("',roleAttribute='");
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SaveJNDIRealmAction.java 30 May 2002 17:22:04 -0000 1.4
+++ SaveJNDIRealmAction.java 30 May 2002 18:30:35 -0000 1.5
@@ -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.4 2002/05/30 17:22:04 manveen Exp $
- * $Revision: 1.4 $
- * $Date: 2002/05/30 17:22:04 $
+ * $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 $
*
* ====================================================================
*
@@ -96,7 +96,7 @@
* <em>Edit Realm</em> transactions for JNDI realm.
*
* @author Manveen Kaur
- * @version $Revision: 1.4 $ $Date: 2002/05/30 17:22:04 $
+ * @version $Revision: 1.5 $ $Date: 2002/05/30 18:30:35 $
*/
public final class SaveJNDIRealmAction extends Action {
@@ -298,9 +298,13 @@
mBServer.setAttribute(roname,
new Attribute("contextFactory",
rform.getContextFactory()));
+ attribute = "userSubtree";
+ mBServer.setAttribute(roname,
+ new Attribute("userSubtree", new
Boolean(rform.getUserSubtree())));
+
attribute = "roleSubtree";
mBServer.setAttribute(roname,
- new Attribute("roleSubtree", new
Boolean(rform.getSearch())));
+ new Attribute("roleSubtree", new
Boolean(rform.getRoleSubtree())));
attribute = "roleBase";
mBServer.setAttribute(roname,
1.8 +13 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jndiRealm.jsp 30 May 2002 17:22:04 -0000 1.7
+++ jndiRealm.jsp 30 May 2002 18:30:36 -0000 1.8
@@ -150,9 +150,20 @@
</controls:row>
<controls:row labelStyle="table-label-text" dataStyle="table-normal-text">
- <controls:label><bean:message key="realm.search"/>:</controls:label>
+ <controls:label><bean:message
key="realm.role.subtree"/>:</controls:label>
<controls:data>
- <html:select property="search">
+ <html:select property="roleSubtree">
+ <bean:define id="searchVals" name="jndiRealmForm"
property="searchVals"/>
+ <html:options collection="searchVals" property="value"
+ 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.subtree"/>:</controls:label>
+ <controls:data>
+ <html:select property="userSubtree">
<bean:define id="searchVals" name="jndiRealmForm"
property="searchVals"/>
<html:options collection="searchVals" property="value"
labelProperty="label"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
