You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ho...@apache.org on 2002/01/17 00:03:23 UTC

cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/sql DriverTag.java

horwat      02/01/16 15:03:23

  Modified:    standard/conf sql-rt.tld sql.tld
               standard/doc/web DB_FunctionalDescription_1_EA3.html
                        Overview.html
               standard/src/org/apache/taglibs/standard/tag/el/sql
                        DriverTag.java
               standard/src/org/apache/taglibs/standard/tag/rt/sql
                        DriverTag.java
  Log:
  Change user attribute in <sql:driver> from "userName" to "user"
  
  Revision  Changes    Path
  1.6       +1 -1      jakarta-taglibs/standard/conf/sql-rt.tld
  
  Index: sql-rt.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/sql-rt.tld,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sql-rt.tld	16 Jan 2002 02:22:19 -0000	1.5
  +++ sql-rt.tld	16 Jan 2002 23:03:22 -0000	1.6
  @@ -146,7 +146,7 @@
           <rtexprvalue>true</rtexprvalue>
       </attribute>
       <attribute>
  -        <name>userName</name>
  +        <name>user</name>
           <required>false</required>
           <rtexprvalue>true</rtexprvalue>
       </attribute>
  
  
  
  1.7       +2 -2      jakarta-taglibs/standard/conf/sql.tld
  
  Index: sql.tld
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/conf/sql.tld,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sql.tld	16 Jan 2002 02:22:19 -0000	1.6
  +++ sql.tld	16 Jan 2002 23:03:22 -0000	1.7
  @@ -27,7 +27,7 @@
           param:value
           driver:driver
           driver:url
  -        driver:userName
  +        driver:user
           </param-value>
           <description>
               Whitespace-separated list of colon-separated token pairs
  @@ -180,7 +180,7 @@
           <rtexprvalue>false</rtexprvalue>
       </attribute>
       <attribute>
  -        <name>userName</name>
  +        <name>user</name>
           <required>false</required>
           <rtexprvalue>false</rtexprvalue>
       </attribute>
  
  
  
  1.7       +2 -2      jakarta-taglibs/standard/doc/web/DB_FunctionalDescription_1_EA3.html
  
  Index: DB_FunctionalDescription_1_EA3.html
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/doc/web/DB_FunctionalDescription_1_EA3.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DB_FunctionalDescription_1_EA3.html	16 Jan 2002 02:22:19 -0000	1.6
  +++ DB_FunctionalDescription_1_EA3.html	16 Jan 2002 23:03:22 -0000	1.7
  @@ -342,7 +342,7 @@
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[driver=&quot;<i>driverClassName</i>&quot;] 
     <br>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[url=&quot;<i>url</i>&quot;]<br>
  -  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[user=&quot;<i>userName</i>&quot;] 
  +  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[user=&quot;<i>user</i>&quot;] 
     /&gt;</code></p>
   <h4>Details<br>
   </h4>
  @@ -598,7 +598,7 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[driver=&quot;<i>driverClassName</i>&quot;] 
           <br>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[url=&quot;<i>url</i>&quot;]<br>
  -        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[userName=&quot;<i>userName</i>&quot;] 
  +        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[user=&quot;<i>user</i>&quot;] 
           /&gt;</code><br>
         </p>
         <p>Facilitates the setup of a DataSource object around a JDBC driver for 
  
  
  
  1.6       +1 -1      jakarta-taglibs/standard/doc/web/Overview.html
  
  Index: Overview.html
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/doc/web/Overview.html,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Overview.html	16 Jan 2002 02:22:19 -0000	1.5
  +++ Overview.html	16 Jan 2002 23:03:22 -0000	1.6
  @@ -752,7 +752,7 @@
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[driver=&quot;<i>driverClassName</i>&quot;] 
           <br>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[url=&quot;<i>url</i>&quot;]<br>
  -        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[userName=&quot;<i>userName</i>&quot;] 
  +        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[user=&quot;<i>user</i>&quot;] 
           /&gt;</code><br>
         </p>
         <p>Facilitates the setup of a DataSource object around a JDBC driver for 
  
  
  
  1.3       +3 -3      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/sql/DriverTag.java
  
  Index: DriverTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/el/sql/DriverTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DriverTag.java	16 Jan 2002 02:22:20 -0000	1.2
  +++ DriverTag.java	16 Jan 2002 23:03:22 -0000	1.3
  @@ -81,7 +81,7 @@
   	this.jdbcURLEL = jdbcURLEL;
       }
   
  -    public void setUserName(String userNameEL) {
  +    public void setUser(String userNameEL) {
   	this.userNameEL = userNameEL;
       }
   
  @@ -107,12 +107,12 @@
   
           if (jdbcURLEL != null) {
                   jdbcURL = (String) ExpressionEvaluatorManager.evaluate
  -                ("Url", jdbcURLEL, String.class, this, pageContext);
  +                ("url", jdbcURLEL, String.class, this, pageContext);
           }
   
           if (userNameEL != null) {
                   userName = (String) ExpressionEvaluatorManager.evaluate
  -                ("userName", userNameEL, String.class, this, pageContext);
  +                ("user", userNameEL, String.class, this, pageContext);
           }
       }
   
  
  
  
  1.2       +2 -2      jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/sql/DriverTag.java
  
  Index: DriverTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/rt/sql/DriverTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DriverTag.java	12 Dec 2001 22:13:10 -0000	1.1
  +++ DriverTag.java	16 Jan 2002 23:03:23 -0000	1.2
  @@ -71,11 +71,11 @@
   	this.driverClassName = driverClassName;
       }
   
  -    public void setJdbcURL(String jdbcURL) {
  +    public void setUrl(String jdbcURL) {
   	this.jdbcURL = jdbcURL;
       }
   
  -    public void setUserName(String userName) {
  +    public void setUser(String userName) {
   	this.userName = userName;
       }
   
  
  
  

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