X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Fspring%2Fmvc.xml;h=04c56376868a077ee5e43d319d1067f924c3c559;hb=1e489c1a5891883d2677c9531c2874ab7dec5ea0;hp=4bf0a0a4f7667d2cddca538ba46f19eaa1f8478a;hpb=5f04e60da58d3f37fbb2ad983ec7415ad54ff562;p=website

diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml
index 4bf0a0a4..04c56376 100644
--- a/src/main/resources/spring/mvc.xml
+++ b/src/main/resources/spring/mvc.xml
@@ -15,12 +15,15 @@
            http://www.springframework.org/schema/util/spring-util-4.0.xsd
            ">
 
-  <!-- Damit das DispatcherServlet auf /* gemappt werden kann -->
+  <!-- Resolve application-parameters through java-systemproperties -->
+  <context:property-placeholder location="classpath:website.properties" />
+
+  <!-- Necesarry, to map the DispatcherServlet on /* -->
   <mvc:default-servlet-handler/>
   <mvc:view-controller path="/" view-name="index"/>
 
   <!-- Scann classpath for classes anntated as components -->
-  <context:component-scan base-package="de.juplo.branding"/>
+  <context:component-scan base-package="de.juplo.website"/>
 
   <bean class="org.springframework.web.servlet.handler.SimpleUrlHandlerMapping">
     <property name="mappings">
@@ -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="${website.cacheable}" />
   </bean>
 
   <!-- Thymeleaf Spring4-Template-Engine -->
@@ -61,6 +67,7 @@
     <property name="additionalDialects">
       <util:set>
         <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
+        <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
       </util:set>
     </property>
   </bean>