You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fh...@apache.org on 2009/07/14 00:18:18 UTC
svn commit: r793732 [2/2] - in /tomcat/trunk/modules/jdbc-pool: ./ doc/
java/org/apache/tomcat/jdbc/pool/
java/org/apache/tomcat/jdbc/pool/interceptor/
java/org/apache/tomcat/jdbc/pool/jmx/ test/org/apache/tomcat/jdbc/test/
Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=793732&r1=793731&r2=793732&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java (original)
+++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java Mon Jul 13 22:18:17 2009
@@ -17,7 +17,9 @@
import java.util.Properties;
-public interface ConnectionPoolMBean {
+import org.apache.tomcat.jdbc.pool.PoolConfiguration;
+
+public interface ConnectionPoolMBean extends PoolConfiguration {
//=================================================================
// POOL STATS
@@ -51,75 +53,4 @@
//=================================================================
- //=================================================================
- // POOL PROPERTIES
- //=================================================================
- public Properties getDbProperties();
-
- public String getUrl();
-
- public String getDriverClassName();
-
- public boolean isDefaultAutoCommit();
-
- public boolean isDefaultReadOnly();
-
- public int getDefaultTransactionIsolation();
-
- public String getConnectionProperties();
-
- public String getDefaultCatalog();
-
- public int getInitialSize();
-
- public int getMaxActive();
-
- public int getMaxIdle();
-
- public int getMinIdle();
-
- public int getMaxWait();
-
- public String getValidationQuery();
-
- public boolean isTestOnBorrow();
-
- public boolean isTestOnReturn();
-
- public boolean isTestWhileIdle();
-
- public int getTimeBetweenEvictionRunsMillis();
-
- public int getNumTestsPerEvictionRun();
-
- public int getMinEvictableIdleTimeMillis();
-
- public boolean isAccessToUnderlyingConnectionAllowed();
-
- public boolean isRemoveAbandoned();
-
- public int getRemoveAbandonedTimeout();
-
- public boolean isLogAbandoned();
-
- public int getLoginTimeout();
-
- public String getName();
-
- public String getPassword();
-
- public String getUsername();
-
- public long getValidationInterval();
-
- public String getInitSQL();
-
- public boolean isTestOnConnect();
-
- public String getJdbcInterceptors();
-
- public int getAbandonWhenPercentageFull();
-
- public long getMaxAge();
-
}
Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java?rev=793732&r1=793731&r2=793732&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CreateTestTable.java Mon Jul 13 22:18:17 2009
@@ -23,6 +23,8 @@
import java.util.Random;
import java.sql.ResultSet;
+import org.apache.tomcat.jdbc.pool.interceptor.ResetAbandonedTimer;
+
public class CreateTestTable extends DefaultTestCase {
public static volatile boolean recreate = Boolean.getBoolean("recreate");
@@ -59,6 +61,9 @@
}
public void testPopulateData() throws Exception {
+ init();
+ datasource.setJdbcInterceptors(ResetAbandonedTimer.class.getName());
+ System.out.println("FILIP Using URL:"+this.datasource.getUrl());
String insert = "insert into test values (?,?,?,?,?)";
this.init();
this.datasource.setRemoveAbandoned(false);
@@ -90,6 +95,7 @@
ps.executeBatch();
ps.close();
ps = con.prepareStatement(insert);
+ ps.setQueryTimeout(0);
}
}
Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java?rev=793732&r1=793731&r2=793732&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java Mon Jul 13 22:18:17 2009
@@ -62,11 +62,9 @@
timeBetweenEvictionRunsMillis = 5000;
numTestsPerEvictionRun = 0;
minEvictableIdleTimeMillis = 1000;
- accessToUnderlyingConnectionAllowed = false;
removeAbandoned = true;
removeAbandonedTimeout = 5000;
logAbandoned = true;
- loginTimeout = 0;
validationInterval = 0; //always validate
initSQL = null;
testOnConnect = false;;
Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java?rev=793732&r1=793731&r2=793732&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java Mon Jul 13 22:18:17 2009
@@ -25,6 +25,8 @@
import org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory;
import junit.framework.TestCase;
+
+import org.apache.tomcat.jdbc.pool.PoolConfiguration;
import org.apache.tomcat.jdbc.pool.PoolProperties;
import org.apache.tomcat.jdbc.pool.DataSourceProxy;
@@ -45,10 +47,15 @@
public DefaultTestCase(String name) {
super(name);
}
+
+ @Override
+ public void setUp() throws Exception {
+ init();
+ }
public org.apache.tomcat.jdbc.pool.DataSource createDefaultDataSource() {
org.apache.tomcat.jdbc.pool.DataSource datasource = null;
- PoolProperties p = new DefaultProperties();
+ PoolConfiguration p = new DefaultProperties();
p.setJmxEnabled(false);
p.setTestWhileIdle(false);
p.setTestOnBorrow(false);
Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java?rev=793732&r1=793731&r2=793732&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOAsyncExample.java Mon Jul 13 22:18:17 2009
@@ -21,12 +21,13 @@
import java.util.concurrent.Future;
import org.apache.tomcat.jdbc.pool.DataSource;
+import org.apache.tomcat.jdbc.pool.PoolConfiguration;
import org.apache.tomcat.jdbc.pool.PoolProperties;
public class SimplePOJOAsyncExample {
public static void main(String[] args) throws Exception {
- PoolProperties p = new PoolProperties();
+ PoolConfiguration p = new PoolProperties();
p.setFairQueue(true);
p.setUrl("jdbc:mysql://localhost:3306/mysql?autoReconnect=true");
p.setDriverClassName("com.mysql.jdbc.Driver");
Modified: tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOExample.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOExample.java?rev=793732&r1=793731&r2=793732&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOExample.java (original)
+++ tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/SimplePOJOExample.java Mon Jul 13 22:18:17 2009
@@ -21,12 +21,13 @@
import java.sql.Statement;
import org.apache.tomcat.jdbc.pool.DataSource;
+import org.apache.tomcat.jdbc.pool.PoolConfiguration;
import org.apache.tomcat.jdbc.pool.PoolProperties;
public class SimplePOJOExample {
public static void main(String[] args) throws Exception {
- PoolProperties p = new PoolProperties();
+ PoolConfiguration p = new PoolProperties();
p.setUrl("jdbc:mysql://localhost:3306/mysql?autoReconnect=true");
p.setDriverClassName("com.mysql.jdbc.Driver");
p.setUsername("root");
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org