Author: markt Date: Fri Nov 24 15:02:20 2006 New Revision: 479041 URL: http://svn.apache.org/viewvc?view=rev&rev=479041 Log: Code clean-up thanks to Eclipse for o.a.webapp.admin.users - remove unused code - removed unused imports - don't use deprecated methods No functional change
Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.java Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/BaseForm.java Fri Nov 24 15:02:20 2006 @@ -20,8 +20,6 @@ import javax.management.ObjectName; 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; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteGroupsAction.java Fri Nov 24 15:02:20 2006 @@ -20,29 +20,16 @@ import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; @@ -97,7 +84,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Has this transaction been cancelled? Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteRolesAction.java Fri Nov 24 15:02:20 2006 @@ -20,29 +20,16 @@ import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; @@ -97,7 +84,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Has this transaction been cancelled? Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/DeleteUsersAction.java Fri Nov 24 15:02:20 2006 @@ -20,29 +20,16 @@ import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; @@ -97,7 +84,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Has this transaction been cancelled? Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupForm.java Fri Nov 24 15:02:20 2006 @@ -20,10 +20,9 @@ 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.struts.action.ActionMessage; import org.apache.webapp.admin.ApplicationServlet; import org.apache.webapp.admin.TomcatTreeBuilder; @@ -144,28 +143,23 @@ ActionErrors errors = new ActionErrors(); - String submit = request.getParameter("submit"); - //if (submit != null) { - - // groupname is a required field - if ((groupname == null) || (groupname.length() < 1)) { - errors.add("groupname", - new ActionError("users.error.groupname.required")); - } - - // Quotes not allowed in groupname - if ((groupname != null) && (groupname.indexOf('"') >= 0)) { - errors.add("groupname", - new ActionError("users.error.quotes")); - } + // groupname is a required field + if ((groupname == null) || (groupname.length() < 1)) { + errors.add("groupname", + new ActionMessage("users.error.groupname.required")); + } - // Quotes not allowed in description - if ((description != null) && (description.indexOf('"') > 0)) { - errors.add("description", - new ActionError("users.error.quotes")); - } + // Quotes not allowed in groupname + if ((groupname != null) && (groupname.indexOf('"') >= 0)) { + errors.add("groupname", + new ActionMessage("users.error.quotes")); + } - //} + // Quotes not allowed in description + if ((description != null) && (description.indexOf('"') > 0)) { + errors.add("description", + new ActionMessage("users.error.quotes")); + } return (errors); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/GroupsForm.java Fri Nov 24 15:02:20 2006 @@ -19,9 +19,6 @@ 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; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListGroupsAction.java Fri Nov 24 15:02:20 2006 @@ -23,11 +23,9 @@ import java.net.URLDecoder; import java.util.Locale; import javax.management.MBeanServer; -import javax.management.ObjectName; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -94,7 +92,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Create a form bean containing the requested MBean Names Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListRolesAction.java Fri Nov 24 15:02:20 2006 @@ -23,11 +23,9 @@ import java.net.URLDecoder; import java.util.Locale; import javax.management.MBeanServer; -import javax.management.ObjectName; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -94,7 +92,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/ListUsersAction.java Fri Nov 24 15:02:20 2006 @@ -23,11 +23,9 @@ import java.net.URLDecoder; import java.util.Locale; import javax.management.MBeanServer; -import javax.management.ObjectName; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -94,7 +92,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RoleForm.java Fri Nov 24 15:02:20 2006 @@ -19,10 +19,9 @@ 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.struts.action.ActionMessage; /** @@ -103,28 +102,23 @@ ActionErrors errors = new ActionErrors(); - String submit = request.getParameter("submit"); - //if (submit != null) { - - // rolename is a required field - if ((rolename == null) || (rolename.length() < 1)) { - errors.add("rolename", - new ActionError("users.error.rolename.required")); - } - - // Quotes not allowed in rolename - if ((rolename != null) && (rolename.indexOf('"') >= 0)) { - errors.add("rolename", - new ActionError("users.error.quotes")); - } - - // Quotes not allowed in description - if ((description != null) && (description.indexOf('"') > 0)) { - errors.add("description", - new ActionError("users.error.quotes")); - } - - //} + // rolename is a required field + if ((rolename == null) || (rolename.length() < 1)) { + errors.add("rolename", + new ActionMessage("users.error.rolename.required")); + } + + // Quotes not allowed in rolename + if ((rolename != null) && (rolename.indexOf('"') >= 0)) { + errors.add("rolename", + new ActionMessage("users.error.quotes")); + } + + // Quotes not allowed in description + if ((description != null) && (description.indexOf('"') > 0)) { + errors.add("description", + new ActionMessage("users.error.quotes")); + } return (errors); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/RolesForm.java Fri Nov 24 15:02:20 2006 @@ -19,9 +19,6 @@ 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; Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveGroupAction.java Fri Nov 24 15:02:20 2006 @@ -21,29 +21,17 @@ import java.io.IOException; import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; import org.apache.webapp.admin.TomcatTreeBuilder; @@ -98,7 +86,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Has this transaction been cancelled? Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SaveRoleAction.java Fri Nov 24 15:02:20 2006 @@ -21,29 +21,17 @@ import java.io.IOException; import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.Iterator; import java.util.Locale; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import org.apache.struts.util.MessageResources; import org.apache.webapp.admin.ApplicationServlet; import org.apache.webapp.admin.TomcatTreeBuilder; @@ -98,7 +86,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Has this transaction been cancelled? Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpGroupAction.java Fri Nov 24 15:02:20 2006 @@ -21,25 +21,13 @@ import java.io.IOException; import java.net.URLDecoder; -import java.util.Iterator; import java.util.Locale; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -100,7 +88,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Set up a bean containing all possible roles Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpRoleAction.java Fri Nov 24 15:02:20 2006 @@ -21,25 +21,13 @@ import java.io.IOException; import java.net.URLDecoder; -import java.util.Iterator; import java.util.Locale; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -99,7 +87,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); String databaseName = URLDecoder.decode(request.getParameter("databaseName"),TomcatTreeBuilder.URL_ENCODING); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/SetUpUserAction.java Fri Nov 24 15:02:20 2006 @@ -21,25 +21,13 @@ import java.io.IOException; import java.net.URLDecoder; -import java.util.Iterator; import java.util.Locale; -import javax.management.Attribute; import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; -import javax.management.QueryExp; -import javax.management.Query; -import javax.management.ObjectInstance; import javax.management.ObjectName; -import javax.management.JMException; -import javax.management.MBeanAttributeInfo; -import javax.management.MBeanOperationInfo; -import javax.management.MBeanInfo; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -99,7 +87,6 @@ mserver = ((ApplicationServlet) getServlet()).getServer(); } MessageResources resources = getResources(request); - HttpSession session = request.getSession(); Locale locale = getLocale(request); // Set up beans containing all possible groups and roles Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UserForm.java Fri Nov 24 15:02:20 2006 @@ -21,10 +21,9 @@ 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.struts.action.ActionMessage; import org.apache.webapp.admin.ApplicationServlet; import org.apache.webapp.admin.TomcatTreeBuilder; @@ -178,40 +177,35 @@ ActionErrors errors = new ActionErrors(); - String submit = request.getParameter("submit"); - //if (submit != null) { - - // username is a required field - if ((username == null) || (username.length() < 1)) { - errors.add("username", - new ActionError("users.error.username.required")); - } - - // uassword is a required field - if ((password == null) || (username.length() < 1)) { - errors.add("password", - new ActionError("users.error.password.required")); - } + // username is a required field + if ((username == null) || (username.length() < 1)) { + errors.add("username", + new ActionMessage("users.error.username.required")); + } - // Quotes not allowed in username - if ((username != null) && (username.indexOf('"') >= 0)) { - errors.add("username", - new ActionError("users.error.quotes")); - } + // uassword is a required field + if ((password == null) || (username.length() < 1)) { + errors.add("password", + new ActionMessage("users.error.password.required")); + } - // Quotes not allowed in password - if ((password != null) && (password.indexOf('"') > 0)) { - errors.add("description", - new ActionError("users.error.quotes")); - } + // Quotes not allowed in username + if ((username != null) && (username.indexOf('"') >= 0)) { + errors.add("username", + new ActionMessage("users.error.quotes")); + } - // Quotes not allowed in fullName - if ((fullName != null) && (fullName.indexOf('"') > 0)) { - errors.add("fullName", - new ActionError("users.error.quotes")); - } + // Quotes not allowed in password + if ((password != null) && (password.indexOf('"') > 0)) { + errors.add("description", + new ActionMessage("users.error.quotes")); + } - //} + // Quotes not allowed in fullName + if ((fullName != null) && (fullName.indexOf('"') > 0)) { + errors.add("fullName", + new ActionMessage("users.error.quotes")); + } return (errors); Modified: tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.java URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.java?view=diff&rev=479041&r1=479040&r2=479041 ============================================================================== --- tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.java (original) +++ tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/users/UsersForm.java Fri Nov 24 15:02:20 2006 @@ -19,9 +19,6 @@ 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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]