12 files changed, 133 insertions, 0 deletions
diff --git a/juick-core/src/main/resources/logback.xml b/juick-api/src/main/webapp/resources/logback.xml
index 9e3bf16c..9e3bf16c 100644
--- a/juick-core/src/main/resources/logback.xml
+++ b/juick-api/src/main/webapp/resources/logback.xml
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;
@@ -25,6 +27,15 @@ public class DataConfiguration implements TransactionManagementConfigurer {
     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-crosspost/src/main/java/com/juick/components/configuration/CrosspostConfiguration.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostConfiguration.java
index 069037ee..8ae511c4 100644
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostConfiguration.java
+++ b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostConfiguration.java
@@ -8,10 +8,12 @@ import com.mitchellbosecke.pebble.loader.Loader;
 import com.mitchellbosecke.pebble.loader.ServletLoader;
 import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
 import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
+import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 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.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -43,6 +45,15 @@ public class CrosspostConfiguration extends WebMvcConfigurationSupport {
     private JdbcTemplate jdbc;
 
     @Bean
+    public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() {
+        PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer();
+
+        configurer.setFileEncoding("utf-8");
+        configurer.setOrder(1);
+        return configurer;
+    }
+
+    @Bean
     public Loader templateLoader() {
         return new ServletLoader(servletContext);
     }
diff --git a/juick-crosspost/src/main/resources/logback.xml b/juick-crosspost/src/main/resources/logback.xml
new file mode 100644
index 00000000..9e3bf16c
--- /dev/null
+++ b/juick-crosspost/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+\ No newline at end of file
diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsConfiguration.java
index d42549ef..7410648a 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsConfiguration.java
@@ -8,10 +8,12 @@ import com.mitchellbosecke.pebble.loader.Loader;
 import com.mitchellbosecke.pebble.loader.ServletLoader;
 import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
 import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
+import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 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.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -41,6 +43,15 @@ public class NotificationsConfiguration extends WebMvcConfigurationSupport {
     private ServletContext servletContext;
 
     @Bean
+    public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() {
+        PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer();
+
+        configurer.setFileEncoding("utf-8");
+        configurer.setOrder(1);
+        return configurer;
+    }
+
+    @Bean
     RestTemplate rest() {
         return new RestTemplate();
     }
diff --git a/juick-notifications/src/main/resources/logback.xml b/juick-notifications/src/main/resources/logback.xml
new file mode 100644
index 00000000..9e3bf16c
--- /dev/null
+++ b/juick-notifications/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+\ No newline at end of file
diff --git a/juick-rss/src/main/resources/logback.xml b/juick-rss/src/main/resources/logback.xml
new file mode 100644
index 00000000..9e3bf16c
--- /dev/null
+++ b/juick-rss/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+\ No newline at end of file
diff --git a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
index db37edc4..0a2a91fa 100644
--- a/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
+++ b/juick-ws/src/main/java/com/juick/ws/configuration/WebsocketConfiguration.java
@@ -9,10 +9,12 @@ import com.mitchellbosecke.pebble.loader.Loader;
 import com.mitchellbosecke.pebble.loader.ServletLoader;
 import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
 import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
+import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 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.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -49,6 +51,15 @@ public class WebsocketConfiguration extends WebMvcConfigurationSupport implement
     private ServletContext servletContext;
 
     @Bean
+    public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() {
+        PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer();
+
+        configurer.setFileEncoding("utf-8");
+        configurer.setOrder(1);
+        return configurer;
+    }
+
+    @Bean
     public WebsocketComponent wsHandler() {
         return new WebsocketComponent();
     }
diff --git a/juick-ws/src/main/resources/logback.xml b/juick-ws/src/main/resources/logback.xml
new file mode 100644
index 00000000..9e3bf16c
--- /dev/null
+++ b/juick-ws/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+\ No newline at end of file
diff --git a/juick-www/src/main/resources/logback.xml b/juick-www/src/main/resources/logback.xml
new file mode 100644
index 00000000..9e3bf16c
--- /dev/null
+++ b/juick-www/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+\ No newline at end of file
diff --git a/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPConfiguration.java b/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPConfiguration.java
index c4bdd117..13ac2a9d 100644
--- a/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPConfiguration.java
+++ b/juick-xmpp/src/main/java/com/juick/components/configuration/XMPPConfiguration.java
@@ -8,10 +8,12 @@ import com.mitchellbosecke.pebble.loader.Loader;
 import com.mitchellbosecke.pebble.loader.ServletLoader;
 import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
 import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
+import org.springframework.beans.factory.config.PlaceholderConfigurerSupport;
 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.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.env.Environment;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
@@ -43,6 +45,15 @@ public class XMPPConfiguration extends WebMvcConfigurationSupport {
     private ServletContext servletContext;
 
     @Bean
+    public static PlaceholderConfigurerSupport propertySourcesPlaceholderConfigurer() {
+        PlaceholderConfigurerSupport configurer = new PropertySourcesPlaceholderConfigurer();
+
+        configurer.setFileEncoding("utf-8");
+        configurer.setOrder(1);
+        return configurer;
+    }
+
+    @Bean
     public Loader templateLoader() {
         return new ServletLoader(servletContext);
     }
diff --git a/juick-xmpp/src/main/resources/logback.xml b/juick-xmpp/src/main/resources/logback.xml
new file mode 100644
index 00000000..9e3bf16c
--- /dev/null
+++ b/juick-xmpp/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
+\ No newline at end of file