From e6e25791d6b9c8360247d92340b0dccda33c86ed Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 27 Sep 2017 09:04:52 +0000 Subject: Revert "commons-dbcp2 -> tomcat-jdbc" This reverts commit a0fba35796e6dfb1188d716985e1d483bf1098c4. --- juick-server-jdbc/build.gradle | 2 +- .../src/main/java/com/juick/configuration/DataConfiguration.java | 6 +++--- .../src/main/java/com/juick/configuration/SearchConfiguration.java | 6 +++--- src/test/java/com/juick/tests/ApiTests.java | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/juick-server-jdbc/build.gradle b/juick-server-jdbc/build.gradle index 780048a7..a9da3dff 100644 --- a/juick-server-jdbc/build.gradle +++ b/juick-server-jdbc/build.gradle @@ -31,7 +31,7 @@ dependencies { compile "org.springframework:spring-context:${rootProject.springFrameworkVersion}" compile "org.springframework:spring-jdbc:${rootProject.springFrameworkVersion}" - providedCompile 'org.apache.tomcat:tomcat-jdbc:8.5.20' + providedCompile "org.apache.commons:commons-dbcp2:2.1.1" compile "com.googlecode.log4jdbc:log4jdbc:1.2" compile "javax.inject:javax.inject:1" 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")); diff --git a/src/test/java/com/juick/tests/ApiTests.java b/src/test/java/com/juick/tests/ApiTests.java index d97f84d2..51641c1d 100644 --- a/src/test/java/com/juick/tests/ApiTests.java +++ b/src/test/java/com/juick/tests/ApiTests.java @@ -32,6 +32,7 @@ import com.juick.service.TagService; import com.juick.service.UserService; import com.juick.service.search.SearchService; import com.juick.www.WebApp; +import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Test; @@ -52,7 +53,6 @@ import org.springframework.transaction.annotation.TransactionManagementConfigure import ru.sape.Sape; import javax.inject.Inject; -import javax.sql.DataSource; import java.lang.reflect.InvocationTargetException; import java.text.ParseException; import java.util.ArrayList; @@ -73,13 +73,13 @@ public class ApiTests { @ComponentScan(basePackages = {"com.juick.service", "com.juick.server.protocol"}) static class Config implements TransactionManagementConfigurer { @Bean - public DataSource dataSource() { + public BasicDataSource dataSource() { try { DB db = DB.newEmbeddedDB(33306); db.start(); db.createDB("juick"); db.source("schema.sql"); - org.apache.tomcat.jdbc.pool.DataSource dataSource = new org.apache.tomcat.jdbc.pool.DataSource(); + BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName("com.mysql.jdbc.Driver"); dataSource.setUrl("jdbc:mysql://localhost:33306/juick?autoReconnect=true&user=root"); -- cgit v1.2.3