jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql SetDataSourceTagSupport.java
Date Tue, 16 Apr 2002 18:15:40 GMT
luehe       02/04/16 11:15:40

  Modified:    standard/src/org/apache/taglibs/standard/tag/common/sql
                        SetDataSourceTagSupport.java
  Log:
  Removed references to SQL_DRIVER, SQL_URL, SQL_USER, and SQL_PASSWORD config settings
  
  Revision  Changes    Path
  1.4       +5 -39     jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
  
  Index: SetDataSourceTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SetDataSourceTagSupport.java	16 Apr 2002 17:23:14 -0000	1.3
  +++ SetDataSourceTagSupport.java	16 Apr 2002 18:15:40 -0000	1.4
  @@ -113,19 +113,18 @@
           else {
               ds = new DataSourceWrapper();
               try {
  -                String className = getDriverClassName();
                   // set driver class iff provided by the tag
  -                if (className != null) {
  -                    ds.setDriverClassName(getDriverClassName());
  +                if (driverClassName != null) {
  +                    ds.setDriverClassName(driverClassName);
                   }
               }
               catch (Exception e) {
                   throw new JspTagException(
                       Resources.getMessage("DRIVER_INVALID_CLASS", e.getMessage()));
               }
  -            ds.setJdbcURL(getJdbcURL());
  -            ds.setUserName(getUserName());
  -            ds.setPassword(getPassword());
  +            ds.setJdbcURL(jdbcURL);
  +            ds.setUserName(userName);
  +            ds.setPassword(password);
           }
   
           if (var != null) {
  @@ -136,37 +135,4 @@
           }
   	return SKIP_BODY;
       }
  -
  -
  -    //*********************************************************************
  -    // Private utility methods
  -
  -    private String getDriverClassName() {
  -	if (driverClassName != null) {
  -	    return driverClassName;
  -	}
  -	return (String) Config.find(pageContext, Config.SQL_DRIVER);
  -    }
  -
  -    private String getJdbcURL() {
  -	if (jdbcURL != null) {
  -	    return jdbcURL;
  -	}
  -	return (String) Config.find(pageContext, Config.SQL_URL);
  -    }
  -
  -    private String getUserName() {
  -	if (userName != null) {
  -	    return userName;
  -	}
  -	return (String) Config.find(pageContext, Config.SQL_USER);
  -    }
  -
  -    private String getPassword() {
  -	if (password != null) {
  -	    return password;
  -	}
  -	return (String) Config.find(pageContext, Config.SQL_PASSWORD);
  -    }
  -
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message