You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2005/03/17 01:21:19 UTC
cvs commit: jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users DeleteGroupsAction.java DeleteUsersAction.java
remm 2005/03/16 16:21:19
Modified: webapps/admin/users groups.jspf users.jspf
webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users
DeleteGroupsAction.java DeleteUsersAction.java
Log:
- 34033: fix quoting related bugs.
Revision Changes Path
1.7 +2 -2 jakarta-tomcat-catalina/webapps/admin/users/groups.jspf
Index: groups.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/groups.jspf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- groups.jspf 18 Oct 2004 06:37:56 -0000 1.6
+++ groups.jspf 17 Mar 2005 00:21:19 -0000 1.7
@@ -26,12 +26,12 @@
<td scope="row"><div align="center" class="table-normal-text">
<logic:present name="userForm">
<label for="groups"></label>
- <html:multibox property="groups" value="<%= group %>" styleId="groups"/>
+ <html:multibox property="groups" value='<%= group %>' styleId="groups"/>
</logic:present>
<logic:notPresent name="userForm">
<label for="groups"></label>
<input type="checkbox" name="groups"
- value="<%= group %>" styleId="groups">
+ value='<%= group %>' styleId="groups">
</logic:notPresent>
</td>
</logic:present>
1.5 +1 -1 jakarta-tomcat-catalina/webapps/admin/users/users.jspf
Index: users.jspf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/users/users.jspf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- users.jspf 18 Oct 2004 06:37:56 -0000 1.4
+++ users.jspf 17 Mar 2005 00:21:19 -0000 1.5
@@ -25,7 +25,7 @@
<td scope="row"><div align="center" class="table-normal-text">
<label for="users"></label>
<input type="checkbox" name="users"
- value="<%= user %>" styleId="users">
+ value='<%= user %>' styleId="users">
</td>
</logic:present>
<td scope="row"><div align="left" class="table-normal-text">
1.5 +2 -2 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java
Index: DeleteGroupsAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteGroupsAction.java 18 Oct 2004 06:37:55 -0000 1.4
+++ DeleteGroupsAction.java 17 Mar 2005 00:21:19 -0000 1.5
@@ -130,7 +130,7 @@
for (int i = 0; i < groups.length; i++) {
ObjectName oname = new ObjectName(groups[i]);
- params[0] = oname.getKeyProperty("groupname");
+ params[0] = ObjectName.unquote(oname.getKeyProperty("groupname"));
mserver.invoke(dname, "removeGroup",
params, signature);
}
1.5 +2 -2 jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java
Index: DeleteUsersAction.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DeleteUsersAction.java 18 Oct 2004 06:37:55 -0000 1.4
+++ DeleteUsersAction.java 17 Mar 2005 00:21:19 -0000 1.5
@@ -130,7 +130,7 @@
for (int i = 0; i < users.length; i++) {
ObjectName oname = new ObjectName(users[i]);
- params[0] = oname.getKeyProperty("username");
+ params[0] = ObjectName.unquote(oname.getKeyProperty("username"));
mserver.invoke(dname, "removeUser",
params, signature);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org