booking-mvc now works

Author: rstoyanchev

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebFlowConfig.java

@@ -45,7 +45,7 @@ public FlowBuilderServices flowBuilderServices() {
 	@Bean
 	public MvcViewFactoryCreator mvcViewFactoryCreator() {
 		MvcViewFactoryCreator factoryCreator = new MvcViewFactoryCreator();
-		factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.tilesViewResolver()));
+		factoryCreator.setViewResolvers(Collections.singletonList(this.webMvcConfig.viewResolver()));
 		factoryCreator.setUseSpringBeanBinding(true);
 		return factoryCreator;
 	}

booking-mvc/src/main/java/org/springframework/webflow/samples/booking/config/WebMvcConfig.java

@@ -1,32 +1,24 @@
 package org.springframework.webflow.samples.booking.config;
 
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.ViewResolverRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.view.tiles3.TilesConfigurer;
 import org.springframework.webflow.mvc.servlet.FlowHandlerAdapter;
 import org.springframework.webflow.mvc.servlet.FlowHandlerMapping;
+import org.springframework.webflow.mvc.view.AjaxUrlBasedViewResolver;
+import org.springframework.webflow.mvc.view.FlowAjaxTiles3View;
 import org.springframework.webflow.samples.booking.BookingFlowHandler;
-import org.thymeleaf.dialect.IDialect;
-import org.thymeleaf.extras.conditionalcomments.dialect.ConditionalCommentsDialect;
-import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
-import org.thymeleaf.extras.tiles2.dialect.TilesDialect;
-import org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer;
-import org.thymeleaf.extras.tiles2.spring4.web.view.FlowAjaxThymeleafTilesView;
-import org.thymeleaf.spring4.SpringTemplateEngine;
-import org.thymeleaf.spring4.view.AjaxThymeleafViewResolver;
-import org.thymeleaf.templateresolver.ServletContextTemplateResolver;
 
 @EnableWebMvc
 @Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
 
 	@Autowired
 	private WebFlowConfig webFlowConfig;
@@ -70,38 +62,15 @@ public BookingFlowHandler BookingFlowHandler() {
 	}
 
 	@Bean
-	public AjaxThymeleafViewResolver tilesViewResolver() {
-		AjaxThymeleafViewResolver viewResolver = new AjaxThymeleafViewResolver();
-		viewResolver.setViewClass(FlowAjaxThymeleafTilesView.class);
-		viewResolver.setTemplateEngine(templateEngine());
-		return viewResolver;
-	}
-
-	@Bean
-	public SpringTemplateEngine templateEngine(){
-
-		Set<IDialect> dialects = new LinkedHashSet<IDialect>();
-		dialects.add(new TilesDialect());
-		dialects.add(new SpringSecurityDialect());
-		dialects.add(new ConditionalCommentsDialect());
-
-		SpringTemplateEngine templateEngine = new SpringTemplateEngine();
-		templateEngine.setTemplateResolver(templateResolver());
-		templateEngine.setAdditionalDialects(dialects);
-		return templateEngine;
-	}
-
-	@Bean
-	public ServletContextTemplateResolver templateResolver() {
-		ServletContextTemplateResolver templateResolver = new ServletContextTemplateResolver();
-		templateResolver.setPrefix("/WEB-INF");
-		templateResolver.setTemplateMode("HTML5");
-		return templateResolver;
+	public AjaxUrlBasedViewResolver viewResolver() {
+		AjaxUrlBasedViewResolver resolver = new AjaxUrlBasedViewResolver();
+		resolver.setViewClass(FlowAjaxTiles3View.class);
+		return resolver;
 	}
 
 	@Bean
-	public ThymeleafTilesConfigurer tilesConfigurer() {
-		ThymeleafTilesConfigurer configurer = new ThymeleafTilesConfigurer();
+	public TilesConfigurer tilesConfigurer() {
+		TilesConfigurer configurer = new TilesConfigurer();
 		configurer.setDefinitions("/WEB-INF/**/views.xml");
 		return configurer;
 	}