db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: db-torque/src/conf/master Torque.master
Date Mon, 08 Sep 2003 23:14:44 GMT
mpoeschl    2003/09/08 16:14:44

  Modified:    xdocs    configuration-howto.xml changes.xml
               src/conf Torque.properties
               src/conf/master Torque.master
  Removed:     src/java/org/apache/torque/pool package.html
                        TorqueClassicDataSource.java
                        ConnectionWaitTimeoutException.java
                        ConnectionPool.java
               src/java/org/apache/torque/dsfactory
                        TorqueDataSourceFactory.java
  Log:
  Removed the deprecated connection pool
  
  Revision  Changes    Path
  1.2       +2 -42     db-torque/xdocs/configuration-howto.xml
  
  Index: configuration-howto.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/configuration-howto.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- configuration-howto.xml	19 Aug 2003 19:40:36 -0000	1.1
  +++ configuration-howto.xml	8 Sep 2003 23:14:44 -0000	1.2
  @@ -43,7 +43,8 @@
   This arrangement is no longer possible using <code>DataSource</code>, so
   the adapter must be given in the configuration.  In all examples that follow we
   will use the handle, bookstore.  This is the name attribute that is used in the
  -&lt;database&gt; tag in the schema.xml.  If the name attribute is not used, then
the handle would be 'default'.
  +&lt;database&gt; tag in the schema.xml.  If the name attribute is not used, then
  + the handle would be 'default'.
   The adapter property is given as:
   </p>
   
  @@ -89,47 +90,6 @@
   
   </section>
   
  -
  -<section name="TorqueDataSourceFactory">
  -
  -<p>
  -This factory gives a DataSource version of the old deprecated built-in pool.
  -TorqueDataSourceFactory provides an easy way to configure this
  -pool and it assumes you will have a jdbc Driver class providing the physical
  -database connections.  First you must let torque know you are using this
  -factory.
  -</p>
  -
  -<source><![CDATA[
  -torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
  -]]></source>
  -
  -<p>
  -Then there are two sets of properties related to the pool configuration and 
  -settings for making the connection to the database.
  -</p>
  -
  -<source><![CDATA[
  -torque.dsfactory.bookstore.pool.defaultMaxConnections=10
  -torque.dsfactory.bookstore.pool.maxExpiryTime=3600
  -torque.dsfactory.bookstore.pool.connectionWaitTimeout=10
  -]]></source>
  -
  -<source><![CDATA[
  -torque.dsfactory.bookstore.connection.driver = org.gjt.mm.mysql.Driver
  -torque.dsfactory.bookstore.connection.url = jdbc:mysql://localhost:3306/bookstore
  -torque.dsfactory.bookstore.connection.user = root
  -torque.dsfactory.bookstore.connection.password = 1234
  -]]></source>
  -
  -<p>
  -The TorqueClassicDataSource used with this factory has a few other 
  -configuration options which could be set above in the "pool" section, but
  -the three shown are enough for most cases.  Please see the javadoc for the
  -class for more information.
  -</p>
  -
  -</section>
   
   <section name="SharedPoolDataSourceFactory">
   
  
  
  
  1.111     +6 -1      db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- changes.xml	8 Sep 2003 22:01:50 -0000	1.110
  +++ changes.xml	8 Sep 2003 23:14:44 -0000	1.111
  @@ -9,8 +9,13 @@
   
       <release version="3.2-alpha" date="in CVS">
   
  +      <action dev='mpoeschl' type='remove'>
  +        Removed the deprecated connection pool (commons-dbcp is used as
  +        default since 3.1)
  +      </action>
         <action dev='mpoeschl' type='add'>
  -        Changed ojb-model task to generate Object + BaseObject (like for the torque om).
  +        Changed ojb-model task to generate Object + BaseObject (like for the 
  +        torque om).
         </action>
         <action dev='mpoeschl' type='add'>
           Fix package name for TorqueComponent in roleConfiguration.xml
  
  
  
  1.12      +1 -14     db-torque/src/conf/Torque.properties
  
  Index: Torque.properties
  ===================================================================
  RCS file: /home/cvs/db-torque/src/conf/Torque.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Torque.properties	19 Aug 2003 19:09:44 -0000	1.11
  +++ Torque.properties	8 Sep 2003 23:14:44 -0000	1.12
  @@ -89,18 +89,6 @@
   torque.database.default=bookstore
   torque.database.bookstore.adapter=mysql
   
  -## Using torque's old pool
  -## this implementation is deprecated and has some known bugs!!!!
  -## you should use commons-dbcp
  -#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 commons-dbcp 
   torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
   #torque.dsfactory.bookstore.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory
  @@ -119,7 +107,6 @@
   #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
  
  
  
  1.10      +1 -14     db-torque/src/conf/master/Torque.master
  
  Index: Torque.master
  ===================================================================
  RCS file: /home/cvs/db-torque/src/conf/master/Torque.master,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Torque.master	19 Aug 2003 19:09:44 -0000	1.9
  +++ Torque.master	8 Sep 2003 23:14:44 -0000	1.10
  @@ -89,18 +89,6 @@
   torque.database.default=@DATABASE_DEFAULT@
   torque.database.@DATABASE_DEFAULT@.adapter=@DATABASE@
   
  -## Using torque's old pool
  -## this implementation is deprecated and has some known bugs!!!!
  -## you should use commons-dbcp
  -#torque.dsfactory.@DATABASE_DEFAULT@.factory=org.apache.torque.dsfactory.TorqueDataSourceFactory
  -#torque.dsfactory.@DATABASE_DEFAULT@.pool.defaultMaxConnections=10
  -#torque.dsfactory.@DATABASE_DEFAULT@.pool.maxExpiryTime=3600
  -#torque.dsfactory.@DATABASE_DEFAULT@.pool.connectionWaitTimeout=10
  -#torque.dsfactory.@DATABASE_DEFAULT@.connection.driver = @DATABASE_DRIVER@
  -#torque.dsfactory.@DATABASE_DEFAULT@.connection.url = @DATABASE_URL@
  -#torque.dsfactory.@DATABASE_DEFAULT@.connection.user = @DATABASE_USER@
  -#torque.dsfactory.@DATABASE_DEFAULT@.connection.password = @DATABASE_PASSWORD@
  -
   ## Using commons-dbcp 
   torque.dsfactory.@DATABASE_DEFAULT@.factory=org.apache.torque.dsfactory.SharedPoolDataSourceFactory
   #torque.dsfactory.@DATABASE_DEFAULT@.factory=org.apache.torque.dsfactory.PerUserPoolDataSourceFactory
  @@ -119,7 +107,6 @@
   #torque.dsfactory.@DATABASE_DEFAULT@.jndi.java.naming.factory.initial = org.apache.naming.java.javaURLContextFactory
   #torque.dsfactory.@DATABASE_DEFAULT@.jndi.java.naming.factory.url.pkgs = org.apache.naming
   
  -#torque.dsfactory.@DATABASE_DEFAULT@.datasource.classname=org.apache.torque.pool.TorqueClassicDataSource
   #torque.dsfactory.@DATABASE_DEFAULT@.datasource.dataSourceName=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
  
  
  

---------------------------------------------------------------------
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