aboutsummaryrefslogtreecommitdiff
path: root/server-core/src/main/java/com/juick/configuration
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-11-16 14:30:50 +0300
committerGravatar Vitaly Takmazov2016-11-16 16:21:53 +0300
commitffb24e0d469aaafa35ad5f460a7bdf771382f0ff (patch)
tree0d8fc9114b916f9058cccb01fcf8281a0a209284 /server-core/src/main/java/com/juick/configuration
parente8faf851327a12f28ae664a6f7db6c844d0ba9bf (diff)
server-core -> juick-server
Diffstat (limited to 'server-core/src/main/java/com/juick/configuration')
-rw-r--r--server-core/src/main/java/com/juick/configuration/DataConfiguration.java57
1 files changed, 0 insertions, 57 deletions
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());
- }
-}