WIP: thymeproxy ohne thymeproxy

diff --git a/pom.xml b/pom.xml
index 5d51982..b635b71 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,6 @@
 
     <!-- used versions (not defined in spring-boot) -->
     <httpclient-spring-boot-starter.version>1.0-SNAPSHOT</httpclient-spring-boot-starter.version>
-    <thymeproxy.version>1.0-SNAPSHOT</thymeproxy.version>
 
   </properties>
 
@@ -47,11 +46,6 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-thymeleaf</artifactId>
     </dependency>
-    <dependency>
-      <groupId>de.juplo</groupId>
-      <artifactId>thymeproxy</artifactId>
-      <version>${thymeproxy.version}</version>
-    </dependency>
     <dependency>
       <groupId>de.juplo</groupId>
       <artifactId>httpclient-spring-boot-starter</artifactId>

diff --git a/src/main/java/de/juplo/thymeproxy/Application.java b/src/main/java/de/juplo/thymeproxy/Application.java
index a9831ba..d4ccd53 100644 (file)
--- a/src/main/java/de/juplo/thymeproxy/Application.java
+++ b/src/main/java/de/juplo/thymeproxy/Application.java
@@ -54,6 +54,28 @@ public class Application
     return new UrlFilenameViewController();
   }
 
+  @Bean
+  public TemplateResolver defaultTemplateResolver(
+      IResourceResolver resources,
+      Environment env
+      )
+  {
+    TemplateResolver resolver = new TemplateResolver();
+    resolver.setResourceResolver(resources);
+    resolver.setPrefix("http://localhost:8080/thymeleaf/");
+    resolver.setSuffix(".html");
+    resolver.setTemplateMode("HTML5");
+    resolver.setCharacterEncoding("UTF-8");
+    resolver.setCacheable(Boolean.valueOf(env.getProperty("thymeproxy.cacheable")));
+    return resolver;
+  }
+
+  @Bean
+  public UrlResourceResolver thymeleafResourceResolver()
+  {
+    return new UrlResourceResolver();
+  }
+
 
   public static void main(String[] args)
   {

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 92754df..1ba166f 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -2,9 +2,6 @@ thymeproxy.name=@thymeproxy.name@
 thymeproxy.origin=@thymeproxy.origin@
 server.port=@thymeproxy.port@
 thymeproxy.ttl=@thymeproxy.ttl@
-thymeproxy.origins[0].uri=http://localhost:8080
-thymeproxy.origins[0].prefix=/thymeleaf/
-thymeproxy.origins[0].suffix=.html
 thymeproxy.cacheable=@thymeproxy.cacheable@
 
 logging.level.de.juplo=info