X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fthymeproxy%2FApplication.java;h=6a3d7da06f5544605e081c0443f1693ac5112e68;hb=53d411dcd6f52a22ec4513a9d43b3b5f737655a1;hp=9311cf85e2004c8252f2a252ca470a8d72ff714e;hpb=d5f095b05c68b3cf143138faf6a084298cf9de36;p=maven-thymeleaf-skin

diff --git a/src/main/java/de/juplo/thymeproxy/Application.java b/src/main/java/de/juplo/thymeproxy/Application.java
index 9311cf8..6a3d7da 100644
--- a/src/main/java/de/juplo/thymeproxy/Application.java
+++ b/src/main/java/de/juplo/thymeproxy/Application.java
@@ -15,10 +15,11 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
-import org.springframework.web.servlet.mvc.UrlFilenameViewController;
+import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.resourceresolver.IResourceResolver;
 import org.thymeleaf.resourceresolver.UrlResourceResolver;
 import org.thymeleaf.templateresolver.TemplateResolver;
@@ -34,7 +35,7 @@ public class Application extends WebMvcConfigurerAdapter
   @Bean
   public RegexUrlHandlerMapping proxiedHandlerMapping(
       ProxyHttpRequestHandler proxy,
-      UrlFilenameViewController views
+      UrlThymeleafViewController views
       )
   {
     RegexUrlHandlerMapping mapping = new RegexUrlHandlerMapping();
@@ -63,9 +64,11 @@ public class Application extends WebMvcConfigurerAdapter
   }
 
   @Bean
-  public UrlFilenameViewController urlFilenameViewController()
+  public UrlThymeleafViewController urlThymeleafViewController(
+      TemplateEngine engine
+      )
   {
-    return new UrlFilenameViewController();
+    return new UrlThymeleafViewController(engine);
   }
 
   @Bean
@@ -122,7 +125,7 @@ public class Application extends WebMvcConfigurerAdapter
     mappings.setProperty("TemplateInputException", "templates/404");
 
     resolver.setExceptionMappings(mappings);
-    resolver.setDefaultErrorView("templates/500");
+    resolver.setDefaultErrorView("templates/error");
     resolver.setWarnLogCategory("exception");
     return resolver;
   }
@@ -133,11 +136,15 @@ public class Application extends WebMvcConfigurerAdapter
       ErrorAttributes errorAttributes
       )
   {
-    return new ExceptionResolverErrorController(
-        context,
-        errorAttributes,
-        properties.getError()
-        );
+    ExceptionResolverErrorController controller =
+        new ExceptionResolverErrorController(
+            context,
+            errorAttributes,
+            properties.getError()
+            );
+    controller.addErrorMapping(HttpStatus.NOT_FOUND, "templates/404");
+    controller.setDefaultErrorView("templates/error");
+    return controller;
   }