/*
 * Copyright 1999-2004 The Apache Software Foundation.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *      http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.commons.dbcp;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;

/**
 * A {@link DriverManager}-based implementation of {@link ConnectionFactory}.
 *
 * @author Rodney Waldhoff
 * @author Ignacio J. Ortega
 * @version $Revision: 1.9 $ $Date: 2004/06/24 18:32:53 $
 */
public class DriverManagerConnectionFactory implements ConnectionFactory {

    public DriverManagerConnectionFactory(String connectUri, Properties props) {
        _connectUri = connectUri;
        _props = props;
    }

    public DriverManagerConnectionFactory(String connectUri, String uname, String passwd) {
        _connectUri = connectUri;
        _uname = uname;
        _passwd = passwd;
    }

    public Connection createConnection() throws SQLException {
        if(null == _props) {
            if((_uname == null) && (_passwd == null)) {
                return DriverManager.getConnection(_connectUri);
            } else {
                return DriverManager.getConnection(_connectUri,_uname,_passwd);
            }
        } else {
            return DriverManager.getConnection(_connectUri,_props);
        }
    }

    protected String _connectUri = null;
    protected String _uname = null;
    protected String _passwd = null;
    protected Properties _props = null;
}

@@ -911,16 +911,41 @@
  Ortega%0A
+ * @author Dirk Verbeeck%0A
  * @vers
@@ -961,17 +961,18 @@
 sion: 1.
-9
+10
  $ $Date
@@ -983,21 +983,21 @@
 04/0
-6
+7
 /24 
-18:32:53
+22:42:39
  $%0A 
@@ -1083,149 +1083,771 @@
     
-public DriverManagerConnectionFactory(String connectUri, Properties props) %7B%0A        _connectUri = connectUri;%0A        _props = props;%0A    %7D%0A
+/**%0A     * Constructor for DriverManagerConnectionFactory.%0A     * @param connectUri a database url of the form %0A     * %3Ccode%3E jdbc:%3Cem%3Esubprotocol%3C/em%3E:%3Cem%3Esubname%3C/em%3E%3C/code%3E%0A     * @param props a list of arbitrary string tag/value pairs as%0A     * connection arguments; normally at least a %22user%22 and %22password%22 %0A     * property should be included.%0A     */%0A    public DriverManagerConnectionFactory(String connectUri, Properties props) %7B%0A        _connectUri = connectUri;%0A        _props = props;%0A    %7D%0A%0A    /**%0A     * Constructor for DriverManagerConnectionFactory.%0A     * @param url a database url of the form %0A     * %3Ccode%3Ejdbc:%3Cem%3Esubprotocol%3C/em%3E:%3Cem%3Esubname%3C/em%3E%3C/code%3E%0A     * @param user the database user%0A     * @param password the user's password%0A     */
 %0A   

add some javadoc