aboutsummaryrefslogtreecommitdiff
path: root/juick-server-jdbc/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-27 09:04:52 +0000
committerGravatar Vitaly Takmazov2017-09-27 09:04:52 +0000
commite6e25791d6b9c8360247d92340b0dccda33c86ed (patch)
treeccabbfc977fe748290ea493ed99822dd89044bf9 /juick-server-jdbc/src
parent5807d0d11b6694bfaac0d83c6bd3960c2a4f7827 (diff)
Revert "commons-dbcp2 -> tomcat-jdbc"
This reverts commit a0fba35796e6dfb1188d716985e1d483bf1098c4.
Diffstat (limited to 'juick-server-jdbc/src')
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java6
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java6
2 files changed, 6 insertions, 6 deletions
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
index c4c77b40..394e7639 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -18,6 +18,7 @@
package com.juick.configuration;
import com.juick.service.search.SearchService;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.*;
import org.springframework.core.env.Environment;
@@ -28,7 +29,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.transaction.annotation.TransactionManagementConfigurer;
import javax.annotation.Resource;
-import javax.sql.DataSource;
import java.util.Collections;
import java.util.List;
@@ -46,8 +46,8 @@ public class DataConfiguration implements TransactionManagementConfigurer {
// NOTE: The close() method will be called automatically with default @Bean settings
// But Datasource interface has no close() method
@Bean
- public DataSource dataSource() {
- org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource();
+ public BasicDataSource dataSource() {
+ BasicDataSource dataSource = new BasicDataSource();
dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
dataSource.setUrl(env.getProperty("datasource_url"));
diff --git a/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java b/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
index 90dcefdc..e3c244d8 100644
--- a/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
+++ b/juick-server-jdbc/src/main/java/com/juick/configuration/SearchConfiguration.java
@@ -19,6 +19,7 @@ package com.juick.configuration;
import com.juick.service.search.SearchService;
import com.juick.service.search.SphinxSearchServiceImpl;
+import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -27,7 +28,6 @@ import org.springframework.context.annotation.PropertySource;
import org.springframework.core.env.Environment;
import javax.annotation.Resource;
-import javax.sql.DataSource;
/**
* Created by aalexeev on 11/18/16.
@@ -41,8 +41,8 @@ public class SearchConfiguration {
// NOTE: The close() method will be called automatically with default @Bean settings
// But Datasource interface has no close() method
@Bean
- public DataSource searchDataSource() {
- org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource();
+ public BasicDataSource searchDataSource() {
+ BasicDataSource dataSource = new BasicDataSource();
dataSource.setDriverClassName(env.getProperty("sphinx_driver", "com.mysql.jdbc.Driver"));
dataSource.setUrl(env.getProperty("sphinx_url"));