stephenh 2002/09/11 06:53:26
Modified: src/conf Torque.properties
src/conf/master build.xml default.properties Torque.master
Log:
- Changed name of configuration from default to bookstore to disambiguate the
settings.
- Removed the DB prefix from the ConnectionPoolDataSource settings
(torque.dsfactory.DBbookstore -> torque.dsfactory.bookstore) to match the other
settings.
- Regenerated the Torque.properties from Torque.master per Martin's suggestion.
Revision Changes Path
1.7 +39 -39 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Torque.properties 11 Sep 2002 03:37:15 -0000 1.6
+++ Torque.properties 11 Sep 2002 13:53:26 -0000 1.7
@@ -42,53 +42,53 @@
# configure these properly.
# -------------------------------------------------------------------
-torque.database.default=default
-torque.database.project.adapter=mysql
+torque.database.default=bookstore
+torque.database.bookstore.adapter=mysql
## Using torque's old pool
-#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
+torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
+torque.dsfactory.bookstore.pool.defaultMaxConnections=10
+torque.dsfactory.bookstore.pool.maxExpiryTime=3600
+torque.dsfactory.bookstore.pool.connectionWaitTimeout=10
+torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
+torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/torque
+torque.dsfactory.bookstore.connection.user = user
+torque.dsfactory.bookstore.connection.password = password
## Using Jdbc2Pool
-torque.dsfactory.project.factory=\
- org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
-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
+#torque.dsfactory.bookstore.factory=\
+# org.apache.torque.dsfactory.Jdbc2PoolDataSourceFactory
+#torque.dsfactory.bookstore.pool.defaultMaxActive=10
+#torque.dsfactory.bookstore.pool.testOnBorrow=true
+#torque.dsfactory.bookstore.pool.validationQuery=SELECT 1
+#torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
+#torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/torque
+#torque.dsfactory.bookstore.connection.user = user
+#torque.dsfactory.bookstore.connection.password = password
## Using jndi
-#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
+#torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.bookstore.jndi.path=jdbc/bookstore
+#torque.dsfactory.bookstore.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.bookstore.jndi.java.naming.factory.url.pkgs = org.apache.naming
+
+#torque.dsfactory.bookstore.datasource.classname=org.apache.torque.pool.TorqueClassicDataSource
+#torque.dsfactory.bookstore.datasource.dataSourceName=jdbc/DBbookstore
+#torque.dsfactory.bookstore.datasource.jndiEnvironment.java.naming.factory.initial
= org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.bookstore.datasource.jndiEnvironment.java.naming.factory.url.pkgs
= org.apache.naming
+#torque.dsfactory.bookstore.datasource.defaultMaxConnections=10
## ConnectionPoolDataSource
-#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
+#torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.bookstore.jndi.path=jdbc/DBbookstore
+#torque.dsfactory.bookstore.jndi.java.naming.factory.initial =
org.apache.naming.java.javaURLContextFactory
+#torque.dsfactory.bookstore.jndi.java.naming.factory.url.pkgs = org.apache.naming
+#torque.dsfactory.bookstore.datasource.classname=org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS
+#torque.dsfactory.bookstore.datasource.driver = org.gjt.mm.mysql.Driver
+#torque.dsfactory.bookstore.datasource.url = jdbc:mysql://localhost:3306/torque
+#torque.dsfactory.bookstore.datasource.user = user
+#torque.dsfactory.bookstore.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
1.2 +1 -2 jakarta-turbine-torque/src/conf/master/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/conf/master/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 13 Feb 2002 14:21:08 -0000 1.1
+++ build.xml 11 Sep 2002 13:53:26 -0000 1.2
@@ -42,8 +42,7 @@
<filter token="DATABASE_ADAPTOR" value="${database.adaptor}"/>
<filter token="DATABASE_USER" value="${database.user}"/>
<filter token="DATABASE_PASSWORD" value="${database.password}"/>
- <filter token="DATABASE_NAME" value="${database.name}"/>
- <filter token="DATABASE_DEFAULT" value="default"/>
+ <filter token="DATABASE_DEFAULT" value="${database.name}"/>
<filter token="PROJECT" value="${project}"/>
<filter token="APPLICATION_ROOT" value="${application.root}"/>
1.3 +1 -1 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 26 Jun 2002 08:07:33 -0000 1.2
+++ default.properties 11 Sep 2002 13:53:26 -0000 1.3
@@ -1,5 +1,5 @@
application.root = .
-database.name = torque
+database.name = bookstore
database.type = mysql
database.user = user
database.password = password
1.4 +15 -10 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Torque.master 7 Aug 2002 08:07:01 -0000 1.3
+++ Torque.master 11 Sep 2002 13:53:26 -0000 1.4
@@ -80,18 +80,23 @@
#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.dbcp.cpdsadapter.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@
+#torque.dsfactory.@[email protected]=org.apache.torque.dsfactory.JndiDataSourceFactory
+#torque.dsfactory.@[email protected]=jdbc/DB@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.dbcp.cpdsadapter.DriverAdapterCPDS
+#torque.dsfactory.@[email protected] = @DATABASE_DRIVER@
+#torque.dsfactory.@[email protected] = @DATABASE_URL@
+#torque.dsfactory.@[email protected] = @DATABASE_USER@
+#torque.dsfactory.@[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
# volume.
torque.idbroker.cleverquantity=true
+
+# Determines whether the managers cache instances of the business objects.
+# And also whether the MethodResultCache will really cache results.
+
+torque.manager.useCache = true
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
