From c825b607c725b5e0d10d826b65b6a183a81540e7 Mon Sep 17 00:00:00 2001 From: Alexander Alexeev Date: Fri, 11 Nov 2016 01:55:55 +0700 Subject: logback configurations are copied --- .../java/com/juick/configuration/DataConfiguration.java | 11 +++++++++++ juick-core/src/main/resources/logback.xml | 13 ------------- 2 files changed, 11 insertions(+), 13 deletions(-) delete mode 100644 juick-core/src/main/resources/logback.xml (limited to 'juick-core') diff --git a/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java b/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java index b140b873..62ca0f88 100644 --- a/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java +++ b/juick-core/src/main/java/com/juick/configuration/DataConfiguration.java @@ -1,9 +1,11 @@ package com.juick.configuration; import org.apache.commons.dbcp2.BasicDataSource; +import org.springframework.beans.factory.config.PlaceholderConfigurerSupport; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; +import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.core.env.Environment; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; @@ -24,6 +26,15 @@ public class DataConfiguration implements TransactionManagementConfigurer { @Resource private Environment env; + @Bean + public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() { + PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer(); + + configurer.setFileEncoding("utf-8"); + configurer.setOrder(0); + return configurer; + } + @Bean public DataSource dataSource() { BasicDataSource dataSource = new BasicDataSource(); diff --git a/juick-core/src/main/resources/logback.xml b/juick-core/src/main/resources/logback.xml deleted file mode 100644 index 9e3bf16c..00000000 --- a/juick-core/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - \ No newline at end of file -- cgit v1.2.3