mpoeschl 2003/08/19 12:09:12
Modified: . project.xml
Added: src/java/org/apache/torque/dsfactory
PerUserPoolDataSourceFactory.java
SharedPoolDataSourceFactory.java
Removed: src/java/org/apache/torque/dsfactory
Jdbc2PoolDataSourceFactory.java
Log:
upgrade commons-pool and commons-dbcp to latest snapshots
replace Jdbc2PoolDataSourceFactory with PerUserPDSF and SharedPDSF
Revision Changes Path
1.1
db-torque/src/java/org/apache/torque/dsfactory/PerUserPoolDataSourceFactory.java
Index: PerUserPoolDataSourceFactory.java
===================================================================
package org.apache.torque.dsfactory;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import javax.sql.ConnectionPoolDataSource;
import javax.sql.DataSource;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.dbcp.datasources.PerUserPoolDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
/**
* A factory that looks up the DataSource using the JDBC2 pool methods.
*
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id: PerUserPoolDataSourceFactory.java,v 1.1 2003/08/19 19:09:12
mpoeschl Exp $
*/
public class PerUserPoolDataSourceFactory
extends AbstractDataSourceFactory
implements DataSourceFactory
{
/** The log. */
private static Log log
= LogFactory.getLog(PerUserPoolDataSourceFactory.class);
/** The wrapped <code>DataSource</code>. */
private DataSource ds;
/**
* @see org.apache.torque.dsfactory.DataSourceFactory#getDataSource
*/
public DataSource getDataSource()
{
return ds;
}
/**
* @see org.apache.torque.dsfactory.DataSourceFactory#initialize
*/
public void initialize(Configuration configuration) throws TorqueException
{
if (configuration == null)
{
throw new TorqueException(
"Torque cannot be initialized without a valid configuration. "
+ "Please check the log files for further details.");
}
ConnectionPoolDataSource cpds = initCPDS(configuration);
PerUserPoolDataSource ds = initJdbc2Pool(configuration);
ds.setConnectionPoolDataSource(cpds);
this.ds = ds;
}
/**
* Initializes the Jdbc2PoolDataSource.
*
* @param configuration where to read the settings from
* @throws TorqueException if a property set fails
* @return a configured <code>Jdbc2PoolDataSource</code>
*/
private PerUserPoolDataSource initJdbc2Pool(Configuration configuration)
throws TorqueException
{
log.debug("Starting initJdbc2Pool");
PerUserPoolDataSource ds = new PerUserPoolDataSource();
Configuration c = Torque.getConfiguration();
if (c == null)
{
log.warn("Global Configuration not set,"
+ " no Default pool data source configured!");
}
else
{
Configuration conf = c.subset(DEFAULT_POOL_KEY);
applyConfiguration(conf, ds);
}
Configuration conf = configuration.subset(POOL_KEY);
applyConfiguration(conf, ds);
return ds;
}
}
1.1
db-torque/src/java/org/apache/torque/dsfactory/SharedPoolDataSourceFactory.java
Index: SharedPoolDataSourceFactory.java
===================================================================
package org.apache.torque.dsfactory;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import javax.sql.ConnectionPoolDataSource;
import javax.sql.DataSource;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.dbcp.datasources.SharedPoolDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
/**
* A factory that looks up the DataSource using the JDBC2 pool methods.
*
* @author <a href="mailto:[EMAIL PROTECTED]">John McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id: SharedPoolDataSourceFactory.java,v 1.1 2003/08/19 19:09:12 mpoeschl
Exp $
*/
public class SharedPoolDataSourceFactory
extends AbstractDataSourceFactory
implements DataSourceFactory
{
/** The log. */
private static Log log
= LogFactory.getLog(SharedPoolDataSourceFactory.class);
/** The wrapped <code>DataSource</code>. */
private DataSource ds;
/**
* @see org.apache.torque.dsfactory.DataSourceFactory#getDataSource
*/
public DataSource getDataSource()
{
return ds;
}
/**
* @see org.apache.torque.dsfactory.DataSourceFactory#initialize
*/
public void initialize(Configuration configuration) throws TorqueException
{
if (configuration == null)
{
throw new TorqueException(
"Torque cannot be initialized without a valid configuration. "
+ "Please check the log files for further details.");
}
ConnectionPoolDataSource cpds = initCPDS(configuration);
SharedPoolDataSource ds = initJdbc2Pool(configuration);
ds.setConnectionPoolDataSource(cpds);
this.ds = ds;
}
/**
* Initializes the Jdbc2PoolDataSource.
*
* @param configuration where to read the settings from
* @throws TorqueException if a property set fails
* @return a configured <code>Jdbc2PoolDataSource</code>
*/
private SharedPoolDataSource initJdbc2Pool(Configuration configuration)
throws TorqueException
{
log.debug("Starting initJdbc2Pool");
SharedPoolDataSource ds = new SharedPoolDataSource();
Configuration c = Torque.getConfiguration();
if (c == null)
{
log.warn("Global Configuration not set,"
+ " no Default pool data source configured!");
}
else
{
Configuration conf = c.subset(DEFAULT_POOL_KEY);
applyConfiguration(conf, ds);
}
Configuration conf = configuration.subset(POOL_KEY);
applyConfiguration(conf, ds);
return ds;
}
}
1.96 +3 -3 db-torque/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/db-torque/project.xml,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- project.xml 11 Jul 2003 06:01:20 -0000 1.95
+++ project.xml 19 Aug 2003 19:09:12 -0000 1.96
@@ -5,7 +5,7 @@
<id>torque</id>
<groupId>torque</groupId>
<name>Torque</name>
- <currentVersion>3.1-alpha3-dev</currentVersion>
+ <currentVersion>3.1-beta1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://db.apache.org/</url>
@@ -210,7 +210,7 @@
</dependency>
<dependency>
<id>commons-dbcp</id>
- <version>1.1-dev.20021231.055112</version>
+ <version>20030818.201141</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
@@ -225,7 +225,7 @@
</dependency>
<dependency>
<id>commons-pool</id>
- <version>1.0.1</version>
+ <version>20030818.195203</version>
<url>http://jakarta.apache.org/commons/pool/</url>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
