From 97a5ab72d72dd4ce77a99e83eb1868fdb533113d Mon Sep 17 00:00:00 2001 From: Kai Moritz Date: Tue, 3 Jul 2018 10:12:53 +0200 Subject: [PATCH] Moved the embedded default-templates into the classpath Otherwise, if the app is packaged, the templates will not be included, because the webapp-directory is ignored for builds of type "jar". --- src/main/resources/application.properties | 2 +- .../thymeleaf/connect/facebookConnect.html | 0 .../thymeleaf/connect/facebookConnected.html | 0 src/main/{webapp => resources}/thymeleaf/home.html | 0 src/main/{webapp => resources}/thymeleaf/profile.html | 0 src/main/{webapp => resources}/thymeleaf/signin.html | 0 6 files changed, 1 insertion(+), 1 deletion(-) rename src/main/{webapp => resources}/thymeleaf/connect/facebookConnect.html (100%) rename src/main/{webapp => resources}/thymeleaf/connect/facebookConnected.html (100%) rename src/main/{webapp => resources}/thymeleaf/home.html (100%) rename src/main/{webapp => resources}/thymeleaf/profile.html (100%) rename src/main/{webapp => resources}/thymeleaf/signin.html (100%) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 53179d2..ea935bb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -9,7 +9,7 @@ server.ssl.key-store-password=secret httpclient.timeout.connection=@yourshouter.facebook.app.httpclient.timeout.connection@ httpclient.timeout.read=@yourshouter.facebook.app.httpclient.timeout.read@ -spring.thymeleaf.prefix=/thymeleaf/ +spring.thymeleaf.prefix=classpath:/thymeleaf/ spring.thymeleaf.cache=false spring.datasource.url=@yourshouter.facebook.app.jdbc.url@ diff --git a/src/main/webapp/thymeleaf/connect/facebookConnect.html b/src/main/resources/thymeleaf/connect/facebookConnect.html similarity index 100% rename from src/main/webapp/thymeleaf/connect/facebookConnect.html rename to src/main/resources/thymeleaf/connect/facebookConnect.html diff --git a/src/main/webapp/thymeleaf/connect/facebookConnected.html b/src/main/resources/thymeleaf/connect/facebookConnected.html similarity index 100% rename from src/main/webapp/thymeleaf/connect/facebookConnected.html rename to src/main/resources/thymeleaf/connect/facebookConnected.html diff --git a/src/main/webapp/thymeleaf/home.html b/src/main/resources/thymeleaf/home.html similarity index 100% rename from src/main/webapp/thymeleaf/home.html rename to src/main/resources/thymeleaf/home.html diff --git a/src/main/webapp/thymeleaf/profile.html b/src/main/resources/thymeleaf/profile.html similarity index 100% rename from src/main/webapp/thymeleaf/profile.html rename to src/main/resources/thymeleaf/profile.html diff --git a/src/main/webapp/thymeleaf/signin.html b/src/main/resources/thymeleaf/signin.html similarity index 100% rename from src/main/webapp/thymeleaf/signin.html rename to src/main/resources/thymeleaf/signin.html -- 2.20.1