From 0a7ef4042da3347de11cee4d5d26a5f3b19ee20c Mon Sep 17 00:00:00 2001
From: Rick Herrick <jrherrick@wustl.edu>
Date: Fri, 13 May 2016 20:57:18 -0500
Subject: [PATCH] Changed datasource class, added properties for database
connection pooling control to xnat-conf.properties.
---
.../java/org/nrg/xnat/initialization/DatabaseConfig.java | 4 ++--
src/main/webapp/WEB-INF/conf/xnat-conf.properties | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/initialization/DatabaseConfig.java b/src/main/java/org/nrg/xnat/initialization/DatabaseConfig.java
index 60a1063b..fc9a179b 100644
--- a/src/main/java/org/nrg/xnat/initialization/DatabaseConfig.java
+++ b/src/main/java/org/nrg/xnat/initialization/DatabaseConfig.java
@@ -1,5 +1,6 @@
package org.nrg.xnat.initialization;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.nrg.framework.exceptions.NrgServiceError;
import org.nrg.framework.exceptions.NrgServiceException;
import org.nrg.framework.utilities.Beans;
@@ -10,7 +11,6 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.SimpleDriverDataSource;
import javax.inject.Inject;
import javax.sql.DataSource;
@@ -26,7 +26,7 @@ public class DatabaseConfig {
public static final String DEFAULT_DATASOURCE_URL = "jdbc:postgresql://localhost/xnat";
public static final String DEFAULT_DATASOURCE_USERNAME = "xnat";
public static final String DEFAULT_DATASOURCE_PASSWORD = "xnat";
- public static final String DEFAULT_DATASOURCE_CLASS = SimpleDriverDataSource.class.getName();
+ public static final String DEFAULT_DATASOURCE_CLASS = BasicDataSource.class.getName();
public static final String DEFAULT_DATASOURCE_DRIVER = Driver.class.getName();
@Bean
diff --git a/src/main/webapp/WEB-INF/conf/xnat-conf.properties b/src/main/webapp/WEB-INF/conf/xnat-conf.properties
index 0592e4d2..ea775bca 100644
--- a/src/main/webapp/WEB-INF/conf/xnat-conf.properties
+++ b/src/main/webapp/WEB-INF/conf/xnat-conf.properties
@@ -10,13 +10,12 @@ datasource.driver=org.postgresql.Driver
datasource.url=jdbc:postgresql://localhost/xnat
datasource.username=xnat
datasource.password=xnat
+datasource.initialSize=20
+datasource.maxTotal=40
+datasource.maxIdle=10
hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect
hibernate.hbm2ddl.auto=update
hibernate.show_sql=false
hibernate.cache.use_second_level_cache=true
hibernate.cache.use_query_cache=true
-
-amq.usage.temp=128mb
-amq.usage.mem=512mb
-amq.usage.store=1gb
--
GitLab