You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2002/12/11 19:02:12 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque Torque.java
mpoeschl 2002/12/11 10:02:12
Modified: src/java/org/apache/torque Torque.java
Log:
remove deprecated methods
Revision Changes Path
1.74 +4 -56 jakarta-turbine-torque/src/java/org/apache/torque/Torque.java
Index: Torque.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/Torque.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- Torque.java 28 Nov 2002 18:52:02 -0000 1.73
+++ Torque.java 11 Dec 2002 18:02:12 -0000 1.74
@@ -103,8 +103,7 @@
Disposable
{
/**
- * Name of property that specifies the default
- * map builder and map.
+ * Name of property that specifies the default map builder and map.
*/
public static final String DATABASE_DEFAULT = "database.default";
@@ -130,7 +129,6 @@
*/
public static final String CACHE_KEY = "manager.useCache";
-
/**
* The db name that is specified as the default in the property file
*/
@@ -159,8 +157,8 @@
/**
* The logging category.
*/
- private static Category category =
- Category.getInstance(Torque.class.getName());
+ private static Category category
+ = Category.getInstance(Torque.class.getName());
/**
* Torque-specific configuration.
@@ -874,47 +872,6 @@
}
/**
- * This method returns a Connecton using the given parameters.
- *
- * @param name The database name.
- * @param username The name of the database user.
- * @param password The password of the database user.
- * @return A Connection.
- * @throws TorqueException Any exceptions caught during processing will be
- * rethrown wrapped into a TorqueException.
- *
- * @deprecated Database parameters should not be specified each
- * time a Connection is fetched from the service.
- */
- public static Connection getConnection(String name,
- String username,
- String password)
- throws TorqueException
- {
- Connection con = null;
- DataSourceFactory dsf = null;
- try
- {
- dsf = (DataSourceFactory) dsFactoryMap.get(name);
- con = dsf.getDataSource().getConnection(username, password);
- }
- catch (Exception e)
- {
- if (dsf == null && e instanceof NullPointerException)
- {
- throw new NullPointerException(
- "There was no DataSourceFactory "
- + "configured for the connection " + name);
- }
- else
- {
- throw new TorqueException(e);
- }
- }
- return con;
- }
-
- /**
*
* @param name The database name.
* @return a database connection
@@ -981,15 +938,6 @@
}
return defaultDBName;
- }
-
- /**
- * @return name of the default Map
- * @deprecated Use getDefaultDB() instead.
- */
- public static String getDefaultMap()
- {
- return getDefaultDB();
}
/**