Return-Path: Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 3994 invoked by uid 500); 4 Nov 2000 22:27:13 -0000 Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org Received: (qmail 3990 invoked by uid 1135); 4 Nov 2000 22:27:11 -0000 Date: 4 Nov 2000 22:27:11 -0000 Message-ID: <20001104222711.3988.qmail@locus.apache.org> From: remm@locus.apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/java package.html remm 00/11/04 14:27:09 Modified: catalina/src/share/org/apache/naming/factory TyrexDataSourceFactory.java TyrexTransactionFactory.java Added: catalina/src/share/org/apache/naming package.html catalina/src/share/org/apache/naming/factory package.html catalina/src/share/org/apache/naming/java package.html Log: - Added some JavaDoc documentation about configuring the Tyrex factories, as well as links to the Tyrex website. - Added some package.html files. Revision Changes Path 1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/package.html Index: package.html ===================================================================

This package contains a memory based naming service provider.

1.2 +40 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexDataSourceFactory.java Index: TyrexDataSourceFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexDataSourceFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TyrexDataSourceFactory.java 2000/11/04 06:46:09 1.1 +++ TyrexDataSourceFactory.java 2000/11/04 22:27:06 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexDataSourceFactory.java,v 1.1 2000/11/04 06:46:09 remm Exp $ - * $Revision: 1.1 $ - * $Date: 2000/11/04 06:46:09 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexDataSourceFactory.java,v 1.2 2000/11/04 22:27:06 remm Exp $ + * $Revision: 1.2 $ + * $Date: 2000/11/04 22:27:06 $ * * ==================================================================== * @@ -76,10 +76,31 @@ import tyrex.jdbc.xa.EnabledDataSource; /** - * Object factory for Tyrex DataSources. + * Object factory for Tyrex DataSources.
+ * Tyrex is an open-source transaction manager, developed by Assaf Arkin and + * exolab.org. See the Tyrex homepage + * for more details about Tyrex and downloads. + *

+ * This factory can produced either ServerDataSource objects (with integrated + * connection pooling) or EnabledDataSource objects. If the requested type is + * "tyrex.jdbc.ServerDataSource", a ServerDataSource will be instantiated. + * Be aware that some specific runtime permissions have to be set to be able + * to generate a ServerDataSource object (see the Tyrex documentation at the + * Tyrex website for more information). + *

+ * Definition of the following additional properties is recommended : + *

driverName : Name of the JDBC driver to use ( = connection URL)
driverClassName : Class name of the JDBC driver
user : User name. Can also be specified later when the Connection + * is retrieved.
password : Password. Can also be specified later when the Connection + * is retrieved.
loginTimeout : Optional. Login timeout.

* * @author Remy Maucherat - * @version $Revision: 1.1 $ $Date: 2000/11/04 06:46:09 $ + * @version $Revision: 1.2 $ $Date: 2000/11/04 22:27:06 $ */ public class TyrexDataSourceFactory @@ -104,7 +125,14 @@ public static final String DRIVER_NAME = "driverName"; public static final String DRIVER_CLASS_NAME = "driverClassName"; + // Default values + public static final String DEFAULT_DRIVER_NAME = "jdbc:HypersonicSQL:."; + public static final String DEFAULT_DRIVER_CLASS_NAME = + "org.hsql.jdbcDriver"; + public static final String DEFAULT_USER = "sa"; + public static final String DEFAULT_PASSWORD = ""; + // ----------------------------------------------------- Instance Variables @@ -150,20 +178,28 @@ currentRefAddr = ref.get(USER); if (currentRefAddr != null) { ds.setUser(currentRefAddr.getContent().toString()); + } else { + ds.setUser(DEFAULT_USER); } currentRefAddr = ref.get(PASSWORD); if (currentRefAddr != null) { ds.setPassword(currentRefAddr.getContent().toString()); + } else { + ds.setPassword(DEFAULT_PASSWORD); } currentRefAddr = ref.get(DRIVER_NAME); if (currentRefAddr != null) { ds.setDriverName (currentRefAddr.getContent().toString()); + } else { + ds.setDriverName(DEFAULT_DRIVER_NAME); } currentRefAddr = ref.get(DRIVER_CLASS_NAME); if (currentRefAddr != null) { ds.setDriverClassName (currentRefAddr.getContent().toString()); + } else { + ds.setDriverName(DEFAULT_DRIVER_CLASS_NAME); } if (ref.getClassName().equals 1.2 +7 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexTransactionFactory.java Index: TyrexTransactionFactory.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexTransactionFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TyrexTransactionFactory.java 2000/11/04 06:46:09 1.1 +++ TyrexTransactionFactory.java 2000/11/04 22:27:07 1.2 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexTransactionFactory.java,v 1.1 2000/11/04 06:46:09 remm Exp $ - * $Revision: 1.1 $ - * $Date: 2000/11/04 06:46:09 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/TyrexTransactionFactory.java,v 1.2 2000/11/04 22:27:07 remm Exp $ + * $Revision: 1.2 $ + * $Date: 2000/11/04 22:27:07 $ * * ==================================================================== * @@ -75,10 +75,13 @@ import tyrex.tm.Tyrex; /** - * Object factory for Tyrex User transactions. + * Object factory for Tyrex User transactions.
+ * Tyrex is an open-source transaction manager, developed by Assaf Arkin and + * exolab.org. See the Tyrex homepage + * for more details about Tyrex and downloads. * * @author Remy Maucherat - * @version $Revision: 1.1 $ $Date: 2000/11/04 06:46:09 $ + * @version $Revision: 1.2 $ $Date: 2000/11/04 22:27:07 $ */ public class TyrexTransactionFactory 1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/factory/package.html Index: package.html ===================================================================

This package contains object factories used by the naming service.

1.1 jakarta-tomcat-4.0/catalina/src/share/org/apache/naming/java/package.html Index: package.html ===================================================================

This package contains the URL context factory for the "java" namespace.