You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/12/30 18:42:08 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/adapter DBFactory.java
jmcnally 01/12/30 09:42:08
Modified: src/java/org/apache/torque/adapter Tag: JDBC2POOL_BRANCH
DBFactory.java
Log:
added some simple keys for the adapter map, as Drivers are not generally used
with jdbc2 and up.
Revision Changes Path
No revision
No revision
1.19.2.1 +26 -11 jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java
Index: DBFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBFactory.java,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -r1.19 -r1.19.2.1
--- DBFactory.java 14 Dec 2001 22:14:06 -0000 1.19
+++ DBFactory.java 30 Dec 2001 17:42:08 -0000 1.19.2.1
@@ -68,7 +68,7 @@
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
* @author <a href="mailto:ralf@reswi.ruhr.de">Ralf Stranzenbach</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: DBFactory.java,v 1.19 2001/12/14 22:14:06 brekke Exp $
+ * @version $Id: DBFactory.java,v 1.19.2.1 2001/12/30 17:42:08 jmcnally Exp $
*/
public class DBFactory
{
@@ -113,13 +113,12 @@
while (i.hasNext())
{
String key = (String) i.next();
-
- if (key.endsWith("driver"))
+ if (key.endsWith("driver") || key.endsWith("adapter"))
{
- String driver = configuration.getString(key);
+ String mapKey = configuration.getString(key);
Class adapterClass = null;
- String adapterClassName =
- (String) adapterPackage + "." + driverToAdapterMap.get(driver);
+ String adapterClassName = (String) adapterPackage + "." +
+ driverToAdapterMap.get(mapKey);
category.debug("Using " + adapterClassName);
@@ -132,9 +131,9 @@
category.error(e);
}
- if (adapterClass != null && driver != null)
+ if (adapterClass != null && mapKey != null)
{
- registerAdapter(driver, adapterClass);
+ registerAdapter(mapKey, adapterClass);
}
}
}
@@ -162,6 +161,22 @@
driverToAdapterMap.put("com.sybase.jdbc.SybDriver", "DBSybase");
driverToAdapterMap.put("com.sybase.jdbc2.jdbc.SybDriver", "DBSybase");
driverToAdapterMap.put("weblogic.jdbc.pool.Driver", "DBWeblogic");
+
+ // add some short names to be used when drivers are not used
+ driverToAdapterMap.put("as400", "DBDB2400");
+ driverToAdapterMap.put("db2app", "DBDB2App");
+ driverToAdapterMap.put("db2net", "DBDB2Net");
+ driverToAdapterMap.put("cloudscape", "DBCloudscape");
+ driverToAdapterMap.put("hypersonic", "DBHypersonicSQL");
+ driverToAdapterMap.put("interbase", "DBInterbase");
+ driverToAdapterMap.put("instantdb", "DBInstantDB");
+ driverToAdapterMap.put("mssql", "DBMSSQL");
+ driverToAdapterMap.put("mysql", "DBMM");
+ driverToAdapterMap.put("oracle", "DBOracle");
+ driverToAdapterMap.put("postgresql", "DBPostgres");
+ driverToAdapterMap.put("sapdb", "DBSapDB");
+ driverToAdapterMap.put("sybase", "DBSybase");
+ driverToAdapterMap.put("weblogic", "DBWeblogic");
}
/**
@@ -186,10 +201,10 @@
/**
* Creates a new instance of the Turbine database adapter associated
- * with the specified JDBC driver.
+ * with the specified JDBC driver or adapter key.
*
* @param driver The fully-qualified name of the JDBC driver to
- * create a new adapter instance for.
+ * create a new adapter instance for or a shorter form adapter key.
* @return An instance of a Turbine database adapter.
*/
public static DB create(String driver)
@@ -202,7 +217,7 @@
try
{
DB adapter = (DB) adapterClass.newInstance();
- adapter.setJDBCDriver(driver);
+ // adapter.setJDBCDriver(driver);
return adapter;
}
catch (IllegalAccessException e)
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>