You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2017/09/24 19:03:43 UTC
svn commit: r1809536 - in /commons/proper/jcs/trunk/commons-jcs-core/src:
main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/
main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/
test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/ test/t...
Author: tv
Date: Sun Sep 24 19:03:42 2017
New Revision: 1809536
URL: http://svn.apache.org/viewvc?rev=1809536&view=rev
Log:
Update dependency commons-dbcp2
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCache.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCache.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf
commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestMySQLDiskCache.ccf
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheAttributes.java Sun Sep 24 19:03:42 2017
@@ -63,10 +63,10 @@ public class JDBCDiskCacheAttributes
private boolean testBeforeInsert = true;
/** This is the default limit on the maximum number of active connections. */
- public static final int DEFAULT_MAX_ACTIVE = 10;
+ public static final int DEFAULT_MAX_TOTAL = 10;
/** Max connections allowed */
- private int maxActive = DEFAULT_MAX_ACTIVE;
+ private int maxTotal = DEFAULT_MAX_TOTAL;
/** This is the default setting for the cleanup routine. */
public static final int DEFAULT_SHRINKER_INTERVAL_SECONDS = 300;
@@ -243,19 +243,19 @@ public class JDBCDiskCacheAttributes
}
/**
- * @param maxActive The maxActive to set.
+ * @param maxTotal The maxTotal to set.
*/
- public void setMaxActive( int maxActive )
+ public void setMaxTotal( int maxActive )
{
- this.maxActive = maxActive;
+ this.maxTotal = maxActive;
}
/**
- * @return Returns the maxActive.
+ * @return Returns the maxTotal.
*/
- public int getMaxActive()
+ public int getMaxTotal()
{
- return maxActive;
+ return maxTotal;
}
/**
@@ -322,7 +322,7 @@ public class JDBCDiskCacheAttributes
buf.append( "\n DriverClassName [" + getDriverClassName() + "]" );
buf.append( "\n TableName [" + getTableName() + "]" );
buf.append( "\n TestBeforeInsert [" + isTestBeforeInsert() + "]" );
- buf.append( "\n MaxActive [" + getMaxActive() + "]" );
+ buf.append( "\n MaxActive [" + getMaxTotal() + "]" );
buf.append( "\n AllowRemoveAll [" + isAllowRemoveAll() + "]" );
buf.append( "\n ShrinkerIntervalSeconds [" + getShrinkerIntervalSeconds() + "]" );
buf.append( "\n useDiskShrinker [" + isUseDiskShrinker() + "]" );
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java Sun Sep 24 19:03:42 2017
@@ -24,9 +24,9 @@ import java.sql.SQLException;
import javax.sql.ConnectionPoolDataSource;
import javax.sql.DataSource;
-import org.apache.commons.dbcp.cpdsadapter.DriverAdapterCPDS;
-import org.apache.commons.dbcp.datasources.InstanceKeyDataSource;
-import org.apache.commons.dbcp.datasources.SharedPoolDataSource;
+import org.apache.commons.dbcp2.cpdsadapter.DriverAdapterCPDS;
+import org.apache.commons.dbcp2.datasources.InstanceKeyDataSource;
+import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.apache.commons.jcs.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -79,7 +79,7 @@ public class SharedPoolDataSourceFactory
SharedPoolDataSource dataSource = new SharedPoolDataSource();
initJdbc2Pool(dataSource, config);
dataSource.setConnectionPoolDataSource(cpds);
- dataSource.setMaxActive(config.getMaxActive());
+ dataSource.setMaxTotal(config.getMaxTotal());
this.ds = dataSource;
}
@@ -127,7 +127,6 @@ public class SharedPoolDataSourceFactory
cpds.setUrl(config.getUrl());
cpds.setUser(config.getUserName());
cpds.setPassword(config.getPassword());
- cpds.setMaxActive(config.getMaxActive());
return cpds;
}
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDataSourceFactoryUnitTest.java Sun Sep 24 19:03:42 2017
@@ -30,14 +30,14 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.spi.InitialContextFactory;
-import junit.framework.TestCase;
-
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.dbcp.datasources.SharedPoolDataSource;
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.JndiDataSourceFactory;
import org.apache.commons.jcs.auxiliary.disk.jdbc.dsfactory.SharedPoolDataSourceFactory;
+import junit.framework.TestCase;
+
/** Unit tests for the data source factories */
public class JDBCDataSourceFactoryUnitTest
extends TestCase
@@ -81,7 +81,7 @@ public class JDBCDataSourceFactoryUnitTe
// VERIFY
assertEquals( "Wrong pool name", poolName, spds.getDescription() );
- assertEquals( "Wrong maxActive value", maxActive, spds.getMaxActive() );
+ assertEquals( "Wrong maxActive value", maxActive, spds.getMaxTotal() );
}
/** Verify that we can configure the object based on the attributes.
@@ -103,7 +103,7 @@ public class JDBCDataSourceFactoryUnitTe
cattr.setUrl(url);
cattr.setUserName(userName);
cattr.setPassword(password);
- cattr.setMaxActive(maxActive);
+ cattr.setMaxTotal(maxActive);
cattr.setDriverClassName(driverClassName);
// DO WORK
@@ -114,7 +114,7 @@ public class JDBCDataSourceFactoryUnitTe
assertNotNull( "Should have a data source class", spds );
// VERIFY
- assertEquals( "Wrong maxActive value", maxActive, spds.getMaxActive() );
+ assertEquals( "Wrong maxActive value", maxActive, spds.getMaxTotal() );
}
/** Verify that we can configure the object based on JNDI.
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCache.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCache.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCache.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCache.ccf Sun Sep 24 19:03:42 2017
@@ -51,7 +51,7 @@ jcs.auxiliary.HSQL.attributes.url=jdbc:h
jcs.auxiliary.HSQL.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.HSQL.attributes.tableName=JCS_STORE3
jcs.auxiliary.HSQL.attributes.testBeforeInsert=false
-jcs.auxiliary.HSQL.attributes.maxActive=15
+jcs.auxiliary.HSQL.attributes.maxTotal=15
jcs.auxiliary.HSQL.attributes.allowRemoveAll=true
jcs.auxiliary.HSQL.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.HSQL.attributes.EventQueueType=SINGLE
@@ -65,7 +65,7 @@ jcs.auxiliary.HSQL_NORA.attributes.url=j
jcs.auxiliary.HSQL_NORA.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.HSQL_NORA.attributes.tableName=JCS_STORE4
jcs.auxiliary.HSQL_NORA.attributes.testBeforeInsert=false
-jcs.auxiliary.HSQL_NORA.attributes.maxActive=15
+jcs.auxiliary.HSQL_NORA.attributes.maxTotal=15
jcs.auxiliary.HSQL_NORA.attributes.allowRemoveAll=false
jcs.auxiliary.HSQL_NORA.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.HSQL_NORA.attributes.EventQueueType=POOLED
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestHSQLDiskCacheConcurrent.ccf Sun Sep 24 19:03:42 2017
@@ -51,7 +51,7 @@ jcs.auxiliary.HSQL.attributes.url=jdbc:h
jcs.auxiliary.HSQL.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.HSQL.attributes.tableName=JCS_STORE3
jcs.auxiliary.HSQL.attributes.testBeforeInsert=false
-jcs.auxiliary.HSQL.attributes.maxActive=15
+jcs.auxiliary.HSQL.attributes.maxTotal=15
jcs.auxiliary.HSQL.attributes.allowRemoveAll=true
jcs.auxiliary.HSQL.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.HSQL.attributes.EventQueueType=POOLED
@@ -66,7 +66,7 @@ jcs.auxiliary.HSQL_NORA.attributes.url=j
jcs.auxiliary.HSQL_NORA.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.HSQL_NORA.attributes.tableName=JCS_STORE4
jcs.auxiliary.HSQL_NORA.attributes.testBeforeInsert=false
-jcs.auxiliary.HSQL_NORA.attributes.maxActive=15
+jcs.auxiliary.HSQL_NORA.attributes.maxTotal=15
jcs.auxiliary.HSQL_NORA.attributes.allowRemoveAll=false
jcs.auxiliary.HSQL_NORA.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.HSQL_NORA.attributes.EventQueueType=POOLED
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCache.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCache.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCache.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCache.ccf Sun Sep 24 19:03:42 2017
@@ -43,7 +43,7 @@ jcs.auxiliary.JDBC.attributes.url=jdbc:h
jcs.auxiliary.JDBC.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.JDBC.attributes.tableName=JCS_STORE2
jcs.auxiliary.JDBC.attributes.testBeforeInsert=false
-jcs.auxiliary.JDBC.attributes.maxActive=15
+jcs.auxiliary.JDBC.attributes.maxTotal=15
jcs.auxiliary.JDBC.attributes.allowRemoveAll=true
jcs.auxiliary.JDBC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.JDBC.attributes.EventQueueType=POOLED
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheRemoval.ccf Sun Sep 24 19:03:42 2017
@@ -43,7 +43,7 @@ jcs.auxiliary.JDBC.attributes.url=jdbc:h
jcs.auxiliary.JDBC.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.JDBC.attributes.tableName=${DATABASE_NAME}
jcs.auxiliary.JDBC.attributes.testBeforeInsert=false
-jcs.auxiliary.JDBC.attributes.maxActive=15
+jcs.auxiliary.JDBC.attributes.maxTotal=15
jcs.auxiliary.JDBC.attributes.allowRemoveAll=true
jcs.auxiliary.JDBC.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.JDBC.attributes.EventQueueType=POOLED
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheSharedPool.ccf Sun Sep 24 19:03:42 2017
@@ -69,7 +69,7 @@ jcs.jdbcconnectionpool.MySharedPool.attr
jcs.jdbcconnectionpool.MySharedPool.attributes.password=
jcs.jdbcconnectionpool.MySharedPool.attributes.url=jdbc:hsqldb:target/cache_hsql_db_sharedpool
jcs.jdbcconnectionpool.MySharedPool.attributes.driverClassName=org.hsqldb.jdbcDriver
-jcs.jdbcconnectionpool.MySharedPool.attributes.maxActive=15
+jcs.jdbcconnectionpool.MySharedPool.attributes.maxTotal=15
# #############################################################
# ################# OPTIONAL THREAD POOL CONFIGURATION #########
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestJDBCDiskCacheShrink.ccf Sun Sep 24 19:03:42 2017
@@ -64,7 +64,7 @@ jcs.auxiliary.JDBC.attributes.url=jdbc:h
jcs.auxiliary.JDBC.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.JDBC.attributes.tableName=JCS_STORE_SHRINK
jcs.auxiliary.JDBC.attributes.testBeforeInsert=false
-jcs.auxiliary.JDBC.attributes.maxActive=14
+jcs.auxiliary.JDBC.attributes.maxTotal=14
jcs.auxiliary.JDBC.attributes.allowRemoveAll=true
jcs.auxiliary.JDBC.attributes.MaxPurgatorySize=9999
jcs.auxiliary.JDBC.attributes.UseDiskShrinker=true
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestMySQLDiskCache.ccf
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestMySQLDiskCache.ccf?rev=1809536&r1=1809535&r2=1809536&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestMySQLDiskCache.ccf (original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/test-conf/TestMySQLDiskCache.ccf Sun Sep 24 19:03:42 2017
@@ -45,7 +45,7 @@ jcs.auxiliary.MYSQL.attributes.url=jdbc:
jcs.auxiliary.MYSQL.attributes.driverClassName=org.hsqldb.jdbcDriver
jcs.auxiliary.MYSQL.attributes.tableName=JCS_STORE_MYSQL
jcs.auxiliary.MYSQL.attributes.testBeforeInsert=false
-jcs.auxiliary.MYSQL.attributes.maxActive=15
+jcs.auxiliary.MYSQL.attributes.maxTotal=15
jcs.auxiliary.MYSQL.attributes.allowRemoveAll=true
jcs.auxiliary.MYSQL.attributes.MaxPurgatorySize=10000000
jcs.auxiliary.MYSQL.attributes.optimizationSchedule=12:34:56,02:34:54