remm 02/02/23 21:09:59
Modified: catalina/src/share/org/apache/naming/factory Constants.java
ResourceFactory.java
Log:
- Use the DBCP factory as the default factory for the java.sql.DataSource type.
Revision Changes Path
1.4 +6 -3
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Constants.java 8 Nov 2001 19:31:19 -0000 1.3
+++ Constants.java 24 Feb 2002 05:09:58 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
1.3 2001/11/08 19:31:19 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2001/11/08 19:31:19 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/Constants.java,v
1.4 2002/02/24 05:09:58 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/24 05:09:58 $
*
* ====================================================================
*
@@ -87,6 +87,9 @@
public static final String DEFAULT_EJB_FACTORY =
Package + ".EjbFactory";
+
+ public static final String DBCP_DATASOURCE_FACTORY =
+ Package + ".DbcpDataSourceFactory";
public static final String TYREX_DATASOURCE_FACTORY =
Package + ".TyrexDataSourceFactory";
1.7 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java
Index: ResourceFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResourceFactory.java 26 Dec 2001 02:15:43 -0000 1.6
+++ ResourceFactory.java 24 Feb 2002 05:09:58 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
1.6 2001/12/26 02:15:43 glenn Exp $
- * $Revision: 1.6 $
- * $Date: 2001/12/26 02:15:43 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
1.7 2002/02/24 05:09:58 remm Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/24 05:09:58 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Object factory for Resources.
*
* @author Remy Maucherat
- * @version $Revision: 1.6 $ $Date: 2001/12/26 02:15:43 $
+ * @version $Revision: 1.7 $ $Date: 2002/02/24 05:09:58 $
*/
public class ResourceFactory
@@ -152,7 +152,7 @@
if (ref.getClassName().equals("javax.sql.DataSource")) {
String javaxSqlDataSourceFactoryClassName =
System.getProperty("javax.sql.DataSource.Factory",
- Constants.TYREX_DATASOURCE_FACTORY);
+ Constants.DBCP_DATASOURCE_FACTORY);
try {
factory = (ObjectFactory)
Class.forName(javaxSqlDataSourceFactoryClassName)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
