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 Changes Path
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 -0000 1.6
+++ EditRealmAction.java 30 May 2002 17:22:04 -0000 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 </em> 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 -0000 1.3
+++ SaveJNDIRealmAction.java 30 May 2002 17:22:04 -0000 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 @@
* <em>Edit Realm</em> 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/admin/realm/jndiRealm.jsp
Index: jndiRealm.jsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/realm/jndiRealm.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jndiRealm.jsp 21 May 2002 00:36:43 -0000 1.6
+++ jndiRealm.jsp 30 May 2002 17:22:04 -0000 1.7
@@ -42,7 +42,7 @@
<controls:action selected="true"> ----<bean:message
key="actions.available.actions"/>---- </controls:action>
<controls:action> --------------------------------- </controls:action>
<logic:notEqual name="jndiRealmForm" property="adminAction"
value="Create">
- <logic:notEqual name="userDatabaseRealmForm"
property="allowDeletion" value="false">
+ <logic:notEqual name="jndiRealmForm" property="allowDeletion"
value="false">
<controls:action url='<%= "/DeleteRealm.do?select=" +
URLEncoder.encode(thisObjectName) %>'>
<bean:message key="actions.realms.delete"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
