db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g.@apache.org
Subject svn commit: r1886097 - in /db/torque/trunk: torque-runtime/src/conf/ torque-runtime/src/test/java/org/apache/torque/ torque-runtime/src/test/resources/ torque-site/src/site/xdoc/
Date Mon, 01 Feb 2021 09:46:05 GMT
Author: gk
Date: Mon Feb  1 09:46:04 2021
New Revision: 1886097

URL: http://svn.apache.org/viewvc?rev=1886097&view=rev
Log:
- change test and default configuration to dbcp2 and pool2 by default
- minor site update

Modified:
    db/torque/trunk/torque-runtime/src/conf/Torque.properties
    db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
    db/torque/trunk/torque-runtime/src/test/resources/Torque.properties
    db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties
    db/torque/trunk/torque-site/src/site/xdoc/index.xml

Modified: db/torque/trunk/torque-runtime/src/conf/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/conf/Torque.properties?rev=1886097&r1=1886096&r2=1886097&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/conf/Torque.properties (original)
+++ db/torque/trunk/torque-runtime/src/conf/Torque.properties Mon Feb  1 09:46:04 2021
@@ -53,7 +53,9 @@ torque.applicationRoot = .
 # -------------------------------------------------------------------
 
 # Time to wait for a connection to the database in milliseconds.
-torque.defaults.pool.maxWait = 10000
+
+# pool2, dbcp 2: maxWait -> maxWaitMillis
+torque.defaults.pool.maxWaitMillis=10000
 
 # Maximum number of idle and active connections cached in a database
 # definition.
@@ -63,7 +65,9 @@ torque.defaults.pool.maxWait = 10000
 # connection licensed database engine, you must multiply this number by
 # the number of times you use a specific database URL.
 torque.defaults.pool.maxIdle = 8
-torque.defaults.pool.maxActive = 10
+
+# pool2, dbcp 2: maxActive -> maxTotal
+torque.defaults.pool.maxTotal = 10
 
 # How often the pool is checked for connection which stayed in the pool
 # for too long. Defaults to 5 minutes (5 * 60 * 1000)
@@ -99,11 +103,15 @@ torque.defaults.connection.password = pa
 torque.database.default=bookstore
 torque.database.bookstore.adapter=mysql
 
-# # Using commons-dbcp
-torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
-# torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory
+# # Using commons-dbcp2
+torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.SharedPool2DataSourceFactory
+# torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.PerUserPool2DataSourceFactory
+
 torque.dsfactory.bookstore.pool.maxIdle=8
-torque.dsfactory.bookstore.pool.maxActive=10
+
+# pool2, dbcp 2: maxActive -> maxTotal
+torque.dsfactory.bookstore.pool.maxTotal=10
+
 torque.dsfactory.bookstore.pool.testOnBorrow=true
 torque.dsfactory.bookstore.pool.validationQuery=SELECT 1
 torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver

Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java?rev=1886097&r1=1886096&r2=1886097&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
(original)
+++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/TorqueInstanceTest.java
Mon Feb  1 09:46:04 2021
@@ -133,6 +133,9 @@ public class TorqueInstanceTest extends
         assertEquals(
                 "defaultschema",
                 databases.get(POSTGRESQL_NAME).getSchema());
+        assertEquals(
+               "orschema",
+               databases.get(ORACLE_NAME).getSchema());
     }
 
     @Test

Modified: db/torque/trunk/torque-runtime/src/test/resources/Torque.properties
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/resources/Torque.properties?rev=1886097&r1=1886096&r2=1886097&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/test/resources/Torque.properties (original)
+++ db/torque/trunk/torque-runtime/src/test/resources/Torque.properties Mon Feb  1 09:46:04
2021
@@ -19,13 +19,13 @@
 torque.database.default = postgresql
 
 torque.database.mysql.adapter=mysql
-torque.dsfactory.mysql.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.mysql.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory
 
 torque.database.postgresql.adapter=postgresql
-torque.dsfactory.postgresql.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.postgresql.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory
 
 torque.database.oracle.adapter=oracle
-torque.dsfactory.oracle.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.oracle.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory
 
 torque.idbroker.prefetch=false
 

Modified: db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties?rev=1886097&r1=1886096&r2=1886097&view=diff
==============================================================================
--- db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties (original)
+++ db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties Mon Feb
 1 09:46:04 2021
@@ -18,12 +18,22 @@
 
 torque.database.default = postgresql
 
+
 torque.database.mysql.adapter=mysql
-torque.dsfactory.mysql.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.mysql.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory
+
 torque.database.mysql.schema=myschema
 
+
 torque.database.postgresql.adapter=postgresql
-torque.dsfactory.postgresql.factory= org.apache.torque.dsfactory.SharedPoolDataSourceFactory
+torque.dsfactory.postgresql.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory
+
+
+torque.database.oracle.adapter=oracle
+torque.dsfactory.oracle.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory
+
+torque.database.oracle.schema=orschema
+
 
 torque.idbroker.prefetch=false
 

Modified: db/torque/trunk/torque-site/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-site/src/site/xdoc/index.xml?rev=1886097&r1=1886096&r2=1886097&view=diff
==============================================================================
--- db/torque/trunk/torque-site/src/site/xdoc/index.xml (original)
+++ db/torque/trunk/torque-site/src/site/xdoc/index.xml Mon Feb  1 09:46:04 2021
@@ -70,7 +70,7 @@
         <a href="http://db.apache.org/torque">Torque 5.0</a>.
       </li>
        <li>
-        Stable <i>production</i> release of Torque 4 is 
+        The previous stable <i>production</i> release is 
         <a href="http://db.apache.org/torque/torque-4.0">Torque 4.0</a>.
       </li>
      </ul>



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message