diff --git a/gradle.properties b/gradle.properties index cd38441b..0312c269 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,3 +25,4 @@ assertjVersion=2.3.0 spockVersion=1.0-groovy-2.4 jstlVersion=1.2.1 groovyVersion=2.4.4 +webjarsTaglibVersion=0.3 diff --git a/samples/boot/build.gradle b/samples/boot/build.gradle index d3565b74..21e88cfe 100644 --- a/samples/boot/build.gradle +++ b/samples/boot/build.gradle @@ -23,6 +23,7 @@ dependencies { "org.thymeleaf.extras:thymeleaf-extras-conditionalcomments", "org.webjars:bootstrap:$bootstrapVersion", "org.webjars:html5shiv:$html5ShivVersion", + "org.webjars:webjars-locator", "org.springframework.security:spring-security-web:$springSecurityVersion", "org.springframework.security:spring-security-config:$springSecurityVersion" diff --git a/samples/boot/src/main/resources/templates/layout.html b/samples/boot/src/main/resources/templates/layout.html index ea52c788..7a66980e 100644 --- a/samples/boot/src/main/resources/templates/layout.html +++ b/samples/boot/src/main/resources/templates/layout.html @@ -5,7 +5,7 @@ Spring Session Sample - + - + diff --git a/samples/custom-cookie/build.gradle b/samples/custom-cookie/build.gradle index 16494769..72d63924 100644 --- a/samples/custom-cookie/build.gradle +++ b/samples/custom-cookie/build.gradle @@ -2,10 +2,15 @@ apply from: JAVA_GRADLE apply from: TOMCAT_7_GRADLE apply from: SAMPLE_GRADLE +configurations { + compile.exclude group: 'org.slf4j', module: 'slf4j-api' +} + dependencies { compile project(':spring-session-data-redis'), "org.springframework:spring-web:$springVersion", "org.webjars:bootstrap:$bootstrapVersion", + "org.webjars:webjars-taglib:$webjarsTaglibVersion", jstlDependencies providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion" diff --git a/samples/custom-cookie/src/main/webapp/index.jsp b/samples/custom-cookie/src/main/webapp/index.jsp index e1f3d0ec..63de3514 100644 --- a/samples/custom-cookie/src/main/webapp/index.jsp +++ b/samples/custom-cookie/src/main/webapp/index.jsp @@ -1,9 +1,10 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %> Session Attributes - "> + "> - + diff --git a/samples/hazelcast-spring/build.gradle b/samples/hazelcast-spring/build.gradle index f1c5386d..1c952822 100644 --- a/samples/hazelcast-spring/build.gradle +++ b/samples/hazelcast-spring/build.gradle @@ -2,12 +2,17 @@ apply from: JAVA_GRADLE apply from: TOMCAT_7_GRADLE apply from: SAMPLE_GRADLE +configurations { + compile.exclude group: 'org.slf4j', module: 'slf4j-api' +} + dependencies { compile project(':spring-session'), "org.springframework:spring-web:$springVersion", "org.springframework.security:spring-security-config:$springSecurityVersion", "org.springframework.security:spring-security-web:$springSecurityVersion", "org.webjars:bootstrap:$bootstrapVersion", + "org.webjars:webjars-taglib:$webjarsTaglibVersion", "com.hazelcast:hazelcast-client:$hazelcastVersion", jstlDependencies diff --git a/samples/hazelcast-spring/src/main/webapp/index.jsp b/samples/hazelcast-spring/src/main/webapp/index.jsp index 569636b6..4e11eb2b 100644 --- a/samples/hazelcast-spring/src/main/webapp/index.jsp +++ b/samples/hazelcast-spring/src/main/webapp/index.jsp @@ -1,9 +1,10 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %> Secured Content - "> + "> - + diff --git a/samples/httpsession-jdbc-xml/build.gradle b/samples/httpsession-jdbc-xml/build.gradle index e80d7b9f..572326e7 100644 --- a/samples/httpsession-jdbc-xml/build.gradle +++ b/samples/httpsession-jdbc-xml/build.gradle @@ -2,10 +2,15 @@ apply from: JAVA_GRADLE apply from: TOMCAT_6_GRADLE apply from: SAMPLE_GRADLE +configurations { + compile.exclude group: 'org.slf4j', module: 'slf4j-api' +} + dependencies { compile project(':spring-session-jdbc'), "org.springframework:spring-web:$springVersion", "org.webjars:bootstrap:$bootstrapVersion", + "org.webjars:webjars-taglib:$webjarsTaglibVersion", "com.h2database:h2:$h2Version", jstlDependencies diff --git a/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp b/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp index e4b35077..bb54ec2f 100644 --- a/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp +++ b/samples/httpsession-jdbc-xml/src/main/webapp/index.jsp @@ -1,9 +1,10 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %> Session Attributes - "> + "> - + diff --git a/samples/security/build.gradle b/samples/security/build.gradle index c77b6c91..c3debb47 100644 --- a/samples/security/build.gradle +++ b/samples/security/build.gradle @@ -2,12 +2,17 @@ apply from: JAVA_GRADLE apply from: TOMCAT_7_GRADLE apply from: SAMPLE_GRADLE +configurations { + compile.exclude group: 'org.slf4j', module: 'slf4j-api' +} + dependencies { compile project(':spring-session-data-redis'), "org.springframework:spring-web:$springVersion", "org.springframework.security:spring-security-config:$springSecurityVersion", "org.springframework.security:spring-security-web:$springSecurityVersion", "org.webjars:bootstrap:$bootstrapVersion", + "org.webjars:webjars-taglib:$webjarsTaglibVersion", jstlDependencies providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion", diff --git a/samples/security/src/main/webapp/index.jsp b/samples/security/src/main/webapp/index.jsp index ca51ee35..1da4e673 100644 --- a/samples/security/src/main/webapp/index.jsp +++ b/samples/security/src/main/webapp/index.jsp @@ -1,9 +1,10 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %> Secured Content - "> + "> - +