[java-opensaml COMMIT] in /trunk/opensaml-storage-impl: pom.xml src/test/resources/org/opensaml/storage/impl/jpa-spri...

[noreply at shibboleth.net]

Author: dfisher
Date: Tue Feb 24 00:28:15 2015
New Revision: 4239

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4239&view=rev
Log:
Switch c3p0 for dbcp.

Modified:
    trunk/opensaml-storage-impl/pom.xml
    trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml

Modified: trunk/opensaml-storage-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/pom.xml?rev=4239&r1=4238&r2=4239&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/pom.xml (original)
+++ trunk/opensaml-storage-impl/pom.xml Tue Feb 24 00:28:15 2015
@@ -85,8 +85,9 @@
         </dependency>
 
         <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
             <scope>test</scope>
         </dependency>
 

Modified: trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml?rev=4239&r1=4238&r2=4239&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml (original)
+++ trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/jpa-spring-context.xml Tue Feb 24 00:28:15 2015
@@ -28,23 +28,23 @@
         <property name="database" value="HSQL" />
         <property name="generateDdl" value="true" />
         <property name="showSql" value="false"/>
-    </bean> 
-    <bean id="hibernateDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close" lazy-init="true"
-        p:driverClass="org.hsqldb.jdbcDriver"
-        p:jdbcUrl="jdbc:hsqldb:mem:JPAStorageService" p:user="SA" p:password="" p:acquireIncrement="3"
-        p:acquireRetryAttempts="24" p:acquireRetryDelay="5000" p:breakAfterAcquireFailure="true" p:minPoolSize="1"
-        p:maxPoolSize="5" p:maxIdleTime="300" p:idleConnectionTestPeriod="360" />
+    </bean>
+    <bean id="hibernateDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+       p:driverClassName="org.hsqldb.jdbcDriver"
+       p:url="jdbc:hsqldb:mem:JPAStorageService"
+       p:username="SA"
+       p:password="" />
 
     <!-- Postgres configuration -->
     <bean id="postgresJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
         <property name="database" value="POSTGRESQL" />
         <property name="generateDdl" value="true" />
     </bean> 
-    <bean id="postgresDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close" lazy-init="true"
-        p:driverClass="org.postgresql.Driver"
-        p:jdbcUrl="jdbc:postgresql://localhost:5432/storageservice" p:user="shib" p:password="p at ssw0rd" p:acquireIncrement="3"
-        p:acquireRetryAttempts="24" p:acquireRetryDelay="5000" p:breakAfterAcquireFailure="true" p:minPoolSize="1"
-        p:maxPoolSize="5" p:maxIdleTime="300" p:idleConnectionTestPeriod="360" />
+    <bean id="postgresDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+       p:driverClassName="org.postgresql.Driver"
+       p:url="jdbc:postgresql://localhost:5432/storageservice"
+       p:username="shib"
+       p:password="p at ssw0rd" />
 
     <!-- MySQL configuration -->
     <bean id="mysqlJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
@@ -52,11 +52,11 @@
         <property name="databasePlatform" value="org.hibernate.dialect.MySQLDialect" />
         <property name="generateDdl" value="true" />
     </bean>
-    <bean id="mysqlDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close" lazy-init="true"
-        p:driverClass="com.mysql.jdbc.Driver"
-        p:jdbcUrl="jdbc:mysql://localhost:3306/storageservice" p:user="shib" p:password="p at ssw0rd" p:acquireIncrement="3"
-        p:acquireRetryAttempts="24" p:acquireRetryDelay="5000" p:breakAfterAcquireFailure="true" p:minPoolSize="1"
-        p:maxPoolSize="5" p:maxIdleTime="300" p:idleConnectionTestPeriod="360" />
+    <bean id="mysqlDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" lazy-init="true"
+       p:driverClassName="com.mysql.jdbc.Driver"
+       p:url="jdbc:mysql://localhost:3306/storageservice"
+       p:username="shib"
+       p:password="p at ssw0rd" />
 
     <!-- Oracle configuration
     
@@ -73,10 +73,10 @@
         <property name="databasePlatform" value="org.hibernate.dialect.OracleDialect" />
         <property name="generateDdl" value="true" />
     </bean> 
-    <bean id="oracleDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close" lazy-init="true"

[... 12 lines stripped ...]