From c19397fb6d4635120a1a8cdaef6d66f0b36e3c4b Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 20 Jul 2016 15:12:34 +0300 Subject: DriverManagerDataSource -> BasicDataSource --- juick-rss/src/main/java/com/juick/rss/Main.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'juick-rss/src/main/java/com/juick') diff --git a/juick-rss/src/main/java/com/juick/rss/Main.java b/juick-rss/src/main/java/com/juick/rss/Main.java index fd4deca3..46e06677 100644 --- a/juick-rss/src/main/java/com/juick/rss/Main.java +++ b/juick-rss/src/main/java/com/juick/rss/Main.java @@ -20,8 +20,8 @@ package com.juick.rss; import com.juick.Message; import com.juick.server.MessagesQueries; import com.juick.server.UserQueries; +import org.apache.commons.dbcp2.BasicDataSource; import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.datasource.DriverManagerDataSource; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; @@ -52,7 +52,7 @@ public class Main extends HttpServlet { try { Properties conf = new Properties(); conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf")); - DriverManagerDataSource dataSource = new DriverManagerDataSource(); + BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver")); dataSource.setUrl(conf.getProperty("datasource_url")); sql = new JdbcTemplate(dataSource); -- cgit v1.2.3