WIP

diff --git a/pom.xml b/pom.xml
index 64227c743b51e7ffac798e074bd24a1761f03e7a..bdc99e7e37c925cc28a1d618874ae5591d557643 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
                </dependency>
                <dependency>
                        <groupId>de.juplo</groupId>
-                       <artifactId>http-resources</artifactId>
+                       <artifactId>thymeproxy</artifactId>
                        <version>2.0.0</version>
                </dependency>
                <dependency>

diff --git a/src/main/java/de/juplo/demo/httpresources/HttpResourcesDemoApplication.java b/src/main/java/de/juplo/demo/httpresources/HttpResourcesDemoApplication.java
index f839e27dbad755379f052e0b920743050e4dfa1e..aec1079c6aa19386362d20e9b4de42affa4bd7f0 100644 (file)
--- a/src/main/java/de/juplo/demo/httpresources/HttpResourcesDemoApplication.java
+++ b/src/main/java/de/juplo/demo/httpresources/HttpResourcesDemoApplication.java
@@ -1,11 +1,8 @@
 package de.juplo.demo.httpresources;
 
-import de.juplo.httpresources.HttpResourceChainAwareResourceLoader;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 
@@ -19,19 +16,6 @@ public class HttpResourcesDemoApplication
                return new HttpComponentsClientHttpRequestFactory();
        }
 
-       @Bean
-       HttpResourceChainAwareResourceLoader resourceLoader(
-                       GenericApplicationContext context,
-                       String[] sources) {
-               HttpResourceChainAwareResourceLoader loader =
-                               new HttpResourceChainAwareResourceLoader(
-                                               new PathMatchingResourcePatternResolver(),
-                                               sources
-                               );
-               context.setResourceLoader(loader);
-               return loader;
-       }
-
 
        public static void main(String[] args)
        {

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index dd14ca8eb9c8886980a8ebb8f1a711339d19ac5a..3f6cd828146bd924e94d0a765e6bf8f83b51ced9 100644 (file)
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 server.port=8080
 origin=http://localhost:8888
 juplo.http-resources.protocol-resolver.enabled=true
-spring.web.resources.static-locations"=classpath:/overwrite/,${origin},classpath:/fallback/
+spring.resources.static-locations"=classpath:/overwrite/,${origin},classpath:/fallback/
 spring.thymeleaf.prefix=/
 spring.thymeleaf.suffix=.html
 logging.level.de.juplo=DEBUG