X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fthymeproxy%2FApplication.java;h=03b106f600e695f69975d4f1a90c767a8cf516c5;hb=91aa988e329618f6233b2b2f6394d4948622f4cc;hp=dcc35f8c3a87bf2fcf88a599b0c76a6a178937a1;hpb=f41186aa11b4f4d4ada5310682aee7c75c252144;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 dcc35f8..03b106f 100644
--- a/src/main/java/de/juplo/thymeproxy/Application.java
+++ b/src/main/java/de/juplo/thymeproxy/Application.java
@@ -1,6 +1,8 @@
 package de.juplo.thymeproxy;
 
+import de.juplo.thymeleaf.JuploDialect;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.boot.SpringApplication;
@@ -8,14 +10,18 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
 import org.springframework.core.env.Environment;
+import org.springframework.web.servlet.View;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 import org.springframework.web.servlet.mvc.UrlFilenameViewController;
 import org.thymeleaf.resourceresolver.IResourceResolver;
 import org.thymeleaf.resourceresolver.UrlResourceResolver;
+import org.thymeleaf.spring4.view.ThymeleafViewResolver;
 import org.thymeleaf.templateresolver.TemplateResolver;
 
 
 @SpringBootApplication
-public class Application
+public class Application extends WebMvcConfigurerAdapter
 {
   @Bean
   public RegexUrlHandlerMapping proxiedHandlerMapping(
@@ -27,10 +33,11 @@ public class Application
     mapping.setOrder(Ordered.HIGHEST_PRECEDENCE);
     Map<String, Object> mappings = new HashMap<>();
     mappings.put("/thymeleaf/.*\\.html", proxy);
+    mappings.put("/img/.+", proxy);
     mappings.put("/css/.+", proxy);
     mappings.put("/js/.+", proxy);
     mappings.put("/fonts/.+", proxy);
-    mappings.put(".*\\.html", views);
+    mappings.put("/.*\\.html", views);
     mapping.setUrlMap(mappings);
 	return mapping;
   }
@@ -62,7 +69,7 @@ public class Application
   {
     TemplateResolver resolver = new TemplateResolver();
     resolver.setResourceResolver(resources);
-    resolver.setPrefix("//thymeleaf/");
+    resolver.setPrefix("http://localhost:8080/thymeleaf/");
     resolver.setSuffix(".html");
     resolver.setTemplateMode("HTML5");
     resolver.setCharacterEncoding("UTF-8");
@@ -70,12 +77,47 @@ public class Application
     return resolver;
   }
 
+  @Bean
+  public TemplateResolver jsonTemplateResolver(
+      IResourceResolver resources,
+      Environment env
+      )
+  {
+    TemplateResolver resolver = new TemplateResolver();
+    resolver.setResourceResolver(resources);
+    resolver.setPrefix("http://localhost:8080/thymeleaf/");
+    resolver.setSuffix(".json");
+    resolver.setTemplateMode("JSON");
+    resolver.setCharacterEncoding("UTF-8");
+    resolver.setCacheable(Boolean.valueOf(env.getProperty("thymeproxy.cacheable")));
+    return resolver;
+  }
+
   @Bean
   public UrlResourceResolver thymeleafResourceResolver()
   {
     return new UrlResourceResolver();
   }
 
+  @Bean
+  public JuploDialect juploDialect()
+  {
+    return new JuploDialect();
+  }
+
+  @Bean
+  public View error(ThymeleafViewResolver resolver) throws Exception
+  {
+    return resolver.resolveViewName("templates/500", Locale.getDefault());
+  }
+
+
+  @Override
+  public void addViewControllers(ViewControllerRegistry registry)
+  {
+    registry.addViewController("/").setViewName("forward:index.html");
+  }
+
 
   public static void main(String[] args)
   {