leosutic 2002/06/30 05:04:47 Modified: microcontainer/src/java/org/apache/excalibur/microcontainer/util DataSourceFactory.java Log: Realized how useless that refactoring was. Revision Changes Path 1.4 +2 -18 jakarta-avalon-excalibur/microcontainer/src/java/org/apache/excalibur/microcontainer/util/DataSourceFactory.java Index: DataSourceFactory.java =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/microcontainer/src/java/org/apache/excalibur/microcontainer/util/DataSourceFactory.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- DataSourceFactory.java 30 Jun 2002 11:40:02 -0000 1.3 +++ DataSourceFactory.java 30 Jun 2002 12:04:47 -0000 1.4 @@ -72,9 +72,8 @@ } /** - * Creates a DataSourceComponent. + * Creates a JDBCDataSourceComponent. * - * @param componentClass The component class. * @param driver the database driver. * @param dbUrl the JDBC database url. * @param user the user name. @@ -89,7 +88,6 @@ * @param connectionClass the class to use for connections. Optional, may be null. */ public static DataSourceComponent getDataSource( - Class componentClass, String driver, String dbUrl, String user, String password, String keepAliveCommand, int poolMin, int poolMax, long timeout, @@ -127,21 +125,7 @@ controller.addChild( keepAlive ); config.addChild( controller ); - return (DataSourceComponent) new MicroContainer( componentClass ).configuration( config ).create(); - } - - /** - * Creates a JDBCDataSource. - */ - public static DataSourceComponent getDataSource( - String driver, String dbUrl, String user, - String password, String keepAliveCommand, - int poolMin, int poolMax, long timeout, - boolean autoCommit, boolean useOracle, - String connectionClass ) throws MicroContainerException - { - return getDataSource( JdbcDataSource.class, driver, dbUrl, user, password, keepAliveCommand, poolMin, poolMax, timeout, - autoCommit, useOracle, connectionClass ); + return (DataSourceComponent) new MicroContainer( JdbcDataSource.class ).configuration( config ).create(); } /**
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>