You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2010/10/22 12:48:41 UTC
svn commit: r1026286 - in /incubator/wookie/trunk: ivy.xml
src/org/apache/wookie/server/Start.java
Author: scottbw
Date: Fri Oct 22 10:48:41 2010
New Revision: 1026286
URL: http://svn.apache.org/viewvc?rev=1026286&view=rev
Log:
Removed dependency on C3PO and replaced functionality using Apache DBCP - see WOOKIE-154
Modified:
incubator/wookie/trunk/ivy.xml
incubator/wookie/trunk/src/org/apache/wookie/server/Start.java
Modified: incubator/wookie/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/ivy.xml?rev=1026286&r1=1026285&r2=1026286&view=diff
==============================================================================
--- incubator/wookie/trunk/ivy.xml (original)
+++ incubator/wookie/trunk/ivy.xml Fri Oct 22 10:48:41 2010
@@ -97,18 +97,16 @@
</dependency>
<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.3" conf="dev->default">
</dependency>
- <dependency org="c3p0" name="c3p0" rev="0.9.1.2" conf="dev->default">
- </dependency>
<dependency org="org.apache.derby" name="derby" rev="10.4.2.0" conf="dev->default">
</dependency>
+ <dependency org="commons-dbcp" name="commons-dbcp" rev="1.2.2" conf="dev->default">
+ </dependency>
<!-- Libraries used in testing -->
<dependency org="junit" name="junit" rev="4.7" conf="test->default">
</dependency>
<dependency org="directory-naming" name="naming-java" rev="0.8" conf="test->default">
</dependency>
- <dependency org="commons-dbcp" name="commons-dbcp" rev="1.2.2" conf="test->default">
- </dependency>
<!-- DDLUtils Library -->
<dependency org="org.apache.ddlutils" name="ddlutils" rev="1.0" conf="ddlutils->default">
Modified: incubator/wookie/trunk/src/org/apache/wookie/server/Start.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/server/Start.java?rev=1026286&r1=1026285&r2=1026286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/Start.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/Start.java Fri Oct 22 10:48:41 2010
@@ -22,7 +22,13 @@ import java.net.ServerSocket;
import java.net.Socket;
import javax.jcr.Repository;
+import javax.sql.DataSource;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp.DataSourceConnectionFactory;
+import org.apache.commons.dbcp.PoolableConnectionFactory;
+import org.apache.commons.dbcp.PoolingDataSource;
+import org.apache.commons.pool.impl.GenericObjectPool;
import org.apache.jackrabbit.core.TransientRepository;
import org.apache.log4j.Logger;
import org.apache.wookie.beans.jcr.JCRPersistenceManager;
@@ -34,8 +40,6 @@ import org.mortbay.jetty.security.HashUs
import org.mortbay.jetty.security.UserRealm;
import org.mortbay.jetty.webapp.WebAppContext;
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
public class Start {
static final private Logger logger = Logger.getLogger(Start.class);
private static int port = 8080;
@@ -165,19 +169,27 @@ public class Start {
}
}
- // setup C3P0 JPA database connection pool JNDI resource
- ComboPooledDataSource dataSource = new ComboPooledDataSource();
- dataSource.setJdbcUrl(dbUri);
- dataSource.setDriverClass(dbDriver);
- dataSource.setUser(dbUser);
+ // Setup a database connection resource using DBCP
+ BasicDataSource dataSource = new BasicDataSource();
+ dataSource.setDriverClassName(dbDriver);
+ dataSource.setUrl(dbUri);
+ dataSource.setUsername(dbUser);
dataSource.setPassword(dbPassword);
- dataSource.setAcquireIncrement(1);
- dataSource.setIdleConnectionTestPeriod(200);
- dataSource.setMaxPoolSize(80);
- dataSource.setMaxStatements(0);
- dataSource.setMinPoolSize(5);
- dataSource.setMaxIdleTime(80);
- new Resource(JPAPersistenceManager.WIDGET_DATABASE_JNDI_DATASOURCE_NAME, dataSource);
+ dataSource.setMaxActive(80);
+ dataSource.setMaxIdle(80);
+ dataSource.setInitialSize(5);
+ dataSource.setMaxOpenPreparedStatements(0);
+
+ // Set up connection pool
+ GenericObjectPool pool = new GenericObjectPool();
+ // setup factory and pooling DataSource
+ DataSourceConnectionFactory factory = new DataSourceConnectionFactory(dataSource);
+ @SuppressWarnings("unused")
+ PoolableConnectionFactory poolableConnectionFactory = new PoolableConnectionFactory(factory,pool,null,null,false,true);
+ DataSource poolingDataSource = new PoolingDataSource(pool);
+
+
+ new Resource(JPAPersistenceManager.WIDGET_DATABASE_JNDI_DATASOURCE_NAME, poolingDataSource);
} else if (persistenceManagerType.equals(PERSISTENCE_MANAGER_TYPE_JCR)) {
logger.info("Configuring JCR persistence manager");
Re: svn commit: r1026286 - in /incubator/wookie/trunk: ivy.xml src/org/apache/wookie/server/Start.java
Posted by Ross Gardler <rg...@apache.org>.
On 22/10/2010 11:48, scottbw@apache.org wrote:
> Author: scottbw
> Date: Fri Oct 22 10:48:41 2010
> New Revision: 1026286
>
> URL: http://svn.apache.org/viewvc?rev=1026286&view=rev
> Log:
> Removed dependency on C3PO and replaced functionality using Apache DBCP - see WOOKIE-154
Well done Scott - found and replaced in an excellent time-frame.
Ross