amyroh 2004/03/09 13:49:37 Modified: webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users GroupForm.java UserForm.java Log: Port fix for 24085 from TC 5. Revision Changes Path 1.4 +27 -5 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java Index: GroupForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- GroupForm.java 8 Mar 2004 16:51:51 -0000 1.3 +++ GroupForm.java 9 Mar 2004 21:49:36 -0000 1.4 @@ -61,12 +61,14 @@ package org.apache.webapp.admin.users; - +import java.net.URLDecoder; +import javax.management.MBeanServer; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; +import org.apache.webapp.admin.ApplicationServlet; /** @@ -82,6 +84,10 @@ // ----------------------------------------------------- Instance Variables + /** + * The MBeanServer we will be interacting with. + */ + private MBeanServer mserver = null; // ------------------------------------------------------------- Properties @@ -163,6 +169,22 @@ public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { + try { + // Look up the components we will be using as needed + if (mserver == null) { + mserver = ((ApplicationServlet) getServlet()).getServer(); + } + + // Set up beans containing all possible groups and roles + String databaseName = + URLDecoder.decode(request.getParameter("databaseName")); + request.setAttribute("rolesForm", + UserUtils.getRolesForm(mserver, + databaseName)); + } catch (Exception e) { + // do nothing since the form returns validation error + } + ActionErrors errors = new ActionErrors(); String submit = request.getParameter("submit"); 1.4 +30 -4 jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java Index: UserForm.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- UserForm.java 8 Mar 2004 16:51:51 -0000 1.3 +++ UserForm.java 9 Mar 2004 21:49:36 -0000 1.4 @@ -62,11 +62,14 @@ package org.apache.webapp.admin.users; +import java.net.URLDecoder; +import javax.management.MBeanServer; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionError; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; +import org.apache.webapp.admin.ApplicationServlet; /** @@ -82,6 +85,10 @@ // ----------------------------------------------------- Instance Variables + /** + * The MBeanServer we will be interacting with. + */ + private MBeanServer mserver = null; // ------------------------------------------------------------- Properties @@ -194,6 +201,25 @@ */ public ActionErrors validate(ActionMapping mapping, HttpServletRequest request) { + + try { + // Look up the components we will be using as needed + if (mserver == null) { + mserver = ((ApplicationServlet) getServlet()).getServer(); + } + + // Set up beans containing all possible groups and roles + String databaseName = + URLDecoder.decode(request.getParameter("databaseName")); + request.setAttribute("groupsForm", + UserUtils.getGroupsForm(mserver, + databaseName)); + request.setAttribute("rolesForm", + UserUtils.getRolesForm(mserver, + databaseName)); + } catch (Exception e) { + // do nothing since the form returns validation error + } ActionErrors errors = new ActionErrors();
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]