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

diff --git a/src/main/resources/spring/mvc.xml b/src/main/resources/spring/mvc.xml
index 87c2a010..50f4fc70 100644
--- a/src/main/resources/spring/mvc.xml
+++ b/src/main/resources/spring/mvc.xml
@@ -44,26 +44,6 @@
   <!-- Thymeleaf Spring-View-Resolver -->
   <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
     <property name="templateEngine" ref="templateEngine" />
-    <property name="viewNames" value="views/*,templates/*"/>
-    <property name="order" value="1"/>
-  </bean>
-
-  <!-- Thymeleaf Tiles-View-Resolver -->
-  <bean class="org.thymeleaf.spring4.view.ThymeleafViewResolver">
-    <property name="templateEngine" ref="templateEngine" />
-    <property name="viewClass" value="org.thymeleaf.extras.tiles2.spring4.web.view.ThymeleafTilesView"/>
-    <property name="order" value="2"/>
-  </bean>
-
-
-  <!-- Thymeleaf Tiles-Configurer -->
-  <bean class="org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer">
-    <property name="definitions">
-      <list>
-        <value>classpath:/spring/tiles.xml</value>
-      </list>
-    </property>
-    <property name="useMutableTilesContainer" value="true"/>
   </bean>
 
 
@@ -80,7 +60,8 @@
     <property name="templateResolver" ref="templateResolver" />
     <property name="additionalDialects">
       <util:set>
-        <bean class="org.thymeleaf.extras.tiles2.dialect.TilesDialect"/>
+        <bean class="nz.net.ultraq.thymeleaf.LayoutDialect"/>
+        <bean class="org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect"/>
       </util:set>
     </property>
   </bean>