mindol1004/spring-session
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upgrade samples to Boot 2.0.0.M1

Browse Source 
Fixes gh-782
This commit is contained in:
Vedran Pavic
2017-05-24 23:18:30 +02:00
parent 22f4b0bc9d
commit 79f187ddd6
26 changed files with 37 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,2 +1,2 @@
springBootVersion=1.5.3.RELEASE
springBootVersion=2.0.0.M1
version=2.0.0.BUILD-SNAPSHOT

143
gradle/dependency-management.gradle
View File

@@ -1,177 +1,36 @@
dependencyManagement {
dependencies {
dependency 'biz.paluch.redis:lettuce:4.3.1.Final'
dependency 'com.maxmind.geoip2:geoip2:2.3.1'
dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
dependency 'org.springframework.shell:spring-shell:1.1.0.RELEASE'
dependency 'org.webjars:bootstrap:2.3.2'
dependency 'org.webjars:html5shiv:3.7.3'
dependency 'org.webjars:knockout:2.3.0'
dependency 'org.webjars:sockjs-client:0.3.4'
dependency 'org.webjars:stomp-websocket:2.3.0'
dependency 'org.webjars:webjars-taglib:0.3'
}
}
dependencyManagement {
imports {
mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC1'
mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-M3'
mavenBom 'org.springframework.security:spring-security-bom:5.0.0.M1'
mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC1'
}
dependencies {
dependency 'antlr:antlr:2.7.7'
dependency 'aopalliance:aopalliance:1.0'
dependency 'biz.paluch.redis:lettuce:4.3.1.Final'
dependency 'cglib:cglib-nodep:2.1_3'
dependency 'cglib:cglib-nodep:3.2.4'
dependency 'ch.qos.logback:logback-classic:1.1.11'
dependency 'ch.qos.logback:logback-classic:1.2.3'
dependency 'ch.qos.logback:logback-core:1.1.11'
dependency 'ch.qos.logback:logback-core:1.2.3'
dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0'
dependency 'com.fasterxml.jackson.core:jackson-annotations:2.9.0.pr3'
dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8'
dependency 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr3'
dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3'
dependency 'com.fasterxml:classmate:1.3.3'
dependency 'com.google.code.findbugs:jsr305:3.0.2'
dependency 'com.google.code.gson:gson:2.8.0'
dependency 'com.google.guava:guava:20.0'
dependency 'com.google.http-client:google-http-client:1.20.0'
dependency 'com.h2database:h2:1.4.195'
dependency 'com.hazelcast:hazelcast-client:3.8'
dependency 'com.hazelcast:hazelcast:3.8'
dependency 'com.jayway.jsonpath:json-path:2.2.0'
dependency 'com.maxmind.db:maxmind-db:1.0.0'
dependency 'com.maxmind.geoip2:geoip2:2.3.1'
dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
dependency 'commons-cli:commons-cli:1.3.1'
dependency 'commons-codec:commons-codec:1.10'
dependency 'commons-collections:commons-collections:3.2.2'
dependency 'commons-io:commons-io:2.5'
dependency 'dom4j:dom4j:1.6.1'
dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
dependency 'io.lettuce:lettuce-core:5.0.0.M2'
dependency 'io.netty:netty-buffer:4.1.10.Final'
dependency 'io.netty:netty-codec:4.1.10.Final'
dependency 'io.netty:netty-common:4.1.10.Final'
dependency 'io.netty:netty-handler:4.1.10.Final'
dependency 'io.netty:netty-resolver:4.1.10.Final'
dependency 'io.netty:netty-transport:4.1.10.Final'
dependency 'io.projectreactor:reactor-core:3.1.0.M1'
dependency 'io.reactivex:rxjava:1.3.0'
dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1'
dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02'
dependency 'javax.servlet:javax.servlet-api:3.1.0'
dependency 'javax.transaction:javax.transaction-api:1.2'
dependency 'javax.validation:validation-api:1.1.0.Final'
dependency 'junit:junit:4.12'
dependency 'net.bytebuddy:byte-buddy-agent:1.6.11'
dependency 'net.bytebuddy:byte-buddy:1.6.12'
dependency 'net.java.dev.jna:jna-platform:4.1.0'
dependency 'net.java.dev.jna:jna:4.2.2'
dependency 'net.minidev:accessors-smart:1.1'
dependency 'net.minidev:json-smart:2.2.1'
dependency 'net.sourceforge.cssparser:cssparser:0.9.18'
dependency 'net.sourceforge.cssparser:cssparser:0.9.22'
dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17'
dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.26'
dependency 'net.sourceforge.htmlunit:htmlunit:2.21'
dependency 'net.sourceforge.htmlunit:htmlunit:2.26'
dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21'
dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.25'
dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0'
dependency 'ognl:ognl:3.0.8'
dependency 'org.akhikhl.gretty:gretty-runner-tomcat8:1.4.2'
dependency 'org.akhikhl.gretty:gretty-runner-tomcat:1.4.2'
dependency 'org.akhikhl.gretty:gretty-runner:1.4.2'
dependency 'org.apache.commons:commons-compress:1.9'
dependency 'org.apache.commons:commons-exec:1.3'
dependency 'org.apache.commons:commons-lang3:3.5'
dependency 'org.apache.commons:commons-pool2:2.4.2'
dependency 'org.apache.derby:derby:10.13.1.1'
dependency 'org.apache.httpcomponents:httpclient:4.5.3'
dependency 'org.apache.httpcomponents:httpcore:4.4.6'
dependency 'org.apache.httpcomponents:httpmime:4.5.3'
dependency 'org.apache.taglibs:taglibs-standard-impl:1.2.5'
dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5'
dependency 'org.apache.taglibs:taglibs-standard-spec:1.2.5'
dependency 'org.apache.tomcat.embed:tomcat-embed-core:8.5.14'
dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14'
dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.14'
dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.33'
dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14'
dependency 'org.apache.tomcat:tomcat-jdbc:8.5.14'
dependency 'org.apache.tomcat:tomcat-juli:8.5.14'
dependency 'org.aspectj:aspectjweaver:1.8.10'
dependency 'org.assertj:assertj-core:3.6.2'
dependency 'org.codehaus.groovy:groovy-json:2.4.11'
dependency 'org.codehaus.groovy:groovy:2.4.10'
dependency 'org.codehaus.groovy:groovy:2.4.11'
dependency 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414'
dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.5.v20170502'
dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414'
dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.5.v20170502'
dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414'
dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.5.v20170502'
dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-client:9.4.5.v20170502'
dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-http:9.4.5.v20170502'
dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-io:9.4.5.v20170502'
dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-util:9.4.5.v20170502'
dependency 'org.hamcrest:hamcrest-core:1.3'
dependency 'org.hamcrest:hamcrest-library:1.3'
dependency 'org.hibernate.common:hibernate-commons-annotations:5.0.1.Final'
dependency 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
dependency 'org.hibernate:hibernate-core:5.0.12.Final'
dependency 'org.hibernate:hibernate-entitymanager:5.0.12.Final'
dependency 'org.hibernate:hibernate-validator:5.3.5.Final'
dependency 'org.hsqldb:hsqldb:2.4.0'
dependency 'org.javassist:javassist:3.21.0-GA'
dependency 'org.jboss.logging:jboss-logging:3.3.1.Final'
dependency 'org.jboss:jandex:2.0.0.Final'
dependency 'org.mockito:mockito-core:2.7.22'
dependency 'org.objenesis:objenesis:2.5.1'
dependency 'org.ow2.asm:asm:5.0.3'
dependency 'org.reactivestreams:reactive-streams:1.0.0'
dependency 'org.seleniumhq.selenium:htmlunit-driver:2.21'
dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26'
dependency 'org.seleniumhq.selenium:selenium-api:2.53.1'
dependency 'org.seleniumhq.selenium:selenium-api:3.3.1'
dependency 'org.seleniumhq.selenium:selenium-remote-driver:2.53.1'
dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.3.1'
dependency 'org.seleniumhq.selenium:selenium-support:2.53.1'
dependency 'org.seleniumhq.selenium:selenium-support:3.3.1'
dependency 'org.skyscreamer:jsonassert:1.4.0'
dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
dependency 'org.slf4j:jul-to-slf4j:1.7.25'
dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
dependency 'org.slf4j:slf4j-api:1.7.25'
dependency 'org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE'
dependency 'org.thymeleaf:thymeleaf:2.1.5.RELEASE'
dependency 'org.unbescape:unbescape:1.1.0.RELEASE'
dependency 'org.w3c.css:sac:1.3'
dependency 'org.webjars:bootstrap:2.3.2'
dependency 'org.webjars:html5shiv:3.7.3'
dependency 'org.webjars:jquery:1.9.0'
dependency 'org.webjars:knockout:2.3.0'
dependency 'org.webjars:sockjs-client:0.3.4'
dependency 'org.webjars:stomp-websocket:2.3.0'
dependency 'org.webjars:webjars-locator-core:0.30'
dependency 'org.webjars:webjars-locator-core:0.32'
dependency 'org.webjars:webjars-locator:0.32-1'
dependency 'org.webjars:webjars-taglib:0.3'
dependency 'org.yaml:snakeyaml:1.17'
dependency 'redis.clients:jedis:2.9.0'
dependency 'xalan:serializer:2.7.2'
dependency 'xalan:xalan:2.7.2'
dependency 'xerces:xercesImpl:2.11.0'
dependency 'xml-apis:xml-apis:1.4.01'
}
}

1
samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle
View File

@@ -2,6 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
dependencies {
compile project(':spring-session-data-redis')
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-thymeleaf"
compile "org.springframework.boot:spring-boot-starter-security"
compile "org.springframework.boot:spring-boot-devtools"

4
samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java
View File

@@ -18,10 +18,10 @@ package sample.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter {
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addViewControllers(ViewControllerRegistry registry) {

2
samples/boot/findbyusername/src/main/resources/templates/index.html
View File

@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
<head>
<title>Secured Content</title>
</head>

2
samples/boot/findbyusername/src/main/resources/templates/layout.html
View File

@@ -3,7 +3,7 @@
xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
<style type="text/css">

2
samples/boot/findbyusername/src/main/resources/templates/login.html
View File

@@ -1,6 +1,6 @@
<html xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorator="layout">
layout:decorate="~{layout}">
<head>
<title>Log In</title>
</head>

152
samples/boot/gradle/dependency-management.gradle
View File

@@ -1,152 +0,0 @@
dependencyManagement {
dependencies {
dependency 'antlr:antlr:2.7.7'
dependency 'aopalliance:aopalliance:1.0'
dependency 'biz.paluch.redis:lettuce:4.3.1.Final'
dependency 'cglib:cglib-nodep:2.1_3'
dependency 'ch.qos.logback:logback-classic:1.1.11'
dependency 'ch.qos.logback:logback-core:1.1.11'
dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0'
dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8'
dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.8'
dependency 'com.fasterxml:classmate:1.3.3'
dependency 'com.google.code.findbugs:jsr305:3.0.2'
dependency 'com.google.code.gson:gson:2.8.0'
dependency 'com.google.guava:guava:20.0'
dependency 'com.google.http-client:google-http-client:1.20.0'
dependency 'com.h2database:h2:1.4.194'
dependency 'com.jayway.jsonpath:json-path:2.2.0'
dependency 'com.maxmind.db:maxmind-db:1.0.0'
dependency 'com.maxmind.geoip2:geoip2:2.3.1'
dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1'
dependency 'commons-codec:commons-codec:1.10'
dependency 'commons-collections:commons-collections:3.2.2'
dependency 'commons-io:commons-io:2.5'
dependency 'dom4j:dom4j:1.6.1'
dependency 'io.netty:netty-buffer:4.1.10.Final'
dependency 'io.netty:netty-codec:4.1.10.Final'
dependency 'io.netty:netty-common:4.1.10.Final'
dependency 'io.netty:netty-handler:4.1.10.Final'
dependency 'io.netty:netty-resolver:4.1.10.Final'
dependency 'io.netty:netty-transport:4.1.10.Final'
dependency 'io.reactivex:rxjava:1.3.0'
dependency 'javax.transaction:javax.transaction-api:1.2'
dependency 'javax.validation:validation-api:1.1.0.Final'
dependency 'junit:junit:4.12'
dependency 'net.java.dev.jna:jna-platform:4.1.0'
dependency 'net.java.dev.jna:jna:4.2.2'
dependency 'net.minidev:accessors-smart:1.1'
dependency 'net.minidev:json-smart:2.2.1'
dependency 'net.sourceforge.cssparser:cssparser:0.9.18'
dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17'
dependency 'net.sourceforge.htmlunit:htmlunit:2.21'
dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21'
dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0'
dependency 'ognl:ognl:3.0.8'
dependency 'org.apache.commons:commons-compress:1.9'
dependency 'org.apache.commons:commons-exec:1.3'
dependency 'org.apache.commons:commons-lang3:3.5'
dependency 'org.apache.commons:commons-pool2:2.4.2'
dependency 'org.apache.httpcomponents:httpclient:4.5.3'
dependency 'org.apache.httpcomponents:httpcore:4.4.6'
dependency 'org.apache.httpcomponents:httpmime:4.5.3'
dependency 'org.apache.tomcat.embed:tomcat-embed-core:8.5.14'
dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14'
dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14'
dependency 'org.apache.tomcat:tomcat-jdbc:8.5.14'
dependency 'org.apache.tomcat:tomcat-juli:8.5.14'
dependency 'org.aspectj:aspectjweaver:1.8.10'
dependency 'org.assertj:assertj-core:2.6.0'
dependency 'org.codehaus.groovy:groovy:2.4.10'
dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414'
dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414'
dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414'
dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414'
dependency 'org.hamcrest:hamcrest-core:1.3'
dependency 'org.hamcrest:hamcrest-library:1.3'
dependency 'org.hibernate.common:hibernate-commons-annotations:5.0.1.Final'
dependency 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final'
dependency 'org.hibernate:hibernate-core:5.0.12.Final'
dependency 'org.hibernate:hibernate-entitymanager:5.0.12.Final'
dependency 'org.hibernate:hibernate-validator:5.3.5.Final'
dependency 'org.javassist:javassist:3.21.0-GA'
dependency 'org.jboss.logging:jboss-logging:3.3.1.Final'
dependency 'org.jboss:jandex:2.0.0.Final'
dependency 'org.mockito:mockito-core:1.10.19'
dependency 'org.objenesis:objenesis:2.5.1'
dependency 'org.ow2.asm:asm:5.0.3'
dependency 'org.seleniumhq.selenium:htmlunit-driver:2.21'
dependency 'org.seleniumhq.selenium:selenium-api:2.53.1'
dependency 'org.seleniumhq.selenium:selenium-remote-driver:2.53.1'
dependency 'org.seleniumhq.selenium:selenium-support:2.53.1'
dependency 'org.skyscreamer:jsonassert:1.4.0'
dependency 'org.slf4j:jcl-over-slf4j:1.7.25'
dependency 'org.slf4j:jul-to-slf4j:1.7.25'
dependency 'org.slf4j:log4j-over-slf4j:1.7.25'
dependency 'org.slf4j:slf4j-api:1.7.25'
dependency 'org.springframework.boot:spring-boot-autoconfigure:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-aop:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-data-jpa:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-jdbc:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-logging:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-security:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-thymeleaf:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-tomcat:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-web:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter-websocket:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-starter:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot-test:1.5.3.RELEASE'
dependency 'org.springframework.boot:spring-boot:1.5.3.RELEASE'
dependency 'org.springframework.data:spring-data-commons:1.13.3.RELEASE'
dependency 'org.springframework.data:spring-data-jpa:1.11.3.RELEASE'
dependency 'org.springframework.data:spring-data-keyvalue:1.2.3.RELEASE'
dependency 'org.springframework.data:spring-data-redis:1.8.3.RELEASE'
dependency 'org.springframework.security:spring-security-config:4.2.2.RELEASE'
dependency 'org.springframework.security:spring-security-core:4.2.2.RELEASE'
dependency 'org.springframework.security:spring-security-data:4.2.2.RELEASE'
dependency 'org.springframework.security:spring-security-messaging:4.2.2.RELEASE'
dependency 'org.springframework.security:spring-security-test:4.2.2.RELEASE'
dependency 'org.springframework.security:spring-security-web:4.2.2.RELEASE'
dependency 'org.springframework:spring-aop:4.3.8.RELEASE'
dependency 'org.springframework:spring-aspects:4.3.8.RELEASE'
dependency 'org.springframework:spring-beans:4.3.8.RELEASE'
dependency 'org.springframework:spring-context-support:4.3.8.RELEASE'
dependency 'org.springframework:spring-context:4.3.8.RELEASE'
dependency 'org.springframework:spring-core:4.3.8.RELEASE'
dependency 'org.springframework:spring-expression:4.3.8.RELEASE'
dependency 'org.springframework:spring-jcl:5.0.0.RC1'
dependency 'org.springframework:spring-jdbc:4.3.8.RELEASE'
dependency 'org.springframework:spring-messaging:4.3.8.RELEASE'
dependency 'org.springframework:spring-orm:4.3.8.RELEASE'
dependency 'org.springframework:spring-oxm:4.3.8.RELEASE'
dependency 'org.springframework:spring-test:4.3.8.RELEASE'
dependency 'org.springframework:spring-tx:4.3.8.RELEASE'
dependency 'org.springframework:spring-web:4.3.8.RELEASE'
dependency 'org.springframework:spring-webmvc:4.3.8.RELEASE'
dependency 'org.springframework:spring-websocket:4.3.8.RELEASE'
dependency 'org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE'
dependency 'org.thymeleaf:thymeleaf:2.1.5.RELEASE'
dependency 'org.unbescape:unbescape:1.1.0.RELEASE'
dependency 'org.w3c.css:sac:1.3'
dependency 'org.webjars:bootstrap:2.3.2'
dependency 'org.webjars:html5shiv:3.7.3'
dependency 'org.webjars:jquery:1.9.0'
dependency 'org.webjars:knockout:2.3.0'
dependency 'org.webjars:sockjs-client:0.3.4'
dependency 'org.webjars:stomp-websocket:2.3.0'
dependency 'org.webjars:webjars-locator-core:0.32'
dependency 'org.webjars:webjars-locator:0.32-1'
dependency 'org.yaml:snakeyaml:1.17'
dependency 'redis.clients:jedis:2.9.0'
dependency 'xalan:serializer:2.7.2'
dependency 'xalan:xalan:2.7.2'
dependency 'xerces:xercesImpl:2.11.0'
dependency 'xml-apis:xml-apis:1.4.01'
}
}

1
samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle
View File

@@ -2,6 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
dependencies {
compile project(':spring-session-jdbc')
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-thymeleaf"
compile "org.springframework.boot:spring-boot-starter-security"
compile "org.springframework.boot:spring-boot-devtools"

4
samples/boot/jdbc/src/main/java/sample/config/WebMvcConfig.java
View File

@@ -18,10 +18,10 @@ package sample.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter {
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addViewControllers(ViewControllerRegistry registry) {

2
samples/boot/jdbc/src/main/resources/templates/index.html
View File

@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
<head>
<title>Secured Content</title>
</head>

2
samples/boot/jdbc/src/main/resources/templates/layout.html
View File

@@ -3,7 +3,7 @@
xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
<style type="text/css">

3
samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle
View File

@@ -5,6 +5,7 @@ dependencies {
exclude module: 'jedis'
exclude module: 'commons-pool2'
}
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-thymeleaf"
compile "org.springframework.boot:spring-boot-starter-security"
compile "org.springframework.boot:spring-boot-devtools"
@@ -12,7 +13,7 @@ dependencies {
compile "org.webjars:bootstrap"
compile "org.webjars:html5shiv"
compile "org.webjars:webjars-locator"
compile "biz.paluch.redis:lettuce"
compile "io.lettuce:lettuce-core"
compile "org.apache.httpcomponents:httpclient"
testCompile "org.springframework.boot:spring-boot-starter-test"

4
samples/boot/redis-json/src/main/java/sample/config/WebMvcConfig.java
View File

@@ -18,10 +18,10 @@ package sample.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter {
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addViewControllers(ViewControllerRegistry registry) {

2
samples/boot/redis-json/src/main/resources/templates/home.html
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
<head>
<title>Home</title>
</head>

2
samples/boot/redis-json/src/main/resources/templates/layout.html
View File

@@ -3,7 +3,7 @@
xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
<style type="text/css">

2
samples/boot/redis-json/src/main/resources/templates/login.html
View File

@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
<head>
<title>Login</title>
</head>

1
samples/boot/redis/spring-session-sample-boot-redis.gradle
View File

@@ -2,6 +2,7 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
dependencies {
compile project(':spring-session-data-redis')
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-thymeleaf"
compile "org.springframework.boot:spring-boot-starter-security"
compile "org.springframework.boot:spring-boot-devtools"

4
samples/boot/redis/src/main/java/sample/config/WebMvcConfig.java
View File

@@ -18,10 +18,10 @@ package sample.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter {
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addViewControllers(ViewControllerRegistry registry) {

2
samples/boot/redis/src/main/resources/templates/index.html
View File

@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
<head>
<title>Secured Content</title>
</head>

2
samples/boot/redis/src/main/resources/templates/layout.html
View File

@@ -3,7 +3,7 @@
xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
<style type="text/css">

3
samples/boot/websocket/spring-session-sample-boot-websocket.gradle
View File

@@ -5,6 +5,7 @@ dependencies {
exclude module: 'jedis'
exclude module: 'commons-pool2'
}
compile "org.springframework.boot:spring-boot-starter-web"
compile "org.springframework.boot:spring-boot-starter-thymeleaf"
compile "org.springframework.boot:spring-boot-starter-security"
compile "org.springframework.boot:spring-boot-starter-data-jpa"
@@ -20,7 +21,7 @@ dependencies {
compile "org.webjars:sockjs-client"
compile "org.webjars:stomp-websocket"
compile "org.webjars:webjars-locator"
compile "biz.paluch.redis:lettuce"
compile "io.lettuce:lettuce-core"
compile "com.h2database:h2"
testCompile "org.springframework.boot:spring-boot-starter-test"

4
samples/boot/websocket/src/main/java/sample/config/WebMvcConfig.java
View File

@@ -18,10 +18,10 @@ package sample.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebMvcConfig extends WebMvcConfigurerAdapter {
public class WebMvcConfig implements WebMvcConfigurer {
@Override
public void addViewControllers(ViewControllerRegistry registry) {

11
samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java
View File

@@ -18,7 +18,6 @@ package sample.websocket;
import java.util.Arrays;
import sample.data.ActiveWebSocketUser;
import sample.data.ActiveWebSocketUserRepository;
import org.springframework.context.ApplicationListener;
@@ -42,14 +41,10 @@ public class WebSocketDisconnectHandler<S>
if (id == null) {
return;
}
ActiveWebSocketUser user = this.repository.findOne(id);
if (user == null) {
return;
}
this.repository.delete(id);
this.repository.findById(id).ifPresent(user -> {
this.repository.deleteById(id);
this.messagingTemplate.convertAndSend("/topic/friends/signout",
Arrays.asList(user.getUsername()));
});
}
}

2
samples/boot/websocket/src/main/resources/templates/index.html
View File

@@ -1,4 +1,4 @@
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout}">
<head>
<title>View All</title>
</head>

2
samples/boot/websocket/src/main/resources/templates/layout.html
View File

@@ -3,7 +3,7 @@
xmlns:th="http://www.thymeleaf.org"
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<head>
<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
<link rel="icon" type="image/x-icon" th:href="@{/favicon.ico}" href="../static/favicon.ico"/>
<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
<style type="text/css">