You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by am...@apache.org on 2002/08/17 00:24:07 UTC

cvs commit: jakarta-tomcat-4.0/webapps/admin/users group.jsp role.jsp user.jsp

amyroh      2002/08/16 15:24:07

  Modified:    webapps/admin build.xml
               webapps/admin/WEB-INF/classes/org/apache/webapp/admin
                        AttributeTag.java
               webapps/admin/users group.jsp role.jsp user.jsp
  Log:
  Fix for bugzilla 10458 - Editing a User causes a JavaScript error because the
  script is trying to focus on a hidden object - username is not guaranteed to be
  focusable because if your editing an existing user, the field is hidden. (non focusable object IE5+)
  
  Patch submitted by Andrew Conrad - andrewconrad@msn.com.
  
  Revision  Changes    Path
  1.4       +11 -1     jakarta-tomcat-4.0/webapps/admin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	17 Jan 2002 20:02:16 -0000	1.3
  +++ build.xml	16 Aug 2002 22:24:06 -0000	1.4
  @@ -22,6 +22,8 @@
       <pathelement location="${jmx.jar}"/>
       <pathelement location="${servlet.jar}"/>
       <pathelement location="${struts.jar}"/>
  +    <pathelement location="${commons-beanutils.jar}"/>
  +
     </path>
   
   
  @@ -30,7 +32,7 @@
   
       <!-- JDK flags -->
       <available property="jdk.1.2.present" classname="java.util.HashMap" />
  -    <available property="jdk.1.3.present" 
  +    <available property="jdk.1.3.present"
        classname="java.lang.reflect.Proxy" />
       <available property="jdk.1.4.present" classname="java.nio.Buffer" />
   
  @@ -59,12 +61,18 @@
       <available property="struts.present"
        classname="org.apache.struts.action.ActionForm"
        classpath="${struts.jar}" />
  +    <available property="beanutils.present"
  +     classname="org.apache.commons.beanutils.PropertyUtils"
  +     classpath="${common-beanutils.jar}" />
  +
   
       <!-- JAR files availability flags -->
       <available property="jmx.jar.present"   file="${jmx.jar}" />
       <available property="modeler.jar.present" file="${commons-modeler.jar}" />
       <available property="servlet.jar.present" file="${servlet.jar}" />
       <available property="struts.jar.present"  file="${struts.jar}" />
  +    <available property="beanutils.jar.present" file="${commons-beanutils.jar}" />
  +
   
       <!-- Conditional compilation flags (determined from the flags above) -->
       <condition property="compile.admin">
  @@ -125,6 +133,8 @@
       <echo message="modeler.jar.present=${modeler.jar.present}" />
       <echo message="servlet.jar.present=${servlet.jar.present}" />
       <echo message="struts.jar.present=${struts.jar.present}" />
  +    <echo message="beanutils.jar.present=${beanutils.jar.present}" />
  +
   
       <echo message="--- Optional JARs ---" />
   
  
  
  
  1.2       +5 -4      jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java
  
  Index: AttributeTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/AttributeTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AttributeTag.java	23 Jan 2002 23:06:54 -0000	1.1
  +++ AttributeTag.java	16 Aug 2002 22:24:06 -0000	1.2
  @@ -70,7 +70,8 @@
   import javax.servlet.jsp.JspWriter;
   import javax.servlet.jsp.PageContext;
   import javax.servlet.jsp.tagext.TagSupport;
  -import org.apache.struts.util.PropertyUtils;
  +import org.apache.commons.beanutils.PropertyUtils;
  +
   
   
   /**
  
  
  
  1.5       +1 -1      jakarta-tomcat-4.0/webapps/admin/users/group.jsp
  
  Index: group.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/group.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- group.jsp	24 Jul 2002 00:03:25 -0000	1.4
  +++ group.jsp	16 Aug 2002 22:24:07 -0000	1.5
  @@ -17,7 +17,7 @@
   
   <html:errors/>
   
  -<html:form method="POST" action="/users/saveGroup" focus="groupname">
  +<html:form method="POST" action="/users/saveGroup"> <!--focus="groupname"-->
   
     <html:hidden property="databaseName"/>
     <html:hidden property="objectName"/>
  
  
  
  1.5       +1 -1      jakarta-tomcat-4.0/webapps/admin/users/role.jsp
  
  Index: role.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/role.jsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- role.jsp	24 Jul 2002 00:03:25 -0000	1.4
  +++ role.jsp	16 Aug 2002 22:24:07 -0000	1.5
  @@ -17,7 +17,7 @@
   
   <html:errors/>
   
  -<html:form method="POST" action="/users/saveRole" focus="rolename">
  +<html:form method="POST" action="/users/saveRole"> <!--focus="rolename"-->
   
     <html:hidden property="databaseName"/>
     <html:hidden property="objectName"/>
  
  
  
  1.6       +1 -1      jakarta-tomcat-4.0/webapps/admin/users/user.jsp
  
  Index: user.jsp
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/admin/users/user.jsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- user.jsp	24 Jul 2002 00:03:25 -0000	1.5
  +++ user.jsp	16 Aug 2002 22:24:07 -0000	1.6
  @@ -17,7 +17,7 @@
   
   <html:errors/>
   
  -<html:form method="POST" action="/users/saveUser" focus="username">
  +<html:form method="POST" action="/users/saveUser"> <!--focus="username"-->
   
     <html:hidden property="databaseName"/>
     <html:hidden property="objectName"/>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>