mpoeschl 2002/06/26 01:07:33
Modified: src/conf Torque.properties
src/conf/master Torque.master default.properties
Log:
configuration changes
Revision Changes Path
1.3 +46 -47 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Torque.properties 11 Apr 2002 07:36:11 -0000 1.2
+++ Torque.properties 26 Jun 2002 08:07:33 -0000 1.3
@@ -43,56 +43,55 @@
# -------------------------------------------------------------------
torque.database.default=default
+torque.database.default.adapter=mysql
-torque.database.default.driver = org.gjt.mm.mysql.Driver
-torque.database.default.url = jdbc:mysql://localhost:3306/torque
-torque.database.default.username =
-torque.database.default.password =
-
-# The number of database connections to cache per ConnectionPool
-# instance (specified per database).
-
-torque.database.default.maxConnections=80
-
-# The amount of time (in milliseconds) that database connections will be
-# cached (specified per database).
-#
-# Default: one hour = 60 * 60 * 1000
-
-torque.database.default.expiryTime=3600000
-
-# The amount of time (in milliseconds) a connection request will have to wait
-# before a time out occurs and an error is thrown.
-#
-# Default: ten seconds = 10 * 1000
-
-torque.database.connectionWaitTimeout=10000
-
-# The interval (in milliseconds) between which the PoolBrokerService logs
-# the status of it's ConnectionPools.
-#
-# Default: No logging = 0 = 0 * 1000
-
-torque.database.logInterval=0
+## 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
+
+## Using Jdbc2Pool
+torque.dsfactory.default.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
+
+
+## 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.commons.jdbc2pool.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
+
+## 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.jdbc2pool.adapter.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
# Determines if the quantity column of the IDBroker's id_table should
# be increased automatically if requests for ids reaches a high
# volume.
torque.idbroker.cleverquantity=true
-
-# Determines if IDBroker should prefetch IDs or not. If set to false
-# this property has the effect of shutting off the housekeeping thread
-# that attempts to prefetch the id's. It also sets the # of id's grabbed
-# per request to 1 regardless of the settings in the database.
-# Default: true
-
-torque.idbroker.prefetch=true
-
-# IDBroker can grab its own connection from the pool to use when retrieving
-# more id's to minimize the amount of time ID_TABLE will be locked.
-# Some usage of IDBroker or assumptions made by connection pools or jdbc
-# drivers may disallow this optimization in which case the property
-# should be set to false.
-
-torque.idbroker.usenewconnection=true
1.2 +46 -31 jakarta-turbine-torque/src/conf/master/Torque.master
Index: Torque.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/master/Torque.master,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Torque.master 13 Feb 2002 14:21:08 -0000 1.1
+++ Torque.master 26 Jun 2002 08:07:33 -0000 1.2
@@ -43,37 +43,52 @@
# -------------------------------------------------------------------
torque.database.default=@DATABASE_DEFAULT@
+torque.database.@[email protected]=mysql
-torque.database.@[email protected] = @DATABASE_DRIVER@
-torque.database.@[email protected] = @DATABASE_URL@
-torque.database.@[email protected] = @DATABASE_USER@
-torque.database.@[email protected] = @DATABASE_PASSWORD@
-
-# The number of database connections to cache per ConnectionPool
-# instance (specified per database).
-
-torque.database.default.maxConnections=80
-
-# The amount of time (in milliseconds) that database connections will be
-# cached (specified per database).
-#
-# Default: one hour = 60 * 60 * 1000
-
-torque.database.default.expiryTime=3600000
-
-# The amount of time (in milliseconds) a connection request will have to wait
-# before a time out occurs and an error is thrown.
-#
-# Default: ten seconds = 10 * 1000
-
-torque.database.connectionWaitTimeout=10000
-
-# The interval (in milliseconds) between which the PoolBrokerService logs
-# the status of it's ConnectionPools.
-#
-# Default: No logging = 0 = 0 * 1000
-
-torque.database.logInterval=0
+## Using torque's old pool
+torque.dsfactory.@[email protected]=org.apache.torque.dsfactory.TorqueDataSourceFactory
+torque.dsfactory.@[email protected]=10
+torque.dsfactory.@[email protected]=3600
+torque.dsfactory.@[email protected]=10
+torque.dsfactory.@[email protected] = @DATABASE_DRIVER@
+torque.dsfactory.@[email protected] = @DATABASE_URL@
+torque.dsfactory.@[email protected] = @DATABASE_USER@
+torque.dsfactory.@[email protected] = @DATABASE_PASSWORD@
+
+## Using Jdbc2Pool
+#torque.dsfactory.@[email protected]=\
+# org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
+#torque.dsfactory.@[email protected]=10
+#torque.dsfactory.@[email protected]=true
+#torque.dsfactory.@[email protected]=SELECT 1
+#torque.dsfactory.@[email protected] = @DATABASE_DRIVER@
+#torque.dsfactory.@[email protected] = @DATABASE_URL@
+#torque.dsfactory.@[email protected] = @DATABASE_USER@
+#torque.dsfactory.@[email protected] = @DATABASE_PASSWORD@
+
+
+## Using jndi
+#torque.dsfactory.@[email protected]=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.@[email protected]=jdbc/@DATABASE_DEFAULT@
+#torque.dsfactory.@[email protected] =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.@[email protected] =
org.apache.naming
+
+#torque.dsfactory.@[email protected]=org.apache.commons.jdbc2pool.TorqueClassicDataSource
+#torque.dsfactory.@[email protected]=jdbc/DB@DATABASE_DEFAULT@
+#torque.dsfactory.@DATABASE_DEFAULT@.datasource.jndiEnvironment.java.naming.factory.initial
= org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.@DATABASE_DEFAULT@.datasource.jndiEnvironment.java.naming.factory.url.pkgs
= org.apache.naming
+#torque.dsfactory.@[email protected]=10
+
+## ConnectionPoolDataSource
+#torque.dsfactory.DB@[email protected]=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.DB@[email protected]=jdbc/DB@DATABASE_DEFAULT@
+#torque.dsfactory.DB@[email protected] =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.DB@[email protected] =
org.apache.naming
+#torque.dsfactory.DB@[email protected]=org.apache.commons.jdbc2pool.adapter.DriverAdapterCPDS
+#torque.dsfactory.DB@[email protected] = @DATABASE_DRIVER@
+#torque.dsfactory.DB@[email protected] = @DATABASE_URL@
+#torque.dsfactory.DB@[email protected] = @DATABASE_USER@
+#torque.dsfactory.DB@[email protected] = @DATABASE_PASSWORD@
# Determines if the quantity column of the IDBroker's id_table should
# be increased automatically if requests for ids reaches a high
1.2 +2 -0 jakarta-turbine-torque/src/conf/master/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/master/default.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- default.properties 13 Feb 2002 14:21:08 -0000 1.1
+++ default.properties 26 Jun 2002 08:07:33 -0000 1.2
@@ -3,4 +3,6 @@
database.type = mysql
database.user = user
database.password = password
+database.driver = org.gjt.mm.mysql.Driver
+database.url = jdbc:mysql://localhost:3306/torque
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
