X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fspring%2Fmvc.xml;h=bd792076c6d03ad4aaba475c893b6e08c2dc76bb;hb=139f3dc60fb1a679c636d9dcc36faeb8400fa165;hp=50f4fc70eb1529c9dff508291f209d2bf09ca671;hpb=7967465800f4235b769e7151d5986ca92fc2a0ff;p=website

diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml
index 50f4fc70..bd792076 100644
--- a/src/main/resources/spring/mvc.xml
+++ b/src/main/resources/spring/mvc.xml
@@ -15,6 +15,9 @@
            http://www.springframework.org/schema/util/spring-util-4.0.xsd
            ">
 
+  <!-- Anwendungs-Parameter über Java-Systemproperties auflösen -->
+  <context:property-placeholder location="classpath:branding.properties" />
+
   <!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
   <mvc:default-servlet-handler/>
   <mvc:view-controller path="/" view-name="index"/>
@@ -44,6 +47,8 @@
   <!-- Thymeleaf Spring-View-Resolver -->
   <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
     <property name="templateEngine" ref="templateEngine" />
+    <property name="characterEncoding" value="UTF-8" />
+    <property name="contentType" value="text/html; charset=UTF-8" />
   </bean>
 
 
@@ -52,7 +57,8 @@
     <property name="prefix" value="/thymeleaf/" />
     <property name="suffix" value=".html" />
     <property name="templateMode" value="HTML5" />
-    <property name="cacheable" value="false" /><!-- Only for development -->
+    <property name="characterEncoding" value="UTF-8" />
+    <property name="cacheable" value="${branding.cacheable}" />
   </bean>
 
   <!-- Thymeleaf Spring4-Template-Engine -->