diff --git a/docs/guides/src/docs/asciidoc/form-javaconfig.asc b/docs/guides/src/docs/asciidoc/form-javaconfig.asc index 79a08cedcc..dfb78a47ea 100644 --- a/docs/guides/src/docs/asciidoc/form-javaconfig.asc +++ b/docs/guides/src/docs/asciidoc/form-javaconfig.asc @@ -162,12 +162,12 @@ Our existing configuration means that all we need to do is create a *login.html* .src/main/resources/views/login.html [source,xml] ---- - - - Messages : Create + + + Please Login - -
+ +
<1>
Please Login diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle index 2bbc53b0da..c565ae7071 100644 --- a/gradle/javaprojects.gradle +++ b/gradle/javaprojects.gradle @@ -37,7 +37,7 @@ ext.springDataJpaVersion = '1.10.2.RELEASE' ext.springDataRedisVersion = '1.7.2.RELEASE' ext.springSessionVersion = '1.2.1.RELEASE' ext.springBootVersion = '1.4.0.RELEASE' -ext.thymeleafVersion = '2.1.5.RELEASE' +ext.thymeleafVersion = '3.0.2.RELEASE' ext.jsonassertVersion = '1.3.0' ext.validationApiVersion = '1.1.0.Final' diff --git a/samples/javaconfig/chat/src/main/java/sample/config/WebMvcConfiguration.java b/samples/javaconfig/chat/src/main/java/sample/config/WebMvcConfiguration.java index fe2676099b..da60d2f295 100644 --- a/samples/javaconfig/chat/src/main/java/sample/config/WebMvcConfiguration.java +++ b/samples/javaconfig/chat/src/main/java/sample/config/WebMvcConfiguration.java @@ -64,13 +64,6 @@ public class WebMvcConfiguration extends WebMvcConfigurerAdapter { return result; } - @Bean - public ThymeleafTilesConfigurer tilesConfigurer() { - ThymeleafTilesConfigurer tilesConfigurer = new ThymeleafTilesConfigurer(); - tilesConfigurer.setDefinitions(new String[] { "classpath:tiles/tiles-def.xml" }); - return tilesConfigurer; - } - @Bean public SpringTemplateEngine templateEngine( ClassLoaderTemplateResolver templateResolver) { diff --git a/samples/javaconfig/chat/src/main/resources/tiles/tiles-def.xml b/samples/javaconfig/chat/src/main/resources/tiles/tiles-def.xml deleted file mode 100644 index 691e4c8858..0000000000 --- a/samples/javaconfig/chat/src/main/resources/tiles/tiles-def.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/samples/javaconfig/chat/src/main/resources/views/chat.html b/samples/javaconfig/chat/src/main/resources/views/chat.html index 13130ea87f..52bb66d2da 100644 --- a/samples/javaconfig/chat/src/main/resources/views/chat.html +++ b/samples/javaconfig/chat/src/main/resources/views/chat.html @@ -1,9 +1,8 @@ - - - Chat - - -
+ + + Chat + +

Chat Application

diff --git a/samples/javaconfig/chat/src/main/resources/views/layout.html b/samples/javaconfig/chat/src/main/resources/views/layout.html index 5249005964..7629cffd1d 100644 --- a/samples/javaconfig/chat/src/main/resources/views/layout.html +++ b/samples/javaconfig/chat/src/main/resources/views/layout.html @@ -1,9 +1,8 @@ - - SecureMail: + xmlns:th="http://www.thymeleaf.org"> + + SecureMail: <th:block th:include="${title}"></th:block>