stephenh 2002/09/10 20:37:15
Modified: src/conf Torque.properties
Log:
Made change from default to project to disambiguate how the configuration works.
Suggested by Kelvin Tan <[EMAIL PROTECTED]>.
Revision Changes Path
1.6 +37 -37 jakarta-turbine-torque/src/conf/Torque.properties
Index: Torque.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/Torque.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Torque.properties 7 Aug 2002 08:07:01 -0000 1.5
+++ Torque.properties 11 Sep 2002 03:37:15 -0000 1.6
@@ -43,52 +43,52 @@
# -------------------------------------------------------------------
torque.database.default=default
-torque.database.default.adapter=mysql
+torque.database.project.adapter=mysql
## Using torque's old pool
-#torque.dsfactory.default.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
-#torque.dsfactory.default.pool.defaultMaxConnections=10
-#torque.dsfactory.default.pool.maxExpiryTime=3600
-#torque.dsfactory.default.pool.connectionWaitTimeout=10
-#torque.dsfactory.default.connection.driver = org.gjt.mm.mysql.Driver
-#torque.dsfactory.default.connection.url = jdbc:mysql://localhost:3306/torque
-#torque.dsfactory.default.connection.user = user
-#torque.dsfactory.default.connection.password = password
+#torque.dsfactory.project.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
+#torque.dsfactory.project.pool.defaultMaxConnections=10
+#torque.dsfactory.project.pool.maxExpiryTime=3600
+#torque.dsfactory.project.pool.connectionWaitTimeout=10
+#torque.dsfactory.project.connection.driver = org.gjt.mm.mysql.Driver
+#torque.dsfactory.project.connection.url = jdbc:mysql://localhost:3306/torque
+#torque.dsfactory.project.connection.user = user
+#torque.dsfactory.project.connection.password = password
## Using Jdbc2Pool
-torque.dsfactory.default.factory=\
+torque.dsfactory.project.factory=\
org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
-torque.dsfactory.default.pool.defaultMaxActive=10
-torque.dsfactory.default.pool.testOnBorrow=true
-torque.dsfactory.default.pool.validationQuery=SELECT 1
-torque.dsfactory.default.connection.driver = org.gjt.mm.mysql.Driver
-torque.dsfactory.default.connection.url = jdbc:mysql://localhost:3306/torque
-torque.dsfactory.default.connection.user = user
-torque.dsfactory.default.connection.password = password
+torque.dsfactory.project.pool.defaultMaxActive=10
+torque.dsfactory.project.pool.testOnBorrow=true
+torque.dsfactory.project.pool.validationQuery=SELECT 1
+torque.dsfactory.project.connection.driver = org.gjt.mm.mysql.Driver
+torque.dsfactory.project.connection.url = jdbc:mysql://localhost:3306/torque
+torque.dsfactory.project.connection.user = user
+torque.dsfactory.project.connection.password = password
## Using jndi
-#torque.dsfactory.default.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
-#torque.dsfactory.default.jndi.path=jdbc/default
-#torque.dsfactory.default.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
-#torque.dsfactory.default.jndi.java.naming.factory.url.pkgs = org.apache.naming
-
-#torque.dsfactory.default.datasource.classname=org.apache.torque.pool.TorqueClassicDataSource
-#torque.dsfactory.default.datasource.dataSourceName=jdbc/DBdefault
-#torque.dsfactory.default.datasource.jndiEnvironment.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
-#torque.dsfactory.default.datasource.jndiEnvironment.java.naming.factory.url.pkgs =
org.apache.naming
-#torque.dsfactory.default.datasource.defaultMaxConnections=10
+#torque.dsfactory.project.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.project.jndi.path=jdbc/default
+#torque.dsfactory.project.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.project.jndi.java.naming.factory.url.pkgs = org.apache.naming
+
+#torque.dsfactory.project.datasource.classname=org.apache.torque.pool.TorqueClassicDataSource
+#torque.dsfactory.project.datasource.dataSourceName=jdbc/DBdefault
+#torque.dsfactory.project.datasource.jndiEnvironment.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.project.datasource.jndiEnvironment.java.naming.factory.url.pkgs =
org.apache.naming
+#torque.dsfactory.project.datasource.defaultMaxConnections=10
## ConnectionPoolDataSource
-#torque.dsfactory.DBdefault.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
-#torque.dsfactory.DBdefault.jndi.path=jdbc/DBdefault
-#torque.dsfactory.DBdefault.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
-#torque.dsfactory.DBdefault.jndi.java.naming.factory.url.pkgs = org.apache.naming
-#torque.dsfactory.DBdefault.datasource.classname=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
-#torque.dsfactory.DBdefault.datasource.driver = org.gjt.mm.mysql.Driver
-#torque.dsfactory.DBdefault.datasource.url = jdbc:mysql://localhost:3306/torque
-#torque.dsfactory.DBdefault.datasource.user = user
-#torque.dsfactory.DBdefault.datasource.password = password
+#torque.dsfactory.project.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.project.jndi.path=jdbc/DBdefault
+#torque.dsfactory.project.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.project.jndi.java.naming.factory.url.pkgs = org.apache.naming
+#torque.dsfactory.project.datasource.classname=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
+#torque.dsfactory.project.datasource.driver = org.gjt.mm.mysql.Driver
+#torque.dsfactory.project.datasource.url = jdbc:mysql://localhost:3306/torque
+#torque.dsfactory.project.datasource.user = user
+#torque.dsfactory.project.datasource.password = password
# Determines if the quantity column of the IDBroker's id_table should
# be increased automatically if requests for ids reaches a high
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
