From ffb24e0d469aaafa35ad5f460a7bdf771382f0ff Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 16 Nov 2016 14:30:50 +0300 Subject: server-core -> juick-server --- .../com/juick/configuration/DataConfiguration.java | 57 ---------------------- 1 file changed, 57 deletions(-) delete mode 100644 server-core/src/main/java/com/juick/configuration/DataConfiguration.java (limited to 'server-core/src/main/java/com/juick/configuration/DataConfiguration.java') diff --git a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java b/server-core/src/main/java/com/juick/configuration/DataConfiguration.java deleted file mode 100644 index 88fc00b3..00000000 --- a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.juick.configuration; - -import org.apache.commons.dbcp2.BasicDataSource; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; -import org.springframework.core.env.Environment; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.datasource.DataSourceTransactionManager; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.transaction.annotation.TransactionManagementConfigurer; - -import javax.annotation.Resource; -import javax.sql.DataSource; - -/** - * Created by aalexeev on 11/11/16. - */ -@Configuration -@EnableTransactionManagement -@PropertySource(value = {"classpath:juick.conf"}) -@ComponentScan(basePackages = {"com.juick.service"}) -public class DataConfiguration implements TransactionManagementConfigurer { - @Resource - private Environment env; - - @Bean - public DataSource dataSource() { - BasicDataSource dataSource = new BasicDataSource(); - - dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver")); - dataSource.setUrl(env.getProperty("datasource_url")); - dataSource.setUsername(env.getProperty("datasource_user", "")); - dataSource.setPassword(env.getProperty("datasource_password", "")); - - dataSource.setValidationQuery("select 1"); - - return dataSource; - } - - @Bean - public PlatformTransactionManager transactionManager() { - return new DataSourceTransactionManager(dataSource()); - } - - @Override - public PlatformTransactionManager annotationDrivenTransactionManager() { - return transactionManager(); - } - - @Bean - public JdbcTemplate jdbcTemplate() { - return new JdbcTemplate(dataSource()); - } -} -- cgit v1.2.3