Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-07-12 21:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEC-2651: Update Thymeleaf to Spring 4 variants in samples

Browse Source
This commit is contained in:
Rob Winch 2014-06-12 16:48:04 -05:00
parent cb94fb2c99
commit 10c4d8f1af
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/javaprojects.gradle
View File

@ -27,7 +27,7 @@ ext.seleniumVersion = '2.33.0'
ext.groovyVersion = '2.0.5' ext.groovyVersion = '2.0.5'
ext.spockVersion = '0.7-groovy-2.0' ext.spockVersion = '0.7-groovy-2.0'
ext.gebVersion = '0.9.0' ext.gebVersion = '0.9.0'
ext.thymeleafVersion = '2.1.2.RELEASE' ext.thymeleafVersion = '2.1.3.RELEASE'
ext.spockDependencies = [ ext.spockDependencies = [
dependencies.create("org.spockframework:spock-spring:$spockVersion") { dependencies.create("org.spockframework:spock-spring:$spockVersion") {

4
samples/messages-jc/build.gradle
View File

@ -19,8 +19,8 @@ dependencies {
"org.springframework:spring-instrument:$springVersion", "org.springframework:spring-instrument:$springVersion",
"org.springframework:spring-core:$springVersion", "org.springframework:spring-core:$springVersion",
"org.springframework:spring-aspects:$springVersion", "org.springframework:spring-aspects:$springVersion",
"org.thymeleaf:thymeleaf-spring3:$thymeleafVersion", "org.thymeleaf:thymeleaf-spring4:$thymeleafVersion",
"org.thymeleaf.extras:thymeleaf-extras-tiles2:2.1.0.RELEASE" "org.thymeleaf.extras:thymeleaf-extras-tiles2-spring4:2.1.1.RELEASE"
compile('org.hibernate:hibernate-entitymanager:3.6.10.Final') { compile('org.hibernate:hibernate-entitymanager:3.6.10.Final') {
exclude group:'javassist', module: 'javassist' exclude group:'javassist', module: 'javassist'
} }

8
samples/messages-jc/pom.xml
View File

@ -177,14 +177,14 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.thymeleaf.extras</groupId> <groupId>org.thymeleaf.extras</groupId>
<artifactId>thymeleaf-extras-tiles2</artifactId> <artifactId>thymeleaf-extras-tiles2-spring4</artifactId>
<version>2.1.0.RELEASE</version> <version>2.1.1.RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.thymeleaf</groupId> <groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf-spring3</artifactId> <artifactId>thymeleaf-spring4</artifactId>
<version>2.1.2.RELEASE</version> <version>2.1.3.RELEASE</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

8
samples/messages-jc/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java
View File

@ -11,10 +11,10 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.thymeleaf.extras.tiles2.dialect.TilesDialect; import org.thymeleaf.extras.tiles2.dialect.TilesDialect;
import org.thymeleaf.extras.tiles2.spring.web.configurer.ThymeleafTilesConfigurer; import org.thymeleaf.extras.tiles2.spring4.web.configurer.ThymeleafTilesConfigurer;
import org.thymeleaf.extras.tiles2.spring.web.view.ThymeleafTilesView; import org.thymeleaf.extras.tiles2.spring4.web.view.ThymeleafTilesView;
import org.thymeleaf.spring3.SpringTemplateEngine; import org.thymeleaf.spring4.SpringTemplateEngine;
import org.thymeleaf.spring3.view.ThymeleafViewResolver; import org.thymeleaf.spring4.view.ThymeleafViewResolver;
import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver; import org.thymeleaf.templateresolver.ClassLoaderTemplateResolver;
@EnableWebMvc @EnableWebMvc

2
samples/messages-jc/src/main/resources/views/layout.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring3-3.dtd"> <!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
xmlns:th="http://www.thymeleaf.org" xmlns:th="http://www.thymeleaf.org"
xmlns:tiles="http://www.thymeleaf.org"> xmlns:tiles="http://www.thymeleaf.org">