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

diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml
index a18d7398..04c56376 100644
--- a/src/main/resources/spring/mvc.xml
+++ b/src/main/resources/spring/mvc.xml
@@ -3,6 +3,7 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
        xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
@@ -10,18 +11,24 @@
            http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
            http://www.springframework.org/schema/context
            http://www.springframework.org/schema/context/spring-context-3.1.xsd
+           http://www.springframework.org/schema/util
+           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">
       <value>
+        /thymeleaf/**=staticResources
         /*.html=urlFilenameViewController
         /**/*.html=urlFilenameViewController
       </value>
@@ -29,24 +36,40 @@
     <property name="order" value="10"/>
   </bean>
   <bean id="urlFilenameViewController" class="org.springframework.web.servlet.mvc.UrlFilenameViewController"/>
+  <bean id="staticResources" class="org.springframework.web.servlet.resource.ResourceHttpRequestHandler">
+    <property name="locations">
+      <list>
+        <value>/thymeleaf/</value>
+      </list>
+    </property>
+  </bean>
+
+  <!-- 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>
 
-  <!-- Tiles View-Resolver -->
-  <bean class="org.springframework.web.servlet.view.tiles3.TilesViewResolver"/>
 
-  <!-- Resolves view names to protected .jsp resources within the /WEB-INF/views directory -->
-  <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-    <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
-    <property name="prefix" value="/WEB-INF/views/"/>
-    <property name="suffix" value=".jsp"/>
+  <!-- Thymeleaf Template-Resolver -->
+  <bean id="templateResolver" class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
+    <property name="prefix" value="/thymeleaf/" />
+    <property name="suffix" value=".html" />
+    <property name="templateMode" value="HTML5" />
+    <property name="characterEncoding" value="UTF-8" />
+    <property name="cacheable" value="${website.cacheable}" />
   </bean>
 
-  <bean class="org.springframework.web.servlet.view.tiles3.TilesConfigurer">
-    <property name="definitions">
-      <list>
-        <value>classpath:/spring/tiles.xml</value>
-      </list>
+  <!-- Thymeleaf Spring4-Template-Engine -->
+  <bean id="templateEngine" class="org.thymeleaf.spring4.SpringTemplateEngine">
+    <property name="templateResolver" ref="templateResolver" />
+    <property name="additionalDialects">
+      <util:set>
+        <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
+        <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
+      </util:set>
     </property>
-    <property name="useMutableTilesContainer" value="true"/>
   </bean>
 
 </beans>