Release 2.1.0.M3

See gh-1111

.editorconfig

@@ -0,0 +1,19 @@
+root = true
+
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 120
+
+[*.java]
+indent_style = tab
+indent_size = 4
+charset = latin1
+continuation_indent_size = 8
+
+[*.xml]
+indent_style = tab
+indent_size = 4
+charset = latin1
+continuation_indent_size = 8

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,7 @@
+<!--
+For Security Vulnerabilities, please use https://pivotal.io/security#reporting
+-->
+
 <!--
 Thanks for raising a Spring Session issue. Please provide a brief description of your problem along with the version of Spring Session that you are using. If possible, please also consider putting together a sample application that reproduces the issue.
 -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,7 @@
+<!--
+For Security Vulnerabilities, please use https://pivotal.io/security#reporting
+-->
+
 <!--
 Thanks for contributing to Spring Session. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
 -->

.gitignore

@@ -10,5 +10,6 @@ target
 out
 .springBeans
 *.rdb
-!eclispe/.checkstyle
-.checkstyle
+.checkstyle
+!etc/eclipse/.checkstyle
+!**/src/**/build

.travis.yml

@@ -1,19 +1,20 @@
 language: java
 
-services:
-  - redis-server
+sudo: required
 
-jdk:
-  - oraclejdk8
+services: docker
 
-os:
-  - linux
+jdk: oraclejdk8
 
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-script: ./gradlew build
+install: true
+
+script: ./gradlew clean build --refresh-dependencies --no-daemon

Jenkinsfile

@@ -0,0 +1,95 @@
+properties([
+		buildDiscarder(logRotator(numToKeepStr: '10')),
+		pipelineTriggers([
+				cron('@daily')
+		]),
+])
+
+def SUCCESS = hudson.model.Result.SUCCESS.toString()
+currentBuild.result = SUCCESS
+
+try {
+	parallel check: {
+		stage('Check') {
+			timeout(time: 30, unit: 'MINUTES') {
+				node {
+					checkout scm
+					try {
+						sh './gradlew clean check --no-daemon --refresh-dependencies'
+					}
+					catch (e) {
+						currentBuild.result = 'FAILED: check'
+						throw e
+					}
+					finally {
+						junit '**/build/test-results/*/*.xml'
+					}
+				}
+			}
+		}
+	}
+
+	if (currentBuild.result == 'SUCCESS') {
+		parallel artifacts: {
+			stage('Deploy Artifacts') {
+				node {
+					checkout scm
+					try {
+						withCredentials([file(credentialsId: 'spring-signing-secring.gpg', variable: 'SIGNING_KEYRING_FILE')]) {
+							withCredentials([string(credentialsId: 'spring-gpg-passphrase', variable: 'SIGNING_PASSWORD')]) {
+								withCredentials([usernamePassword(credentialsId: 'oss-token', passwordVariable: 'OSSRH_PASSWORD', usernameVariable: 'OSSRH_USERNAME')]) {
+									withCredentials([usernamePassword(credentialsId: '02bd1690-b54f-4c9f-819d-a77cb7a9822c', usernameVariable: 'ARTIFACTORY_USERNAME', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
+										sh './gradlew deployArtifacts finalizeDeployArtifacts --stacktrace --no-daemon --refresh-dependencies -Psigning.secretKeyRingFile=$SIGNING_KEYRING_FILE -Psigning.keyId=$SPRING_SIGNING_KEYID -Psigning.password=$SIGNING_PASSWORD -PossrhUsername=$OSSRH_USERNAME -PossrhPassword=$OSSRH_PASSWORD -PartifactoryUsername=$ARTIFACTORY_USERNAME -PartifactoryPassword=$ARTIFACTORY_PASSWORD'
+									}
+								}
+							}
+						}
+					}
+					catch (e) {
+						currentBuild.result = 'FAILED: artifacts'
+						throw e
+					}
+				}
+			}
+		},
+		docs: {
+			stage('Deploy Docs') {
+				node {
+					checkout scm
+					try {
+						withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
+							sh './gradlew deployDocs --stacktrace --no-daemon --refresh-dependencies -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME'
+						}
+					}
+					catch (e) {
+						currentBuild.result = 'FAILED: docs'
+						throw e
+					}
+				}
+			}
+		}
+	}
+}
+finally {
+	def buildStatus = currentBuild.result
+	def buildNotSuccess = !SUCCESS.equals(buildStatus)
+	def lastBuildNotSuccess = !SUCCESS.equals(currentBuild.previousBuild?.result)
+
+	if (buildNotSuccess || lastBuildNotSuccess) {
+		stage('Notify') {
+			node {
+				final def RECIPIENTS = [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']]
+
+				def subject = "${buildStatus}: Build ${env.JOB_NAME} ${env.BUILD_NUMBER} status is now ${buildStatus}"
+				def details = "The build status changed to ${buildStatus}. For details see ${env.BUILD_URL}"
+
+				emailext(
+						subject: subject,
+						body: details,
+						recipientProviders: RECIPIENTS,
+						to: "$SPRING_SESSION_TEAM_EMAILS"
+				)
+			}
+		}
+	}
+}

LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.adoc

@@ -1,26 +1,32 @@
-image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
-
-image:https://travis-ci.org/spring-projects/spring-session.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-session"]
-
 = Spring Session
-Rob Winch
 
-Spring Session aims to provide a common infrastructure for managing sessions. This provides many benefits including:
+image:https://travis-ci.org/spring-projects/spring-session.svg?branch=master["Build Status", link="https://travis-ci.org/spring-projects/spring-session"] image:https://badges.gitter.im/spring-projects/spring-session.svg[link="https://gitter.im/spring-projects/spring-session?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 
-* Accessing a session from any environment (i.e. web, messaging infrastructure, etc)
-* In a web environment
-** Support for clustering in a vendor neutral way
-** Pluggable strategy for determining the session id
-** Easily keep the HttpSession alive when a WebSocket is active
+Spring Session provides an API and implementations for managing a user's session information, while also making it trivial to support clustered sessions without being tied to an application container specific solution.
+It also provides transparent integration with:
+
+* `HttpSession` - allows replacing the `HttpSession` in an application container (i.e. Tomcat) neutral way, with support for providing session IDs in headers to work with RESTful APIs.
+* `WebSocket` - provides the ability to keep the `HttpSession` alive when receiving WebSocket messages
+* `WebSession` - allows replacing the Spring WebFlux's `WebSession` in an application container neutral way.
+
+== Modules
+
+Spring Session consists of the following modules:
+
+* Spring Session Core - provides core Spring Session functionalities and APIs
+* Spring Session Data Redis - provides `SessionRepository` and `ReactiveSessionRepository` implementation backed by Redis and configuration support
+* Spring Session JDBC - provides `SessionRepository` implementation backed by a relational database and configuration support
+* Spring Session Hazelcast - provides `SessionRepository` implementation backed by Hazelcast and configuration support
 
 == Code of Conduct
+
 This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
 By participating, you  are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
 
-= Spring Session Project Site
+== Spring Session Project Site
 
 You can find the documentation, issue management, support, samples, and guides for using Spring Session at http://projects.spring.io/spring-session/
 
-= License
+== License
 
 Spring Session is Open Source software released under the http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].

build.gradle

@@ -1,72 +1,20 @@
 buildscript {
-	repositories {
-		maven { url "https://repo.spring.io/plugins-release" }
-	}
 	dependencies {
-		classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
-		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-		classpath("io.spring.gradle:spring-io-plugin:0.0.4.RELEASE")
-		classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
-		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2'
-		classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.18.RELEASE'
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+	}
+	repositories {
+		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 }
-
-plugins {
-	id "org.sonarqube" version "1.2"
-}
+apply plugin: 'io.spring.convention.root'
 
 group = 'org.springframework.session'
+description = 'Spring Session'
 
-ext.springBootVersion = '1.3.2.RELEASE'
-ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
-ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
-ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"
-ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
-ext.SAMPLE_GRADLE = "$rootDir/gradle/sample.gradle"
-ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle"
-ext.TOMCAT_6_GRADLE = "$rootDir/gradle/tomcat6.gradle"
-ext.TOMCAT_7_GRADLE = "$rootDir/gradle/tomcat7.gradle"
 
 ext.releaseBuild = version.endsWith('RELEASE')
 ext.snapshotBuild = version.endsWith('SNAPSHOT')
 ext.milestoneBuild = !(releaseBuild || snapshotBuild)
 
-apply plugin: 'base'
 
-
-sonarqube {
-	properties {
-		property "sonar.java.coveragePlugin", "jacoco"
-		property "sonar.projectName", "Spring Session"
-		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
-		property "sonar.links.homepage", 'https://github.com/spring-projects/spring-session'
-		property "sonar.links.ci", 'https://build.spring.io/browse/SESSION'
-		property "sonar.links.issue", 'https://github.com/spring-projects/spring-session/issues'
-		property "sonar.links.scm", 'https://github.com/spring-projects/spring-session'
-		property "sonar.links.scm_dev", 'https://github.com/spring-projects/spring-session.git'
-		property "sonar.java.coveragePlugin", "jacoco"
-	}
-}
-
-task configDocsZip(dependsOn: [':docs:asciidoctor',':spring-session:javadoc']) << {
-	project.tasks.docsZip.from(project(':docs').asciidoctor) {
-		into('reference')
-	}
-	project.tasks.docsZip.from(project(':spring-session').javadoc) {
-		into('api')
-	}
-}
-
-
-task docsZip(type: Zip, dependsOn: 'configDocsZip') {
-	group = "Distribution"
-	baseName = "spring-session"
-	classifier = "docs"
-	description = "Builds -${classifier} archive containing api and reference " +
-			"for deployment."
-}
-
-artifacts {
-	archives docsZip
-}

config/checkstyle/checkstyle.xml

@@ -1,166 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
-<module name="Checker">
-	<!-- Suppressions -->
-	<module name="SuppressionFilter">
-		<property name="file" value="${configDir}/suppressions.xml"/>
-	</module>
-
-	<!-- Root Checks -->
-	<module name="RegexpHeader">
-		<property name="headerFile" value="${configDir}/header.txt"/>
-		<property name="fileExtensions" value="java"/>
-	</module>
-	<module name="NewlineAtEndOfFile">
-		<property name="lineSeparator" value="lf"/>
-		<property name="fileExtensions" value="java,xml"/>
-	</module>
-
-	<!-- TreeWalker Checks -->
-	<module name="TreeWalker">
-		<!-- Annotations -->
-		<module name="AnnotationUseStyle">
-			<property name="elementStyle" value="compact"/>
-		</module>
-		<module name="MissingOverride"/>
-		<module name="PackageAnnotation"/>
-		<module name="AnnotationLocation">
-			<property name="allowSamelineSingleParameterlessAnnotation" value="false" />
-		</module>
-
-		<!-- Block Checks -->
-		<module name="EmptyBlock">
-			<property name="option" value="text"/>
-		</module>
-		<module name="LeftCurly"/>
-		<module name="RightCurly">
-			<property name="option" value="alone"/>
-		</module>
-		<module name="NeedBraces"/>
-		<module name="AvoidNestedBlocks"/>
-
-		<!-- Class Design -->
-		<module name="FinalClass"/>
-		<module name="InterfaceIsType"/>
-		<module name="HideUtilityClassConstructor"/>
-		<module name="MutableException"/>
-		<module name="InnerTypeLast"/>
-		<module name="OneTopLevelClass"/>
-
-		<!-- Coding -->
-		<module name="CovariantEquals"/>
-		<module name="EmptyStatement"/>
-		<module name="EqualsHashCode"/>
-		<module name="InnerAssignment"/>
-		<module name="SimplifyBooleanExpression"/>
-		<module name="SimplifyBooleanReturn"/>
-		<module name="StringLiteralEquality"/>
-		<module name="NestedForDepth">
-			<property name="max" value="3"/>
-		</module>
-		<module name="NestedIfDepth">
-			<property name="max" value="3"/>
-		</module>
-		<module name="NestedTryDepth">
-			<property name="max" value="3"/>
-		</module>
-		<module name="MultipleVariableDeclarations"/>
-		<module name="RequireThis">
-			<property name="checkMethods" value="false"/>
-		</module>
-		<module name="OneStatementPerLine"/>
-
-		<!-- Imports -->
-		<module name="AvoidStarImport"/>
-		<module name="AvoidStaticImport">
-			<property name="excludes"
-					value="org.assertj.core.api.Assertions.*, org.mockito.Mockito.*, org.mockito.BDDMockito.*, org.mockito.AdditionalMatchers.*, org.mockito.Matchers.*, org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*, org.springframework.test.web.servlet.result.MockMvcResultHandlers.*, org.springframework.test.web.servlet.result.MockMvcResultMatchers.*, org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*, org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo"/>
-		</module>
-		<module name="IllegalImport"/>
-		<module name="RedundantImport"/>
-		<module name="UnusedImports">
-			<property name="processJavadoc" value="true"/>
-		</module>
-		<module name="ImportOrder">
-			<property name="groups" value="java,/^javax?\./,*,org.springframework"/>
-			<property name="ordered" value="true"/>
-			<property name="separated" value="true"/>
-			<property name="option" value="bottom"/>
-			<property name="sortStaticImportsAlphabetically" value="true"/>
-		</module>
-
-		<!-- Javadoc Comments -->
-		<module name="JavadocType">
-			<property name="scope" value="package"/>
-			<property name="authorFormat" value=".+\s.+"/>
-		</module>
-		<module name="JavadocMethod">
-			<property name="allowMissingJavadoc" value="true"/>
-		</module>
-		<module name="JavadocVariable">
-			<property name="scope" value="public"/>
-		</module>
-		<module name="JavadocStyle">
-			<property name="checkEmptyJavadoc" value="true"/>
-		</module>
-		<module name="NonEmptyAtclauseDescription"/>
-		<module name="JavadocTagContinuationIndentation">
-			<property name="offset" value="0"/>
-		</module>
-		<module name="AtclauseOrder">
-			<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF"/>
-			<property name="tagOrder" value="@param, @author, @since, @see, @version, @serial, @deprecated"/>
-		</module>
-		<module name="AtclauseOrder">
-			<property name="target" value="METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
-			<property name="tagOrder" value="@param, @return, @throws, @since, @deprecated, @see"/>
-		</module>
-
-		<!-- Miscellaneous -->
-		<module name="CommentsIndentation"/>
-		<module name="UpperEll"/>
-		<module name="ArrayTypeStyle"/>
-		<module name="OuterTypeFilename"/>
-
-		<!-- Modifiers -->
-		<module name="RedundantModifier"/>
-
-		<!-- Regexp -->
-		<module name="RegexpSinglelineJava">
-			<property name="format" value="^\t* +\t*\S"/>
-			<property name="message" value="Line has leading space characters; indentation should be performed with tabs only."/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="RegexpSinglelineJava">
-			<property name="maximum" value="0"/>
-			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)"/>
-			<property name="message"
-				value="Please use BDDMockto imports."/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="RegexpSinglelineJava">
-			<property name="maximum" value="0"/>
-			<property name="format" value="org\.junit\.Assert\.assert"/>
-			<property name="message" value="Please use AssertJ imports."/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="Regexp">
-			<property name="format" value="[ \t]+$"/>
-			<property name="illegalPattern" value="true"/>
-			<property name="message" value="Trailing whitespace"/>
-		</module>
-
-		<!-- Whitespace -->
-		<module name="GenericWhitespace"/>
-		<module name="MethodParamPad"/>
-		<module name="NoWhitespaceAfter">
-			<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, ARRAY_DECLARATOR"/>
-		</module>
-		<module name="NoWhitespaceBefore"/>
-		<module name="ParenPad"/>
-		<module name="TypecastParenPad"/>
-		<module name="WhitespaceAfter"/>
-		<module name="WhitespaceAround"/>
-	</module>
-</module>

config/checkstyle/header.txt

@@ -1,16 +0,0 @@
-^\Q/*\E$
-^\Q * Copyright 2014-\E20\d\d\Q the original author or authors.\E$
-^\Q *\E$
-^\Q * Licensed under the Apache License, Version 2.0 (the "License");\E$
-^\Q * you may not use this file except in compliance with the License.\E$
-^\Q * You may obtain a copy of the License at\E$
-^\Q *\E$
-^\Q *      http://www.apache.org/licenses/LICENSE-2.0\E$
-^\Q *\E$
-^\Q * Unless required by applicable law or agreed to in writing, software\E$
-^\Q * distributed under the License is distributed on an "AS IS" BASIS,\E$
-^\Q * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\E$
-^\Q * See the License for the specific language governing permissions and\E$
-^\Q * limitations under the License.\E$
-^\Q */\E$
-^.*$

config/checkstyle/suppressions.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
-<suppressions>
-	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor"/>
-	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor"/>
-
-	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc"/>
-	<suppress files="[\\/]src[\\/]integration-test[\\/]java[\\/]" checks="Javadoc"/>
-
-	<suppress files="[\\/]docs[\\/]" checks="Javadoc"/>
-	<suppress files="[\\/]docs[\\/]" checks="CommentsIndentation"/>
-	<suppress files="[\\/]docs[\\/]" checks="InnerTypeLast"/>
-
-	<suppress files="[\\/]samples[\\/]" checks="Javadoc"/>
-	<suppress files="[\\/]samples[\\/]" checks="CommentsIndentation"/>
-	<suppress files="[\\/]samples[\\/]" checks="InnerTypeLast"/>
-</suppressions>

docs/build.gradle

@@ -1,71 +0,0 @@
-buildscript {
-	repositories {
-		jcenter()
-	}
-
-	dependencies {
-		classpath 'org.kordamp.gradle:livereload-gradle-plugin:0.2.1'
-	}
-}
-
-apply plugin: 'org.kordamp.gradle.livereload'
-apply from: JAVA_GRADLE
-apply plugin: 'org.asciidoctor.convert'
-
-liveReload {
-	docRoot asciidoctor.sourceDir.canonicalPath
-}
-
-asciidoctorj {
-
-}
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-
-dependencies {
-		testCompile project(':spring-session'),
-				project(':spring-session-data-mongo'),
-				"org.springframework.data:spring-data-gemfire:$springDataGemFireVersion",
-				"org.springframework.data:spring-data-redis:$springDataRedisVersion",
-				"org.springframework:spring-websocket:${springVersion}",
-				"org.springframework:spring-messaging:${springVersion}",
-				"org.springframework:spring-jdbc:${springVersion}",
-				"org.springframework.security:spring-security-config:${springSecurityVersion}",
-				"org.springframework.security:spring-security-web:${springSecurityVersion}",
-				"org.springframework.security:spring-security-test:${springSecurityVersion}",
-				'junit:junit:4.11',
-				'org.mockito:mockito-core:1.9.5',
-				"org.springframework:spring-test:$springVersion",
-				"org.assertj:assertj-core:$assertjVersion",
-				"com.hazelcast:hazelcast:$hazelcastVersion",
-				"redis.clients:jedis:2.4.1",
-				"javax.servlet:javax.servlet-api:$servletApiVersion"
-}
-
-asciidoctor {
-	def ghTag = snapshotBuild ? 'master' : project.version
-	def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag/"
-	attributes	'version-snapshot': snapshotBuild,
-			'version-milestone': milestoneBuild,
-			'version-release': releaseBuild,
-			'gh-url': ghUrl,
-			'gh-samples-url': "$ghUrl/samples/",
-			'download-url' : "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
-			'spring-session-version' : version,
-			'spring-version' : springVersion,
-			'hazelcast-version' : hazelcastVersion,
-			'docs-itest-dir' : rootProject.projectDir.path + '/docs/src/integration-test/java/',
-			'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
-			'docs-test-resources-dir' : rootProject.projectDir.path + '/docs/src/test/resources/',
-			'samples-dir' : rootProject.projectDir.path + '/samples/',
-			'session-main-resources-dir' : rootProject.projectDir.path + '/spring-session/src/main/resources/',
-
-			'source-highlighter' : 'coderay',
-			'imagesdir':'./images',
-			'icons': 'font',
-			'sectanchors':'',
-			'idprefix':'',
-			'idseparator':'-',
-			'docinfo1':'true',
-			'revnumber' : project.version
-}

docs/spring-session-docs.gradle

@@ -0,0 +1,49 @@
+apply plugin: 'io.spring.convention.docs'
+apply plugin: 'io.spring.convention.spring-test'
+
+dependencies {
+	testCompile project(':spring-session-core')
+	testCompile project(':spring-session-data-redis')
+	testCompile project(':spring-session-hazelcast')
+	testCompile project(':spring-session-jdbc')
+	testCompile 'org.springframework:spring-jdbc'
+	testCompile 'org.springframework:spring-messaging'
+	testCompile 'org.springframework:spring-webmvc'
+	testCompile 'org.springframework:spring-websocket'
+	testCompile 'org.springframework.security:spring-security-config'
+	testCompile 'org.springframework.security:spring-security-web'
+	testCompile 'org.springframework.security:spring-security-test'
+	testCompile 'junit:junit'
+	testCompile 'org.mockito:mockito-core'
+	testCompile 'org.springframework:spring-test'
+	testCompile 'org.assertj:assertj-core'
+	testCompile 'com.hazelcast:hazelcast'
+	testCompile 'io.lettuce:lettuce-core'
+	testCompile 'javax.servlet:javax.servlet-api'
+}
+
+def versions = dependencyManagement.managedVersions
+
+asciidoctor {
+	def ghTag = snapshotBuild ? 'master' : project.version
+	def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag"
+
+	attributes 'docs-itest-dir': "$rootProject.projectDir.path/docs/src/integration-test/java/",
+			'docs-test-dir': "$rootProject.projectDir.path/docs/src/test/java/",
+			'docs-test-resources-dir': "$rootProject.projectDir.path/docs/src/test/resources/",
+			'download-url': "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
+			'gh-samples-url': "$ghUrl/samples/",
+			'gh-url': ghUrl,
+			'hazelcast-version': versions['com.hazelcast:hazelcast'],
+			'lettuce-version': versions['io.lettuce:lettuce-core'],
+			'samples-dir': "$rootProject.projectDir.path/samples/",
+			'session-jdbc-main-resources-dir': "${project(':spring-session-jdbc').projectDir.path}/src/main/resources/",
+			'spring-boot-version': project.springBootVersion,
+			'spring-data-redis-version': versions['org.springframework.data:spring-data-redis'],
+			'spring-framework-version': versions['org.springframework:spring-core'],
+			'spring-security-version': versions['org.springframework.security:spring-security-core'],
+			'spring-session-version': project.version,
+			'version-milestone': milestoneBuild,
+			'version-release': releaseBuild,
+			'version-snapshot': snapshotBuild
+}

docs/src/docs/asciidoc/guides/boot-findbyusername.adoc

@@ -6,8 +6,6 @@ This guide describes how to use Spring Session to find sessions by username.
 
 NOTE: The completed guide can be found in the <<findbyusername-sample, findbyusername application>>.
 
-NOTE: This feature will likely be refactored in the next release to account for https://github.com/spring-projects/spring-session/issues/301[#301]
-
 
 [[findbyusername-assumptions]]
 == Assumptions
@@ -33,10 +31,10 @@ Consider the following scenario:
 Wouldn't it be nice if we could allow the user to invalidate the session at the library from any device they authenticate with?
 This sample demonstrates how this is possible.
 
-[[findbyprincipalnamesessionrepository]]
+[[findbyindexnamesessionrepository]]
 == FindByIndexNameSessionRepository
 
-In order to look up a user by their username, you must first choose a `SessionRepository` that implements <<index.doc#api-findbyprincipalnamesessionrepository,FindByIndexNameSessionRepository>>.
+In order to look up a user by their username, you must first choose a `SessionRepository` that implements link:../#api-findbyindexnamesessionrepository[FindByIndexNameSessionRepository].
 Our sample application assumes that the Redis support is already setup, so we are ready to go.
 
 == Mapping the username
@@ -67,7 +65,7 @@ For example, our sample application includes the location and access type of the
 
 [source,java,indent=0]
 ----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
 ----
 
 We then inject that information into the session on each HTTP request using a `SessionDetailsFilter`.
@@ -75,7 +73,7 @@ For example:
 
 [source,java,indent=0]
 ----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
 ----
 
 We obtain the information we want and then set the `SessionDetails` as an attribute in the `Session`.
@@ -95,7 +93,7 @@ We can now find all the sessions for a specific user.
 
 [source,java,indent=0]
 ----
-include::{samples-dir}findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
 ----
 
 In our instance, we find all sessions for the currently logged in user.
@@ -110,12 +108,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:findbyusername:tomcatRun
+$ ./gradlew :spring-session-sample-boot-findbyusername:bootRun
 ----
 
 You should now be able to access the application at http://localhost:8080/

docs/src/docs/asciidoc/guides/boot-jdbc.adoc

@@ -21,65 +21,40 @@ If you are using Maven, ensure to add the following dependencies:
 	<dependency>
 		<groupId>org.springframework.session</groupId>
 		<artifactId>spring-session-jdbc</artifactId>
-		<version>{spring-session-version}</version>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-jdbc</artifactId>
 	</dependency>
 </dependencies>
 ----
 
-ifeval::["{version-snapshot}" == "true"]
-Since we are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
-----
-<repository>
-	<id>spring-milestone</id>
-	<url>https://repo.spring.io/libs-milestone</url>
-</repository>
-----
-endif::[]
+Spring Boot provides dependency management for Spring Session modules, so there's no need to explicitly declare dependency version.
 
 // tag::config[]
 
 [[httpsession-jdbc-boot-spring-configuration]]
-== Spring Configuration
+== Spring Boot Configuration
 
-After adding the required dependencies, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession` implementation with an implementation backed by Spring Session.
-Add the following Spring Configuration:
+After adding the required dependencies, we can create our Spring Boot configuration.
+Thanks to first-class auto configuration support, setting up Spring Session backed by a relational database is as simple as adding a single configuration property to your `application.properties`:
 
-[source,java]
+.src/main/resources/application.properties
 ----
-include::{samples-dir}httpsession-jdbc-boot/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+spring.session.store-type=jdbc # Session store type.
 ----
 
-<1> The `@EnableJdbcHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
+Under the hood, Spring Boot will apply configuration that is equivalent to manually adding `@EnableJdbcHttpSession` annotation.
+This creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
 The filter is what is in charge of replacing the `HttpSession` implementation to be backed by Spring Session.
-In this instance Spring Session is backed by a relational database.
+
+Further customization is possible using `application.properties`:
+
+.src/main/resources/application.properties
+----
+server.servlet.session.timeout= # Session timeout. If a duration suffix is not specified, seconds will be used.
+spring.session.jdbc.initialize-schema=embedded # Database schema initialization mode.
+spring.session.jdbc.schema=classpath:org/springframework/session/jdbc/schema-@@platform@@.sql # Path to the SQL file to use to initialize the database schema.
+spring.session.jdbc.table-name=SPRING_SESSION # Name of the database table used to store sessions.
+----
+
+For more information, refer to https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-session[Spring Session] portion of the Spring Boot documentation.
 
 [[httpsession-jdbc-boot-configuration]]
 == Configuring the DataSource
@@ -90,17 +65,17 @@ For example, you can include the following in your *application.properties*
 
 .src/main/resources/application.properties
 ----
-spring.datasource.url=jdbc:postgresql://localhost:5432/myapp
-spring.datasource.username=myapp
-spring.datasource.password=secret
+spring.datasource.url= # JDBC URL of the database.
+spring.datasource.username= # Login username of the database.
+spring.datasource.password= # Login password of the database.
 ----
 
-For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-configure-datasource[Configure a DataSource] portion of the Spring Boot documentation.
+For more information, refer to https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-configure-datasource[Configure a DataSource] portion of the Spring Boot documentation.
 
 [[httpsession-jdbc-boot-servlet-configuration]]
 == Servlet Container Initialization
 
-Our <<httpsession-jdbc-boot-spring-configuration,Spring Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
+Our <<httpsession-jdbc-boot-spring-configuration,Spring Boot Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
 The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with a custom implementation that is backed by Spring Session.
 
 In order for our `Filter` to do its magic, Spring needs to load our `Config` class.
@@ -120,7 +95,7 @@ The httpsession-jdbc-boot Sample Application demonstrates how to use Spring Sess
 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
 
 ----
-$ ./gradlew :samples:httpsession-jdbc-boot:bootRun
+$ ./gradlew :spring-session-sample-boot-jdbc:bootRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -145,7 +120,7 @@ Spring Session replaces the `HttpSession` with an implementation that is backed
 When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into H2 database.
 
 When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/h2-console/ (use `jdbc:h2:mem:testdb` for JDBC URL)
 

docs/src/docs/asciidoc/guides/boot-redis.adoc

@@ -1,5 +1,5 @@
 = Spring Session - Spring Boot
-Rob Winch
+Rob Winch, Vedran Pavić
 :toc:
 
 This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Spring Boot.
@@ -20,64 +20,38 @@ If you are using Maven, ensure to add the following dependencies:
 
 	<dependency>
 		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session</artifactId>
-		<version>{spring-session-version}</version>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-redis</artifactId>
+		<artifactId>spring-session-data-redis</artifactId>
 	</dependency>
 </dependencies>
 ----
 
-ifeval::["{version-snapshot}" == "true"]
-Since We are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
-----
-<repository>
-	<id>spring-milestone</id>
-	<url>https://repo.spring.io/libs-milestone</url>
-</repository>
-----
-endif::[]
+Spring Boot provides dependency management for Spring Session modules, so there's no need to explicitly declare dependency version.
 
 [[boot-spring-configuration]]
-== Spring Configuration
+== Spring Boot Configuration
 
-After adding the required dependencies, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession` implementation with an implementation backed by Spring Session.
-Add the following Spring Configuration:
+After adding the required dependencies, we can create our Spring Boot configuration.
+Thanks to first-class auto configuration support, setting up Spring Session backed by Redis is as simple as adding a single configuration property to your `application.properties`:
 
-[source,java]
+.src/main/resources/application.properties
 ----
-include::{samples-dir}boot/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+spring.session.store-type=redis # Session store type.
 ----
 
-<1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
+Under the hood, Spring Boot will apply configuration that is equivalent to manually adding `@EnableRedisHttpSession` annotation.
+This creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
 The filter is what is in charge of replacing the `HttpSession` implementation to be backed by Spring Session.
-In this instance Spring Session is backed by Redis.
+
+Further customization is possible using `application.properties`:
+
+.src/main/resources/application.properties
+----
+server.servlet.session.timeout= # Session timeout. If a duration suffix is not specified, seconds will be used.
+spring.session.redis.flush-mode=on-save # Sessions flush mode.
+spring.session.redis.namespace=spring:session # Namespace for keys used to store sessions.
+----
+
+For more information, refer to https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-session[Spring Session] portion of the Spring Boot documentation.
 
 [[boot-redis-configuration]]
 == Configuring the Redis Connection
@@ -88,17 +62,17 @@ For example, you can include the following in your *application.properties*
 
 .src/main/resources/application.properties
 ----
-spring.redis.host=localhost
-spring.redis.password=secret
-spring.redis.port=6379
+spring.redis.host=localhost # Redis server host.
+spring.redis.password= # Login password of the redis server.
+spring.redis.port=6379 # Redis server port.
 ----
 
-For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
+For more information, refer to https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
 
 [[boot-servlet-configuration]]
 == Servlet Container Initialization
 
-Our <<boot-spring-configuration,Spring Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
+Our <<boot-spring-configuration,Spring Boot Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
 The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with a custom implementation that is backed by Spring Session.
 
 In order for our `Filter` to do its magic, Spring needs to load our `Config` class.
@@ -106,23 +80,24 @@ Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `spring
 Fortunately, Spring Boot takes care of both of these steps for us.
 
 [[boot-sample]]
-== boot Sample Application
+== Boot Sample Application
 
-The boot Sample Application demonstrates how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Spring Boot.
+The Boot Sample Application demonstrates how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Spring Boot.
 
 [[boot-running]]
-=== Running the boot Sample Application
+=== Running the Boot Sample Application
 
 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:boot:bootRun
+$ ./gradlew :spring-session-sample-boot-redis:bootRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -147,13 +122,13 @@ Spring Session replaces the `HttpSession` with an implementation that is backed
 When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Redis.
 
 When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 

docs/src/docs/asciidoc/guides/boot-websocket.adoc

@@ -24,7 +24,7 @@ Please make sure you have already integrated Spring Session with the HttpSession
 [[websocket-spring-configuration]]
 == Spring Configuration
 
-In a typical Spring WebSocket application users would extend `AbstractWebSocketMessageBrokerConfigurer`.
+In a typical Spring WebSocket application users would implement `WebSocketMessageBrokerConfigurer`.
 For example, the configuration might look something like the following:
 
 [source,java]
@@ -38,12 +38,12 @@ For example:
 .src/main/java/samples/config/WebSocketConfig.java
 [source,java]
 ----
-include::{samples-dir}websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
+include::{samples-dir}boot/websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
 ----
 
 To hook in the Spring Session support we only need to change two things:
 
-<1> Instead of extending `AbstractWebSocketMessageBrokerConfigurer` we extend `AbstractSessionWebSocketMessageBrokerConfigurer`
+<1> Instead of implementing `WebSocketMessageBrokerConfigurer` we extend `AbstractSessionWebSocketMessageBrokerConfigurer`
 <2> We rename the `registerStompEndpoints` method to `configureStompEndpoints`
 
 What does `AbstractSessionWebSocketMessageBrokerConfigurer` do behind the scenes?
@@ -73,23 +73,23 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [TIP]
 ====
-For the purposes of testing session expiration, you may want to change the session expiration to be 1 minute (default is 30 minutes) by removing the comment from the following file before starting the application:
+For the purposes of testing session expiration, you may want to change the session expiration to be 1 minute (default is 30 minutes) by adding the following configuration property starting before the application:
 
-.src/main/java/samples/config/WebSecurityConfig.java
-[source,java]
+.src/main/resources/application.properties
 ----
-include::{samples-dir}websocket/src/main/java/sample/config/WebSecurityConfig.java[tags=enable-redis-httpsession]
+server.servlet.session.timeout=1m # Session timeout. If a duration suffix is not specified, seconds will be used.
 ----
 ====
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:websocket:bootRun
+$ ./gradlew :spring-session-sample-boot-websocket:bootRun
 ----
 
 You should now be able to access the application at http://localhost:8080/

docs/src/docs/asciidoc/guides/grails3.adoc

@@ -70,7 +70,7 @@ spring:
     port: 6397
 ----
 
-For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
+For more information, refer to https://docs.spring.io/spring-boot/docs/{spring-boot-version}/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
 
 [[grails3-sample]]
 == Grails 3 Sample Application
@@ -84,12 +84,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:grails3:bootRun
+$ ./gradlew :spring-session-sample-misc-grails3:bootRun
 ----
 
 You should now be able to access the application at http://localhost:8080/test/index
@@ -114,16 +115,19 @@ Spring Session replaces the `HttpSession` with an implementation that is backed
 When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Redis.
 
 When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 Now visit the application at http://localhost:8080/test/index and observe that we are no longer authenticated.
+
+NOTE: Spring Session will not work with grails flash scope without additional work. +
+See this answer for an explanation: https://stackoverflow.com/a/43311427

docs/src/docs/asciidoc/guides/httpsession-gemfire-boot.adoc

@@ -1,263 +0,0 @@
-= Spring Session - HttpSession with GemFire Client/Server using Spring Boot
-John Blum
-:toc:
-
-This guide describes how to build a _Spring Boot_ application configured with _Spring Session_ to transparently leverage
-Pivotal GemFire to back a web application's `HttpSession`.
-
-In this sample, GemFire's client/server topology is employed using a pair of _Spring Boot_ applications, one to
-configure and run a GemFire Server and another to configure and run the client, Spring MVC-based web application
-making use of the `HttpSession`.
-
-NOTE: The completed guide can be found in the <<httpsession-gemfire-boot-sample,HttpSession with GemFire using Spring Boot Sample Application>>.
-
-== Updating Dependencies
-Before using _Spring Session_, you must ensure that the required dependencies are included.
-If you are using Maven, include the following `dependencies` in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
-----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session-data-gemfire</artifactId>
-		<version>{spring-session-version}</version>
-		<type>pom</type>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-web</artifactId>
-	</dependency>
-</dependencies>
-----
-
-ifeval::["{version-snapshot}" == "true"]
-Since we are using a SNAPSHOT version, we need to add the Spring Snapshot Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since we are using a Milestone version, we need to add the Spring Milestone Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-milestone</id>
-		<url>https://repo.spring.io/libs-milestone</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-// tag::config[]
-[[httpsession-spring-java-configuration]]
-== Spring Boot Configuration
-
-After adding the required dependencies and repository declarations, we can create our Spring configuration
-for both the GemFire client and server using _Spring Boot_.  The Spring configuration is responsible for
-creating a Servlet Filter that replaces the `HttpSession` with an implementation backed by _Spring Session_
-and GemFire.
-
-=== Spring Boot-based GemFire Server
-
-We start with the _Spring Boot_ application for configuring and bootstrapping a GemFire Server process...
-
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java[tags=class]
-----
-
-<1> The `@EnableGemFireHttpSession` annotation is used on the GemFire Server mainly to define the corresponding
-Region (e.g. `ClusteredSpringSessions`, the default) in which Session state information will be stored
-and managed by GemFire.  As well, we have specified an arbitrary expiration attribute (i.e. `maxInactiveIntervalInSeconds`)
-for when the Session will timeout, which is triggered by a GemFire Region entry expiration event that also invalidates
-the Session object in the Region.
-<2> Next, we define a few `Properties` allowing us to configure certain aspects of the GemFire Server using
-http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-<3> Then, we create an instance of the GemFire Cache using our defined `Properties`.
-<4> Finally, we setup a Cache Server instance running in the GemFire Server to listen for connections from cache clients.
-The Cache Server `Socket` will be used to connect our GemFire client cache, _Spring Boot_ web application to the server.
-
-The sample also makes use of a `PropertySourcesPlaceholderConfigurer` bean in order to externalize the sample application
-configuration to affect GemFire and application configuration/behavior from the command-line (e.g. such as GemFire's
-`log-level` using the `gemfire.log.level` System property; more details below).
-
-=== Spring Boot-based GemFire cache client Web application
-
-Now, we create the _Spring Boot_ web application (a GemFire cache client), exposing our Web service
-using Spring MVC along with _Spring Session_ backed by GemFire, connected to our _Spring Boot_-based GemFire Server,
-in order to manage Session state in a cluster/replicated-enabled fashion.
-
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-boot/src/main/java/sample/client/Application.java[tags=class]
-----
-
-<1> Here, again, we use the `@EnableGemFireHttpSession` annotation to not only configure the GemFire cache client,
-but also to override the (HTTP) Web application container's `HttpSession` and replace it with a Session implementation
-backed by _Spring Session_ in conjunction with GemFire.  Also notice, we did not define any Session expiration timeout
-with the `maxInactiveIntervalInSeconds` attribute this time.  That is because the Session expiration is managed
-by GemFire, which will appropriately notify the cache client when the Session times out.  Again, we have just resorted
-to using the default Region, `ClusteredSpringSessions`.  Of course, we can change the Region name, but we must do so
-on both the client and the server.  That is a GemFire requirement, not a _Spring Session Data GemFire_ requirement.
-<2> Similary to the server configuration, we set a few basic GemFire System `Properties` on the client.
-<3> Although, this time, an instance of `ClientCache` is created with the `ClientCacheFactoryBean` from _Spring Data GemFire_.
-<4> However, in order to connect to the GemFire Server we must define a GemFire `Pool` bean containing pre-populated
-connections to the server.  Whenever a client Region entry operation corresponding to a Session update occurs,
-the client-side Region will use an existing, pooled connection to route the operation to the server.
-<5> The following _Spring_ `BeanPostProcessor` (along with some utility methods) are only needed for testing purposes
-and is not required by any production code.  Specifically, the `BeanPostProcessor` along with the code referenced in *6*
-is useful in integration test cases where the client and server processes are forked by the test framework.  It is pretty
-easy to figure out that a race condition is imminent without proper coordination between the client and the server,
-therefore, the BPP and `ClientMembershipListener` help sync the interaction between the client and the server
-on startup during automated testing.
-<6> See <5> above.
-<7> Navigates the Web application to the home page (`index.html`), which uses **Thymeleaf** templates for server-side
-pages.
-<8> Heartbeat web service endpoint (useful for manual testing purposes).
-<9> Web service endpoint for adding a Session attributes defined by the user using the Web application UI.  In addition,
-the webapp stores an additional Session attribute (`requestCount`) to keep track of how many HTTP requests the user
-has sent during the current "session".
-
-There are many other utility methods, so please refer to the actual source code for full details.
-
-TIP: In typical GemFire deployments, where the cluster includes potentially hundreds or thousands of GemFire data nodes
-(servers), it is more common for clients to connect to one or more GemFire Locators running in the cluster.  A Locator
-passes meta-data to clients about the servers available, their load and which servers have the client's data of interest,
-which is particularly important in direct, single-hop data access and latency-sensitive operations.  See more details
-about the http://gemfire.docs.pivotal.io/docs-gemfire/latest/topologies_and_comm/cs_configuration/chapter_overview.html[Client/Server Topology in GemFire's User Guide].
-
-NOTE: For more information on configuring _Spring Data GemFire_, refer to the http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/[reference guide].
-
-The `@EnableGemFireHttpSession` annotation enables a developer to configure certain aspects of both _Spring Session_
-and GemFire out-of-the-box using the following attributes:
-
-* `maxInactiveIntervalInSeconds` - controls _HttpSession_ idle-timeout expiration (defaults to **30 minutes**).
-* `regionName` - specifies the name of the GemFire Region used to store `HttpSession` state (defaults is "*ClusteredSpringSessions*").
-* `clientRegionShort` - specifies GemFire's http://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
-with a GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/client/ClientRegionShortcut.html[ClientRegionShortcut]
-(default is `PROXY`).  This attribute is only used when configuring client Region.
-* `serverRegionShort` - specifies GemFire's http://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
-using a GemFire http://data-docs-samples.cfapps.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/RegionShortcut.html[RegionShortcut]
-(default is `PARTITION`).  This attribute is only used when configuring server Regions, or when a p2p topology is employed.
-
-NOTE: It is important to note that the GemFire client Region name must match a server Region by the same name if
-the client Region is a `PROXY` or `CACHING_PROXY`.  Client and server Region names are not required to match if
-the client Region used to store Spring Sessions is `LOCAL`.  However, keep in mind that your session state will not
-be propagated to the server and you lose all the benefits of using GemFire to store and manage distributed, replicated
-session state information in a cluster.
-
-[[httpsession-gemfire-boot-sample]]
-== HttpSession with GemFire using Spring Boot Sample Application
-
-=== Running the httpsession-gemfire-boot Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following commands.
-
-First, you must run the server:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-boot:run [-Dgemfire.log-level=config]
-----
-
-Then, in a separate terminal, run the client:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-boot:bootRun [-Dgemfire.log-level=config]
-----
-
-You should now be able to access the application at http://localhost:8080/.  In this sample, the web application
-is the client cache and the server is standalone.
-
-=== Exploring the httpsession-gemfire-boot Sample Application
-
-Try using the application. Fill out the form with the following information:
-
-* **Attribute Name:** _username_
-* **Attribute Value:** _test_
-
-Now click the **Set Attribute** button. You should now see the attribute name and value displayed in the table
-along with an additional attribute (`requestCount`) indicating the number of Session interactions (via HTTP requests).
-
-=== How does it work?
-
-We interact with the standard `HttpSession` in the the Spring MVC web service endpoint, shown here for convenience:
-
-.src/main/java/sample/SessionServlet.java
-[source,java]
-----
-@RequestMapping(method = RequestMethod.POST, path = "/session")
-public String session(HttpSession session, ModelMap modelMap,
-		@RequestParam(name = "attributeName", required = false) String name,
-		@RequestParam(name = "attributeValue", required = false) String value) {
-
-	modelMap.addAttribute("sessionAttributes",
-		attributes(setAttribute(updateRequestCount(session), name, value)));
-
-	return INDEX_TEMPLATE_VIEW_NAME;
-}
-----
-
-Instead of using the embedded HTTP server's `HttpSession`, we are actually persisting the Session state in GemFire.
-_Spring Session_ creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome]
-or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
-see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
-
-If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
-at the command-line:
-
-	$ gfsh
-
-Then, enter the following commands in _Gfsh_ ensuring to replace `70002719-3c54-4c20-82c3-e7faa6b718f3` with the value
-of your SESSION cookie, or the session ID returned by the GemFire OQL query (which should match):
-
-....
-gfsh>connect --jmx-manager=localhost[1099]
-
-gfsh>query --query='SELECT * FROM /ClusteredSpringSessions.keySet'
-
-Result     : true
-startCount : 0
-endCount   : 20
-Rows       : 1
-
-Result
-------------------------------------
-70002719-3c54-4c20-82c3-e7faa6b718f3
-
-NEXT_STEP_NAME : END
-
-gfsh>remove --region=/ClusteredSpringSessions --key="70002719-3c54-4c20-82c3-e7faa6b718f3"
-....
-
-NOTE: The _GemFire User Guide_ has more detailed instructions on using http://gemfire.docs.pivotal.io/docs-gemfire/latest/tools_modules/gfsh/chapter_overview.html[gfsh].
-
-Now visit the application at http://localhost:8080/ again and observe that the attribute we added is no longer displayed.
-
-Alternatively, you can wait **20 seconds** for the session to expire and timeout, and then refresh the page.  The attribute
-we added should no longer be displayed in the table.

docs/src/docs/asciidoc/guides/httpsession-gemfire-clientserver-xml.adoc

@@ -1,272 +0,0 @@
-= Spring Session - HttpSession with GemFire Client/Server using XML (Quick Start)
-John Blum
-:toc:
-
-This guide describes how to configure Spring Session to transparently leverage Pivotal GemFire to back a web application's
-`HttpSession` using XML Configuration.
-
-NOTE: The completed guide can be found in the <<httpsession-gemfire-clientserver-xml-sample-app,HttpSession with GemFire (Client/Server) using XML Sample Application>>.
-
-== Updating Dependencies
-Before using Spring Session, you must ensure that the required dependencies are included.
-If you are using Maven, include the following `dependencies` in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
-----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session-data-gemfire</artifactId>
-		<version>{spring-session-version}</version>
-		<type>pom</type>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
-	</dependency>
-</dependencies>
-----
-
-ifeval::["{version-snapshot}" == "true"]
-Since we are using a SNAPSHOT version, we need to add the Spring Snapshot Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since we are using a Milestone version, we need to add the Spring Milestone Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-milestone</id>
-		<url>https://repo.spring.io/libs-milestone</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-// tag::config[]
-[[httpsession-spring-xml-configuration]]
-== Spring XML Configuration
-
-After adding the required dependencies and repository declarations, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession`
-with an implementation backed by Spring Session and GemFire.
-
-Add the following Spring Configuration:
-
-[source,xml]
-----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
-----
-
-<1> First, a `Properties` bean is created to reference GemFire configuration common to both the client and server,
-stored in the `META-INF/spring/application.properties` file.
-<2> The `application.properties` are used along with the `PropertySourcesPlaceholderConfigurer` bean to replace
-placeholders in the Spring XML configuration meta-data with property values.
-<3> Spring annotation configuration support is enabled with `<context:annotation-config/>` element so that any
-Spring beans declared in the XML config that are annotated with either Spring or Standard Java annotations supported
-by Spring will be configured appropriately.
-<4> `GemFireHttpSessionConfiguration` is registered to enable Spring Session functionality.
-<5> Then, a Spring `BeanPostProcessor` is registered to determine whether a GemFire Server at the designated host/port
-is running, blocking client startup until the server is available.
-<6> Next, we include a `Properties` bean to configure certain aspects of the GemFire client cache using
-http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-In this case, we are just setting GemFire's `log-level` from a sample application-specific System property, defaulting
-to `warning` if unspecified.
-<7> Finally, we create the GemFire client cache and configure a Pool of client connections to talk to the GemFire Server
-in our Client/Server topology. In our configuration, we use sensible settings for timeouts, number of connections
-and so on. Also, our `Pool` has been configured to connect directly to a server.
-
-TIP: In typical GemFire deployments, where the cluster includes potentially hundreds of GemFire data nodes (servers),
-it is more common for clients to connect to one or more GemFire Locators running in the cluster. A Locator passes meta-data
-to clients about the servers available, load and which servers have the client's data of interest, which is particularly
-important for single-hop, direct data access.  See more details about the http://gemfire.docs.pivotal.io/docs-gemfire/latest/topologies_and_comm/cs_configuration/chapter_overview.html[Client/Server Topology in GemFire's User Guide].
-
-NOTE: For more information on configuring _Spring Data GemFire_, refer to the http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/[reference guide].
-
-=== Server Configuration
-
-Now, we have only covered one side of the equation.  We also need a GemFire Server for our client to talk to and pass
-session state information up to the server to manage.
-
-In this sample, we will use the following GemFire Server Java Configuration:
-
-[source,xml]
-----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/resources/META-INF/spring/session-server.xml[tags=beans]
-----
-
-<1> First, we enable Spring annotation config support with the `<context:annotation-config>` element so that any
-Spring beans declared in the XML config that are annotated with either Spring or Standard Java annotations supported
-by Spring will be configured appropriately.
-<2> A `PropertySourcesPlaceholderConfigurer` is registered to replace placeholders in our Spring XML configuration
-meta-data with property values from `META-INF/spring/application.properties`.
-<3> We enable the same Spring Session functionality that we used on the client by registering an instance of `GemFireHttpSessionConfiguration`,
-except that we set the session expiration timeout to **30 seconds**. We will explain later what this means.
-<4> Next, we configure the GemFire Server using GemFire System properties very much like our P2P samples.
-With the `mcast-port` set to 0 and no `locators` property specified, our server will be standalone. We also allow a
-JMX client (e.g. _Gfsh_) to connect to our server with the use of the GemFire-specific JMX System properties.
-<5> Then, we create an instance of the GemFire peer cache using our GemFire System properties.
-<6> And finally, we also setup a GemFire `CacheServer` instance running on *localhost*, listening on port **11235**,
-to accept our client connection.
-
-The GemFire Server configuration gets bootstrapped with the following:
-
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/java/sample/Application.java[tags=class]
-----
-
-TIP: Instead of a simple Java class with a main method, you could also use _Spring Boot_.
-
-<1> The `@Configuration` annotation designates this Java class as a source for Spring configuration meta-data using
-Spring's annotation configuration support.
-<2> Primarily, the configuration comes from the `META-INF/spring/session-server.xml` file, which is also the reason
-why _Spring Boot_ was not used in this sample, since using XML seemingly defeats the purpose and benefits
-of using Spring Boot. However, this sample is about demonstrating how to use Spring XML to configure
-the GemFire client and server.
-
-== XML Servlet Container Initialization
-
-Our <<httpsession-spring-xml-configuration,Spring XML Configuration>> created a Spring bean named `springSessionRepositoryFilter`
-that implements `Filter`. The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with
-a custom implementation that is backed by Spring Session and GemFire.
-
-In order for our `Filter` to do its magic, we need to instruct Spring to load our `session-client.xml` configuration file.
-We do this with the following configuration:
-
-.src/main/webapp/WEB-INF/web.xml
-[source,xml,indent=0]
-----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
-----
-
-The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener]
-reads the `contextConfigLocation` context parameter value and picks up our _session-client.xml_ configuration file.
-
-Finally, we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter`
-for every request.
-
-The following snippet performs this last step for us:
-
-.src/main/webapp/WEB-INF/web.xml
-[source,xml,indent=0]
-----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
-----
-
-The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy]
-will look up a bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`. For every request that `DelegatingFilterProxy`
-is invoked, the `springSessionRepositoryFilter` will be invoked.
-// end::config[]
-
-[[httpsession-gemfire-clientserver-xml-sample-app]]
-== HttpSession with GemFire (Client/Server) using XML Sample Application
-
-
-=== Running the httpsession-gemfire-clientserver-xml Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following commands.
-
-First, you need to run the server using:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-clientserver-xml:run [-Dsample.httpsession.gemfire.log-level=info]
-----
-
-Now, in a separate terminal, you can run the client using:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-clientserver-xml:tomcatRun [-Dsample.httpsession.gemfire.log-level=info]
-----
-
-You should now be able to access the application at http://localhost:8080/.  In this sample, the web application
-is the client cache and the server is standalone.
-
-=== Exploring the httpsession-gemfire-clientserver-xml Sample Application
-
-Try using the application. Fill out the form with the following information:
-
-* **Attribute Name:** _username_
-* **Attribute Value:** _john_
-
-Now click the **Set Attribute** button. You should now see the values displayed in the table.
-
-=== How does it work?
-
-We interact with the standard `HttpSession` in the `SessionServlet` shown below:
-
-.src/main/java/sample/SessionServlet.java
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
-----
-
-Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.
-Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome]
-or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
-see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
-
-If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
-at the command-line:
-
-	$ gfsh
-
-Then, enter the following commands in _Gfsh_ ensuring to replace `70002719-3c54-4c20-82c3-e7faa6b718f3` with the value
-of your SESSION cookie, or the session ID returned by the GemFire OQL query (which should match):
-
-....
-gfsh>connect --jmx-manager=localhost[1099]
-
-gfsh>query --query='SELECT * FROM /ClusteredSpringSessions.keySet'
-
-Result     : true
-startCount : 0
-endCount   : 20
-Rows       : 1
-
-Result
-------------------------------------
-70002719-3c54-4c20-82c3-e7faa6b718f3
-
-NEXT_STEP_NAME : END
-
-gfsh>remove --region=/ClusteredSpringSessions --key="70002719-3c54-4c20-82c3-e7faa6b718f3"
-....
-
-NOTE: The _GemFire User Guide_ has more detailed instructions on using http://gemfire.docs.pivotal.io/docs-gemfire/latest/tools_modules/gfsh/chapter_overview.html[gfsh].
-
-Now visit the application at http://localhost:8080/ again and observe that the attribute we added is no longer displayed.
-
-Alternatively, you can wait *30 seconds* for the session to timeout (i.e. expire) and refresh the page.  Again, the
-attribute we added should no longer be displayed in the table. However, keep in mind, that by refreshing the page,
-you will inadvertently create a new (empty) session.  If you run the query again, you will also see two session IDs,
-the new and the old, since GemFire keeps a "tombstone" of the old session around.

docs/src/docs/asciidoc/guides/httpsession-gemfire-clientserver.adoc

@@ -1,274 +0,0 @@
-= Spring Session - HttpSession with GemFire Client/Server (Quick Start)
-John Blum
-:toc:
-
-This guide describes how to configure Spring Session to transparently leverage Pivotal GemFire to back a web application's
-`HttpSession` using Java Configuration.
-
-NOTE: The completed guide can be found in the <<httpsession-gemfire-clientserver-java-sample-app,HttpSession with GemFire (Client/Server) Sample Application>>.
-
-== Updating Dependencies
-Before using Spring Session, you must ensure that the required dependencies are included.
-If you are using Maven, include the following `dependencies` in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
-----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session-data-gemfire</artifactId>
-		<version>{spring-session-version}</version>
-		<type>pom</type>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
-	</dependency>
-</dependencies>
-----
-
-ifeval::["{version-snapshot}" == "true"]
-Since we are using a SNAPSHOT version, we need to add the Spring Snapshot Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since we are using a Milestone version, we need to add the Spring Milestone Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-milestone</id>
-		<url>https://repo.spring.io/libs-milestone</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-// tag::config[]
-[[httpsession-spring-java-configuration]]
-== Spring Java Configuration
-
-After adding the required dependencies and repository declarations, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession`
-with an implementation backed by Spring Session and GemFire.
-
-Add the following Spring Configuration:
-
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java[tags=class]
-----
-
-<1> The `@EnableGemFireHttpSession` annotation creates a Spring bean named `springSessionRepositoryFilter` that
-implements `Filter`. The filter is what replaces the `HttpSession` with an implementation backed by Spring Session.
-In this instance, Spring Session is backed by GemFire.
-<2> Next, we register a `Properties` bean that allows us to configure certain aspects of the GemFire client cache
-using http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-<3> Then, we configure a `Pool` of client connections to talk to the GemFire Server in our Client/Server topology. In our
-configuration, we have used sensible settings for timeouts, number of connections and so on. Also, the `Pool` has been
-configured to connect directly to a server. Learn more about various `Pool` configuration settings from the
-http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/client/PoolFactory.html[PoolFactory API].
-<4> After configuring a `Pool`, we create an instance of the GemFire client cache using the GemFire `Properties`
-and `Pool` to communicate with the server and perform cache data access operations.
-<5> Finally, we include a Spring `BeanPostProcessor` to block the client until our GemFire Server is up and running,
-listening for and accepting client connections.
-
-The `gemfireCacheServerReadyBeanPostProcessor` is necessary in order to coordinate the client and server in
-an automated fashion during testing, but unnecessary in situations where the GemFire cluster is already presently
-running, such as in production. This `BeanPostProcessor` implements 2 approaches to ensure our server has adequate
-time to startup.
-
-The first approach uses a timed wait, checking at periodic intervals to determine whether a client `Socket` connection
-can be made to the server's `CacheServer` endpoint.
-
-The second approach uses a GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/management/membership/ClientMembershipListener.html[ClientMembershipListener]
-that will be notified when the client has successfully connected to the server. Once a connection has been established,
-the listener releases the latch that the `BeanPostProcessor` will wait on (up to the specified timeout) in the
-`postProcessAfterInitialization` callback to block the client. Either one of these approaches are sufficient
-by themselves, but both are demonstrated here to illustrate how this might work and to give you ideas, or other options
-in practice.
-
-TIP: In typical GemFire deployments, where the cluster includes potentially hundreds of GemFire data nodes (servers),
-it is more common for clients to connect to one or more GemFire Locators running in the cluster. A Locator passes meta-data
-to clients about the servers available, load and which servers have the client's data of interest, which is particularly
-important for single-hop, direct data access.  See more details about the http://gemfire.docs.pivotal.io/docs-gemfire/latest/topologies_and_comm/cs_configuration/chapter_overview.html[Client/Server Topology in GemFire's User Guide].
-
-NOTE: For more information on configuring _Spring Data GemFire_, refer to the http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/[reference guide].
-
-The `@EnableGemFireHttpSession` annotation enables a developer to configure certain aspects of both Spring Session
-and GemFire out-of-the-box using the following attributes:
-
-* `maxInactiveIntervalInSeconds` - controls HttpSession idle-timeout expiration (defaults to **30 minutes**).
-* `regionName` - specifies the name of the GemFire Region used to store `HttpSession` state (defaults is "_ClusteredSpringSessions_").
-* `clientRegionShort` - specifies GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policies]
-with a GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/client/ClientRegionShortcut.html[ClientRegionShortcut]
-(default is `PROXY`).
-
-NOTE: It is important to note that the GemFire client Region name must match a server Region by the same name if
-the client Region is a `PROXY` or `CACHING_PROXY`.  Names are not required to match if the client Region used to
-store Spring Sessions is `LOCAL`, however, keep in mind that your session state will not be propagated to the server
-and you lose all benefits of using GemFire to store and manage distributed, replicated session state information
-in a cluster.
-
-NOTE: `serverRegionShort` is ignored in a client/server cache configuration and only applies when a peer-to-peer (P2P) topology,
-and more specifically, a GemFire peer cache is used.
-
-=== Server Configuration
-
-Now, we have only covered one side of the equation.  We also need a GemFire Server for our client to talk to and pass
-session state up to the server to manage.
-
-In this sample, we will use the following GemFire Server Java Configuration:
-
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java[tags=class]
-----
-
-<1> On the server, we also configure Spring Session using the `@EnableGemFireHttpSession` annotation. For one, this
-ensures that the Region names on both the client and server match (in this sample, we use the default "_ClusteredSpringSessions_").
-We have also set the session timeout to **30 seconds**. Later, we will see how this timeout is used.
-<2> Next, we configure the GemFire Server using GemFire System properties very much like our P2P samples.
-With the `mcast-port` set to 0 and no `locators` property specified, our server will be standalone. We also allow a
-JMX client (e.g. _Gfsh_) to connect to our server with the use of the GemFire-specific JMX System properties.
-<3> Then, we create an instance of the GemFire peer cache using our GemFire System properties.
-<4> We also setup a GemFire `CacheServer` instance running on **localhost**, listening on port **12480**,
-to accept our client connection.
-<5> Finally, we declare a `main` method as an entry point for launching and running our GemFire Server
-from the command-line.
-
-== Java Servlet Container Initialization
-
-Our <<httpsession-spring-java-configuration,Spring Java Configuration>> created a Spring bean named `springSessionRepositoryFilter`
-that implements `Filter`. The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession`
-with a custom implementation backed by Spring Session and GemFire.
-
-In order for our `Filter` to do its magic, Spring needs to load our `ClientConfig` class. We also need to ensure our
-Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request. Fortunately, Spring Session
-provides a utility class named `AbstractHttpSessionApplicationInitializer` to make both of these steps extremely easy.
-
-You can find an example below:
-
-.src/main/java/sample/Initializer.java
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/Initializer.java[tags=class]
-----
-
-NOTE: The name of our class (`Initializer`) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
-
-<1> The first step is to extend `AbstractHttpSessionApplicationInitializer`.
-This ensures that a Spring bean named `springSessionRepositoryFilter` is registered with our Servlet Container
-and used for every request.
-<2> `AbstractHttpSessionApplicationInitializer` also provides a mechanism to easily allow Spring to load our `ClientConfig`.
-// end::config[]
-
-[[httpsession-gemfire-clientserver-java-sample-app]]
-== HttpSession with GemFire (Client/Server) Sample Application
-
-
-=== Running the httpsession-gemfire-clientserver Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following commands.
-
-First, you need to run the server using:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-clientserver:run [-Dsample.httpsession.gemfire.log-level=info]
-----
-
-Then, in a separate terminal, you run the client using:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-clientserver:tomcatRun [-Dsample.httpsession.gemfire.log-level=info]
-----
-
-You should now be able to access the application at http://localhost:8080/.  In this sample, the web application
-is the client cache and the server is standalone.
-
-=== Exploring the httpsession-gemfire-clientserver Sample Application
-
-Try using the application. Fill out the form with the following information:
-
-* **Attribute Name:** _username_
-* **Attribute Value:** _john_
-
-Now click the **Set Attribute** button. You should now see the values displayed in the table.
-
-=== How does it work?
-
-We interact with the standard `HttpSession` in the `SessionServlet` shown below:
-
-.src/main/java/sample/SessionServlet.java
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
-----
-
-Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.
-Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome]
-or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
-see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
-
-If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
-at the command-line:
-
-	$ gfsh
-
-Then, enter the following commands in _Gfsh_ ensuring to replace `70002719-3c54-4c20-82c3-e7faa6b718f3` with the value
-of your SESSION cookie, or the session ID returned by the GemFire OQL query (which should match):
-
-....
-gfsh>connect --jmx-manager=localhost[1099]
-
-gfsh>query --query='SELECT * FROM /ClusteredSpringSessions.keySet'
-
-Result     : true
-startCount : 0
-endCount   : 20
-Rows       : 1
-
-Result
-------------------------------------
-70002719-3c54-4c20-82c3-e7faa6b718f3
-
-NEXT_STEP_NAME : END
-
-gfsh>remove --region=/ClusteredSpringSessions --key="70002719-3c54-4c20-82c3-e7faa6b718f3"
-....
-
-NOTE: The _GemFire User Guide_ has more detailed instructions on using http://gemfire.docs.pivotal.io/docs-gemfire/latest/tools_modules/gfsh/chapter_overview.html[gfsh].
-
-Now visit the application at http://localhost:8080/ again and observe that the attribute we added is no longer displayed.
-
-Alternatively, you can wait **30 seconds** for the session to expire and timeout, and then refresh the page.  The attribute
-we added should no longer be displayed in the table. However, keep in mind, that by refreshing the page, you will inadvertently
-create a new (empty) session.  If you run the query again, you will also see two session IDs, the new and the old,
-since GemFire keeps a "tombstone" of the old session around.

docs/src/docs/asciidoc/guides/httpsession-gemfire-p2p-xml.adoc

@@ -1,210 +0,0 @@
-= Spring Session - HttpSession with GemFire P2P using XML (Quick Start)
-John Blum, Rob Winch
-:toc:
-
-This guide describes how to configure Pivotal GemFire as a provider in Spring Session to transparently back
-a web application's `HttpSession` using XML Configuration.
-
-NOTE: The completed guide can be found in the <<httpsession-gemfire-p2p-xml-sample-app,HttpSession with GemFire (P2P) using XML Sample Application>>.
-
-== Updating Dependencies
-Before using Spring Session, you must ensure that the required dependencies are included.
-If you are using Maven, include the following `dependencies` in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
-----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session-data-gemfire</artifactId>
-		<version>{spring-session-version}</version>
-		<type>pom</type>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
-	</dependency>
-</dependencies>
-----
-
-ifeval::["{version-snapshot}" == "true"]
-Since we are using a SNAPSHOT version, we need to add the Spring Snapshot Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since we are using a Milestone version, we need to add the Spring Milestone Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-milestone</id>
-		<url>https://repo.spring.io/libs-milestone</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-// tag::config[]
-[[httpsession-spring-xml-configuration]]
-== Spring XML Configuration
-
-After adding the required dependencies and repository declarations, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession`
-with an implementation backed by Spring Session and GemFire.
-
-Add the following Spring Configuration:
-
-.src/main/webapp/WEB-INF/spring/session.xml
-[source,xml,indent=0]
-----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
-----
-
-<1> We use the combination of `<context:annotation-config/>` and `GemFireHttpSessionConfiguration` because Spring Session
-does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
-This creates a Spring bean with the name of `springSessionRepositoryFilter` that implements `Filter`. The filter is what
-replaces the `HttpSession` with an implementation backed by Spring Session.
-In this instance, Spring Session is backed by GemFire.
-<2> Then, we configure a GemFire peer cache using standard GemFire System properties.  We give the GemFire data node
-a name using the `name` property and set `mcast-port` to 0.  With the absence of a `locators` property, this data node
-will be a standalone server. GemFire's `log-level` is set using an application-specific System property
-(`sample.httpsession.gemfire.log-level`) that a user can specify on the command-line when running this application
-using either Maven or Gradle (default is "_warning_").
-<3> Finally, we create an instance of the GemFire peer cache that embeds GemFire in the same JVM process as the running
-Spring Session sample application.
-
-TIP: Additionally, we have configured this data node (server) as a GemFire Manager as well using GemFire-specific
-JMX System properties that enable JMX client (e.g. _Gfsh_) to connect to this running data node.
-
-NOTE: For more information on configuring _Spring Data GemFire_, refer to the http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/[reference guide].
-
-== XML Servlet Container Initialization
-
-Our <<httpsession-spring-xml-configuration,Spring XML Configuration>> created a Spring bean named `springSessionRepositoryFilter`
-that implements `Filter`. The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with
-a custom implementation that is backed by Spring Session and GemFire.
-
-In order for our `Filter` to do its magic, we need to instruct Spring to load our `session.xml` configuration file.
-We do this with the following configuration:
-
-.src/main/webapp/WEB-INF/web.xml
-[source,xml,indent=0]
-----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
-----
-
-The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener]
-reads the `contextConfigLocation` context parameter value and picks up our _session.xml_ configuration file.
-
-Finally, we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter`
-for every request.
-
-The following snippet performs this last step for us:
-
-.src/main/webapp/WEB-INF/web.xml
-[source,xml,indent=0]
-----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
-----
-
-The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy]
-will look up a bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`. For every request that `DelegatingFilterProxy`
-is invoked, the `springSessionRepositoryFilter` will be invoked.
-// end::config[]
-
-[[httpsession-gemfire-p2p-xml-sample-app]]
-== HttpSession with GemFire (P2P) using XML Sample Application
-
-
-=== Running the httpsession-gemfire-p2p-xml Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-p2p-xml:tomcatRun [-Dsample.httpsession.gemfire.log-level=info]
-----
-
-You should now be able to access the application at http://localhost:8080/
-
-=== Exploring the httpsession-gemfire-p2p-xml Sample Application
-
-Try using the application. Fill out the form with the following information:
-
-* **Attribute Name:** _username_
-* **Attribute Value:** _john_
-
-Now click the **Set Attribute** button. You should now see the values displayed in the table.
-
-=== How does it work?
-
-We interact with the standard `HttpSession` in the `SessionServlet` shown below:
-
-.src/main/java/sample/SessionServlet.java
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/java/sample/SessionServlet.java[tags=class]
-----
-
-Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.
-Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome]
-or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
-see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
-
-If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
-at the command-line:
-
-	$ gfsh
-
-Then, enter the following into _Gfsh_ ensuring to replace `70002719-3c54-4c20-82c3-e7faa6b718f3` with the value
-of your SESSION cookie, or the session ID returned by the GemFire OQL query (which should match):
-
-....
-gfsh>connect --jmx-manager=localhost[1099]
-
-gfsh>query --query='SELECT * FROM /ClusteredSpringSessions.keySet'
-
-Result     : true
-startCount : 0
-endCount   : 20
-Rows       : 1
-
-Result
-------------------------------------
-70002719-3c54-4c20-82c3-e7faa6b718f3
-
-NEXT_STEP_NAME : END
-
-gfsh>remove --region=/ClusteredSpringSessions --key="70002719-3c54-4c20-82c3-e7faa6b718f3"
-....
-
-NOTE: The _GemFire User Guide_ has more detailed instructions on using http://gemfire.docs.pivotal.io/docs-gemfire/latest/tools_modules/gfsh/chapter_overview.html[gfsh].
-
-Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

docs/src/docs/asciidoc/guides/httpsession-gemfire-p2p.adoc

@@ -1,209 +0,0 @@
-= Spring Session - HttpSession with GemFire P2P (Quick Start)
-John Blum, Rob Winch
-:toc:
-
-This guide describes how to configure Pivotal GemFire as a provider in Spring Session to transparently back
-a web application's `HttpSession` using Java Configuration.
-
-NOTE: The completed guide can be found in the <<httpsession-gemfire-p2p-java-sample-app,HttpSession with GemFire (P2P) Sample Application>>.
-
-== Updating Dependencies
-Before using Spring Session, you must ensure that the required dependencies are included.
-If you are using Maven, include the following `dependencies` in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
-----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session-data-gemfire</artifactId>
-		<version>{spring-session-version}</version>
-		<type>pom</type>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
-	</dependency>
-</dependencies>
-----
-
-ifeval::["{version-snapshot}" == "true"]
-Since we are using a SNAPSHOT version, we need to add the Spring Snapshot Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since we are using a Milestone version, we need to add the Spring Milestone Maven Repository.
-If you are using Maven, include the following `repository` declaration in your _pom.xml_:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-	<!-- ... -->
-
-	<repository>
-		<id>spring-milestone</id>
-		<url>https://repo.spring.io/libs-milestone</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-// tag::config[]
-[[httpsession-spring-java-configuration]]
-== Spring Java Configuration
-
-After adding the required dependencies and repository declarations, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession`
-with an implementation backed by Spring Session and GemFire.
-
-Add the following Spring Configuration:
-
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-p2p/src/main/java/sample/Config.java[tags=class]
-----
-
-<1> The `@EnableGemFireHttpSession` annotation creates a Spring bean named `springSessionRepositoryFilter` that
-implements `Filter`. The filter is what replaces the `HttpSession` with an implementation backed by Spring Session.
-In this instance, Spring Session is backed by GemFire.
-<2> Then, we configure a GemFire peer cache using standard GemFire System properties.  We give the GemFire data node
-a name using the `name` property and set `mcast-port` to 0.  With the absence of a `locators` property, this data node
-will be a standalone server. GemFire's `log-level` is set using an application-specific System property (`sample.httpsession.gemfire.log-level`)
-that a user can specify on the command-line when running this sample application using either Maven or Gradle (default is "_warning_").
-<3> Finally, we create an instance of the GemFire peer cache that embeds GemFire in the same JVM process as the running
-Spring Session sample application.
-
-TIP: Additionally, we have configured this data node (server) as a GemFire Manager as well using GemFire-specific
-JMX System properties that enable JMX client (e.g. _Gfsh_) to connect to this running data node.
-
-NOTE: For more information on configuring _Spring Data GemFire_, refer to the http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/[reference guide].
-
-The `@EnableGemFireHttpSession` annotation enables a developer to configure certain aspects of Spring Session
-and GemFire out-of-the-box using the following attributes:
-
-* `maxInactiveIntervalInSeconds` - controls HttpSession idle-timeout expiration (defaults to **30 minutes**).
-* `regionName` - specifies the name of the GemFire Region used to store `HttpSession` state (defaults is "_ClusteredSpringSessions_").
-* `serverRegionShort` - specifies GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policies]
-with a GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/RegionShortcut.html[RegionShortcut]
-(default is `PARTITION`).
-
-NOTE: `clientRegionShort` is ignored in a peer cache configuration and only applies when a client-server topology,
-and more specifically, a GemFire client cache is used.
-
-== Java Servlet Container Initialization
-
-Our <<httpsession-spring-java-configuration,Spring Java Configuration>> created a Spring bean named `springSessionRepositoryFilter`
-that implements `Filter`. The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession`
-with a custom implementation backed by Spring Session and GemFire.
-
-In order for our `Filter` to do its magic, Spring needs to load our `Config` class. We also need to ensure our
-Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request. Fortunately, Spring Session
-provides a utility class named `AbstractHttpSessionApplicationInitializer` to make both of these steps extremely easy.
-
-You can find an example below:
-
-.src/main/java/sample/Initializer.java
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-p2p/src/main/java/sample/Initializer.java[tags=class]
-----
-
-NOTE: The name of our class (`Initializer`) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
-
-<1> The first step is to extend `AbstractHttpSessionApplicationInitializer`.
-This ensures that a Spring bean named `springSessionRepositoryFilter` is registered with our Servlet Container
-and used for every request.
-<2> `AbstractHttpSessionApplicationInitializer` also provides a mechanism to easily allow Spring to load our `Config`.
-// end::config[]
-
-[[httpsession-gemfire-p2p-java-sample-app]]
-== HttpSession with GemFire (P2P) Sample Application
-
-
-=== Running the httpsession-gemfire-p2p Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-----
-$ ./gradlew :samples:httpsession-gemfire-p2p:tomcatRun [-Dsample.httpsession.gemfire.log-level=info]
-----
-
-You should now be able to access the application at http://localhost:8080/
-
-=== Exploring the httpsession-gemfire-p2p Sample Application
-
-Try using the application. Fill out the form with the following information:
-
-* **Attribute Name:** _username_
-* **Attribute Value:** _john_
-
-Now click the **Set Attribute** button. You should now see the values displayed in the table.
-
-=== How does it work?
-
-We interact with the standard `HttpSession` in the `SessionServlet` shown below:
-
-.src/main/java/sample/SessionServlet.java
-[source,java]
-----
-include::{samples-dir}httpsession-gemfire-p2p/src/main/java/sample/SessionServlet.java[tags=class]
-----
-
-Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.
-Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome]
-or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
-see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
-
-If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
-at the command-line:
-
-	$ gfsh
-
-Then, enter the following into _Gfsh_ ensuring to replace `70002719-3c54-4c20-82c3-e7faa6b718f3` with the value
-of your SESSION cookie, or the session ID returned by the GemFire OQL query (which should match):
-
-....
-gfsh>connect --jmx-manager=localhost[1099]
-
-gfsh>query --query='SELECT * FROM /ClusteredSpringSessions.keySet'
-
-Result     : true
-startCount : 0
-endCount   : 20
-Rows       : 1
-
-Result
-------------------------------------
-70002719-3c54-4c20-82c3-e7faa6b718f3
-
-NEXT_STEP_NAME : END
-
-gfsh>remove --region=/ClusteredSpringSessions --key="70002719-3c54-4c20-82c3-e7faa6b718f3"
-....
-
-NOTE: The _GemFire User Guide_ has more detailed instructions on using http://gemfire.docs.pivotal.io/docs-gemfire/latest/tools_modules/gfsh/chapter_overview.html[gfsh].
-
-Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

docs/src/docs/asciidoc/guides/java-custom-cookie.adoc

@@ -17,7 +17,7 @@ You can find an example of customizing Spring Session's cookie below:
 
 [source,java]
 ----
-include::{samples-dir}custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
+include::{samples-dir}javaconfig/custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
 ----
 
 <1> We customize the name of the cookie to be JSESSIONID
@@ -78,12 +78,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:custom-cookie:tomcatRun
+$ ./gradlew :spring-session-sample-javaconfig-custom-cookie:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -98,4 +99,4 @@ Try using the application. Fill out the form with the following information:
 Now click the **Set Attribute** button.
 You should now see the values displayed in the table.
 
-If you look at the cookies for the application, you can see the cookie is saved to the custom name of JSESSIONID
+If you look at the cookies for the application, you can see the cookie is saved to the custom name of JSESSIONID

docs/src/docs/asciidoc/guides/java-hazelcast.adoc

@@ -26,7 +26,7 @@ If you are using Maven, ensure to add the following dependencies:
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -85,7 +85,7 @@ In this instance Spring Session is backed by Hazelcast.
 Spring Session provides `PrincipalNameExtractor` for this purpose.
 <3> We create a `HazelcastInstance` that connects Spring Session to Hazelcast.
 By default, an embedded instance of Hazelcast is started and connected to by the application.
-For more information on configuring Hazelcast, refer to the http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[reference documentation].
+For more information on configuring Hazelcast, refer to the http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 
 == Servlet Container Initialization
 
@@ -98,7 +98,7 @@ Since our application is already loading Spring configuration using our `Securit
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}hazelcast-spring/src/main/java/sample/SecurityInitializer.java[tags=class]
+include::{samples-dir}javaconfig/hazelcast/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -110,7 +110,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}hazelcast-spring/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/hazelcast/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -130,11 +130,11 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 ====
 Hazelcast will run in embedded mode with your application by default, but if you want to connect
 to a stand alone instance instead, you can configure it by following the instructions in the
-http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[reference documentation].
+http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 ====
 
 ----
-$ ./gradlew :samples:hazelcast-spring:tomcatRun
+$ ./gradlew :spring-session-sample-javaconfig-hazelcast:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -157,13 +157,13 @@ Spring Session replaces the `HttpSession` with an implementation that is backed
 When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Hazelcast.
 
 When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 === Interact with the data store
 
-If you like, you can remove the session using http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-java-client[a Java client],
-http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#other-client-implementations[one of the other clients], or the
-http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#management-center[management center].
+If you like, you can remove the session using http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#hazelcast-java-client[a Java client],
+http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#other-client-implementations[one of the other clients], or the
+http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#management-center[management center].
 
 ==== Using the console
 
@@ -172,7 +172,7 @@ For example, using the management center console after connecting to your Hazelc
 	default> ns spring:session:sessions
 	spring:session:sessions> m.clear
 
-TIP: The Hazelcast documentation has instructions for http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#executing-console-commands[the console].
+TIP: The Hazelcast documentation has instructions for http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#executing-console-commands[the console].
 
 Alternatively, you can also delete the explicit key. Enter the following into the console ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
@@ -183,7 +183,7 @@ Now visit the application at http://localhost:8080/ and observe that we are no l
 ==== Using the REST API
 
 As described in the other clients section of the documentation, there is a 
-http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#rest-client[REST API]
+http://docs.hazelcast.org/docs/{hazelcast-version}/manual/html-single/index.html#rest-client[REST API]
 provided by the Hazelcast node(s).
 
 For example, you could delete an individual key as follows (replacing `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie):

docs/src/docs/asciidoc/guides/java-jdbc.adoc

@@ -26,7 +26,7 @@ If you are using Maven, ensure to add the following dependencies:
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -75,7 +75,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/jdbc/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableJdbcHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -85,7 +85,7 @@ In this instance Spring Session is backed by a relational database.
 We configure the H2 database to create database tables using the SQL script which is included in Spring Session.
 <3> We create a `transactionManager` that manages transactions for previously configured `dataSource`.
 
-For additional information on how to configure data access related concerns, please refer to the http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
+For additional information on how to configure data access related concerns, please refer to the https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
 
 == Java Servlet Container Initialization
 
@@ -100,7 +100,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/jdbc/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -119,7 +119,7 @@ This ensures that the Spring Bean by the name `springSessionRepositoryFilter` is
 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
 
 ----
-$ ./gradlew :samples:httpsession-jdbc:tomcatRun
+$ ./gradlew :spring-session-sample-javaconfig-jdbc:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -140,12 +140,12 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}javaconfig/jdbc/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in H2 database.
 Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/h2-console/ (use `jdbc:h2:mem:testdb` for JDBC URL)
 

docs/src/docs/asciidoc/guides/java-redis.adoc

@@ -23,10 +23,15 @@ If you are using Maven, ensure to add the following dependencies:
 		<version>{spring-session-version}</version>
 		<type>pom</type>
 	</dependency>
+	<dependency>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -75,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/redis/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -83,7 +88,7 @@ The filter is what is in charge of replacing the `HttpSession` implementation to
 In this instance Spring Session is backed by Redis.
 <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
 We configure the connection to connect to localhost on the default port (6379)
-For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+For more information on configuring Spring Data Redis, refer to the https://docs.spring.io/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation].
 
 == Java Servlet Container Initialization
 
@@ -98,7 +103,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/redis/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -120,12 +125,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:httpsession:tomcatRun
+$ ./gradlew :spring-session-sample-javaconfig-redis:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -146,21 +152,21 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}javaconfig/redis/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
 Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.
+Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

docs/src/docs/asciidoc/guides/java-rest.adoc

@@ -23,10 +23,15 @@ If you are using Maven, ensure to add the following dependencies:
 		<version>{spring-session-version}</version>
 		<type>pom</type>
 	</dependency>
+	<dependency>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -75,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements `Filter`.
@@ -83,7 +88,7 @@ The filter is what is in charge of replacing the `HttpSession` implementation to
 In this instance Spring Session is backed by Redis.
 <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
 We configure the connection to connect to localhost on the default port (6379)
-For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+For more information on configuring Spring Data Redis, refer to the https://docs.spring.io/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation].
 <3> We customize Spring Session's HttpSession integration to use HTTP headers to convey the current session information instead of cookies.
 
 == Servlet Container Initialization
@@ -96,7 +101,7 @@ In order for our `Filter` to do its magic, Spring needs to load our `Config` cla
 .src/main/java/sample/mvc/MvcInitializer.java
 [source,java,indent=0]
 ----
-include::{samples-dir}rest/src/main/java/sample/mvc/MvcInitializer.java[tags=config]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/mvc/MvcInitializer.java[tags=config]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -105,7 +110,7 @@ Fortunately, Spring Session provides a utility class named `AbstractHttpSessionA
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}rest/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -121,12 +126,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:rest:tomcatRun
+$ ./gradlew :spring-session-sample-javaconfig-rest:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -149,7 +155,7 @@ In the output you will notice the following:
 ----
 HTTP/1.1 200 OK
 ...
-x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3
+X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3
 
 {"username":"user"}
 ----
@@ -157,25 +163,25 @@ x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3
 Specifically, we notice the following things about our response:
 
 * The HTTP Status is now a 200
-* We have a header with the name of *x-auth-token* which contains a new session id
+* We have a header with the name of *X-Auth-Token* which contains a new session id
 * The current username is displayed
 
-We can now use the *x-auth-token* to make another request without providing the username and password again. For example, the following outputs the username just as before:
+We can now use the *X-Auth-Token* to make another request without providing the username and password again. For example, the following outputs the username just as before:
 
-	$ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/ -H "X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
 
 The only difference is that the session id is not provided in the response headers because we are reusing an existing session.
 
-If we invalidate the session, then the x-auth-token is displayed in the response with an empty value. For example, the following will invalidate our session:
+If we invalidate the session, then the X-Auth-Token is displayed in the response with an empty value. For example, the following will invalidate our session:
 
-	$ curl -v http://localhost:8080/logout -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/logout -H "X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
 
-You will see in the output that the x-auth-token provides an empty String indicating that the previous session was invalidated.
+You will see in the output that the X-Auth-Token provides an empty String indicating that the previous session was invalidated.
 
 ----
 HTTP/1.1 204 No Content
 ...
-x-auth-token:
+X-Auth-Token:
 ----
 
 === How does it work?
@@ -183,7 +189,7 @@ x-auth-token:
 Spring Security interacts with the standard `HttpSession` in `SecurityContextPersistenceFilter`.
 
 Instead of using Tomcat's `HttpSession`, Spring Security is now persisting the values in Redis.
-Spring Session creates a header named x-auth-token in your browser that contains the id of your session.
+Spring Session creates a header named X-Auth-Token in your browser that contains the id of your session.
 
 If you like, you can easily see that the session is created in Redis. First create a session using the following:
 
@@ -194,7 +200,7 @@ In the output you will notice the following:
 ----
 HTTP/1.1 200 OK
 ...
-x-auth-token: 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+X-Auth-Token: 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 {"username":"user"}
 ----
@@ -203,12 +209,12 @@ Now remove the session using redis-cli. For example, on a Linux based system you
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-We can now use the *x-auth-token* to make another request with the session we deleted and observe we are prompted for a authentication. For example, the following returns an HTTP 401:
+We can now use the *X-Auth-Token* to make another request with the session we deleted and observe we are prompted for a authentication. For example, the following returns an HTTP 401:
 
-	$ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/ -H "X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"

docs/src/docs/asciidoc/guides/java-security.adoc

@@ -19,15 +19,20 @@ If you are using Maven, ensure to add the following dependencies:
 	<!-- ... -->
 
 	<dependency>
-	<groupId>org.springframework.session</groupId>
-	<artifactId>spring-session-data-redis</artifactId>
-	<version>{spring-session-version}</version>
-	<type>pom</type>
+		<groupId>org.springframework.session</groupId>
+		<artifactId>spring-session-data-redis</artifactId>
+		<version>{spring-session-version}</version>
+		<type>pom</type>
 	</dependency>
 	<dependency>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-web</artifactId>
-	<version>{spring-version}</version>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -74,7 +79,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -82,7 +87,7 @@ The filter is what is in charge of replacing the `HttpSession` implementation to
 In this instance Spring Session is backed by Redis.
 <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
 We configure the connection to connect to localhost on the default port (6379)
-For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+For more information on configuring Spring Data Redis, refer to the https://docs.spring.io/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation].
 
 == Servlet Container Initialization
 
@@ -95,7 +100,7 @@ Since our application is already loading Spring configuration using our `Securit
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/SecurityInitializer.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -107,7 +112,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -125,12 +130,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:security:tomcatRun
+$ ./gradlew :spring-session-sample-javaconfig-security:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -153,16 +159,16 @@ Spring Session replaces the `HttpSession` with an implementation that is backed
 When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Redis.
 
 When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.
+Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

docs/src/docs/asciidoc/guides/mongo.adoc

@@ -1,169 +0,0 @@
-= Spring Session - Mongo Repositories
-Jakub Kubrynski
-:toc:
-
-This guide describes how to use Spring Session backed by Mongo.
-
-NOTE: The completed guide can be found in the <<mongo-sample, mongo sample application>>.
-
-== Updating Dependencies
-Before you use Spring Session, you must ensure to update your dependencies.
-We assume you are working with a working Spring Boot web application.
-If you are using Maven, ensure to add the following dependencies:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
-----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>org.springframework.session</groupId>
-		<artifactId>spring-session-data-mongo</artifactId>
-		<version>{spring-session-version}</version>
-		<type>pom</type>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-data-mongodb</artifactId>
-	</dependency>
-</dependencies>
-----
-
-ifeval::["{version-snapshot}" == "true"]
-Since We are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
-----
-<repositories>
-
-	<!-- ... -->
-
-	<repository>
-		<id>spring-snapshot</id>
-		<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
-----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
-----
-<repository>
-	<id>spring-milestone</id>
-	<url>https://repo.spring.io/libs-milestone</url>
-</repository>
-----
-endif::[]
-
-[[mongo-spring-configuration]]
-== Spring Configuration
-
-After adding the required dependencies, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession` implementation with an implementation backed by Spring Session.
-
-// tag::config[]
-All you have to do is to add the following Spring Configuration:
-
-[source,java]
-----
-include::{samples-dir}mongo/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
-----
-
-<1> The `@EnableMongoHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
-The filter is what is in charge of replacing the `HttpSession` implementation to be backed by Spring Session.
-In this instance Spring Session is backed by Mongo.
-
-<2> We explicitly configure `JdkMongoSessionConverter` since Spring Security's objects cannot be automatically persisted using Jackson (the default if Jackson is on the classpath).
-
-// end::config[]
-
-[[boot-mongo-configuration]]
-== Configuring the Mongo Connection
-
-Spring Boot automatically creates a `MongoClient` that connects Spring Session to a Mongo Server on localhost on port 27017 (default port).
-In a production environment you need to ensure to update your configuration to point to your Mongo server.
-For example, you can include the following in your *application.properties*
-
-.src/main/resources/application.properties
-----
-spring.data.mongodb.host=mongo-srv
-spring.data.mongodb.port=27018
-spring.data.mongodb.database=prod
-----
-
-For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-connecting-to-mongodb[Connecting to MongoDB] portion of the Spring Boot documentation.
-
-[[boot-servlet-configuration]]
-== Servlet Container Initialization
-
-Our <<boot-spring-configuration,Spring Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
-The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with a custom implementation that is backed by Spring Session.
-
-In order for our `Filter` to do its magic, Spring needs to load our `Config` class.
-Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
-Fortunately, Spring Boot takes care of both of these steps for us.
-
-[[mongo-sample]]
-== Mongo Sample Application
-
-The Mongo Sample Application demonstrates how to use Spring Session to transparently leverage Mongo to back a web application's `HttpSession` when using Spring Boot.
-
-[[mongo-running]]
-=== Running the Mongo Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-----
-$ ./gradlew :samples:mongo:bootRun
-----
-
-You should now be able to access the application at http://localhost:8080/
-
-[[boot-explore]]
-=== Exploring the security Sample Application
-
-Try using the application. Enter the following to log in:
-
-* **Username** _user_
-* **Password** _password_
-
-Now click the **Login** button.
-You should now see a message indicating your are logged in with the user entered previously.
-The user's information is stored in Mongo rather than Tomcat's `HttpSession` implementation.
-
-[[mongo-how]]
-=== How does it work?
-
-Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Mongo.
-Spring Session replaces the `HttpSession` with an implementation that is backed by Mongo.
-When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Mongo.
-
-When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-If you like, you can easily inspect the session using mongo client. For example, on a Linux based system you can type:
-
-[NOTE]
-====
-The sample application uses an embedded MongoDB instance that listens on a randomly allocated port.
-The port used by embedded MongoDB together with exact command to connect to it is logged during application startup.
-====
-
-	$ mongo --port ...
-	> use test
-	> db.sessions.find().pretty()
-
-Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `60f17293-839b-477c-bb92-07a9c3658843` with the value of your SESSION cookie:
-
-	> db.sessions.remove({"_id":"60f17293-839b-477c-bb92-07a9c3658843"})
-
-Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

docs/src/docs/asciidoc/guides/users.adoc

@@ -1,161 +0,0 @@
-= Spring Session - Multiple Sessions
-Rob Winch
-:toc:
-
-This guide describes how to use Spring Session to manage multiple simultaneous browser sessions (i.e Google Accounts).
-
-== Integrating with Spring Session
-
-The steps to integrate with Spring Session are exactly the same as those outline in the link:httpsession.html[HttpSession Guide], so we will skip to running the sample application.
-
-[[users-sample]]
-== users Sample Application
-
-The users application demonstrates how to allow an application to manage multiple simultaneous browser sessions (i.e. Google Accounts).
-
-=== Running the users Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
-----
-$ ./gradlew :samples:users:tomcatRun
-----
-
-You should now be able to access the application at http://localhost:8080/
-
-=== Exploring the users Sample Application
-
-Try using the application. Authenticate with the following information:
-
-* **Username** _rob_
-* **Password** _rob_
-
-Now click the **Login** button. You should now be authenticated as the user **rob**.
-
-We can click on links and our user information is preserved.
-
-* Click on the **Link** link in the navigation bar at the top
-* Observe we are still authenticated as **rob**
-
-Let's add an another account.
-
-* Return to the *Home* page
-* Click on the arrow next to *rob* in the upper right hand corner
-* Click **Add Account**
-
-The log in form is displayed again. Authenticate with the following information:
-
-* **Username** _luke_
-* **Password** _luke_
-
-Now click the **Login** button. You should now be authenticated as the user **luke**.
-
-We can click on links and our user information is preserved.
-
-* Click on the **Link** link in the navigation bar at the top
-* Observe we are still authenticated as **luke**
-
-Where did our original user go? Let's switch to our original account.
-
-* Click on the arrow next to *luke* in the upper right hand corner.
-* Click on **Switch Account** -> *rob*
-
-We are now using the session associated with *rob*.
-
-== How does it work?
-
-// tag::how-does-it-work[]
-
-Let's take a look at how Spring Session keeps track of multiple sessions.
-
-=== Managing a Single Session
-
-Spring Session keeps track of the `HttpSession` by adding a value to a cookie named SESSION.
-For example, the SESSION cookie might have a value of:
-
-	7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
-
-=== Adding a Session
-
-We can add another session by requesting a URL that contains a special parameter in it.
-By default the parameter name is *_s*. For example, the following URL would create a new session:
-
-http://localhost:8080/?_s=1
-
-NOTE: The parameter value does not indicate the actual session id.
-This is important because we never want to allow the session id to be determined by a client to avoid https://www.owasp.org/index.php/Session_fixation[session fixation attacks].
-Additionally, we do not want the session id to be leaked since it is sent as a query parameter.
-Remember sensitive information should only be transmitted as a header or in the body of the request.
-
-Rather than creating the URL ourselves, we can utilize the `HttpSessionManager` to do this for us.
-We can obtain the `HttpSessionManager` from the `HttpServletRequest` using the following:
-
-.src/main/java/sample/UserAccountsFilter.java
-[source,java,indent=0]
-----
-include::{samples-dir}users/src/main/java/sample/UserAccountsFilter.java[tags=HttpSessionManager]
-----
-
-We can now use it to create a URL to add another session.
-
-.src/main/java/sample/UserAccountsFilter.java
-[source,java,indent=0]
-----
-include::{samples-dir}users/src/main/java/sample/UserAccountsFilter.java[tags=addAccountUrl]
-----
-
-<1> We have an existing variable named `unauthenticatedAlias`.
-The value is an alias that points to an existing unauthenticated session.
-If no such session exists, the value is null.
-This ensures if we have an existing unauthenticated session that we use it instead of creating a new session.
-<2> If all of our sessions are already associated to a user, we create a new session alias.
-<3> If there is an existing session that is not associated to a user, we use its session alias.
-<4> Finally, we create the add account URL.
-The URL contains a session alias that either points to an existing unauthenticated session or is an alias that is unused thus signaling to create a new session associated to that alias.
-
-Now our SESSION cookie looks something like this:
-
-	0 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e 1 1d526d4a-c462-45a4-93d9-84a39b6d44ad
-
-Such that:
-
-* There is a session with the id *7e8383a4-082c-4ffe-a4bc-c40fd3363c5e*
-** The alias for this session is  *0*.
-For example, if the URL is http://localhost:8080/?_s=0 this alias would be used.
-** This is the default session.
-This means that if no session alias is specified, then this session is used.
-For example, if the URL is http://localhost:8080/ this session would be used.
-* There is a session with the id *1d526d4a-c462-45a4-93d9-84a39b6d44ad*
-** The alias for this session is *1*.
-If the session alias is *1*, then this session is used.
-For example, if the URL is http://localhost:8080/?_s=1 this alias would be used.
-
-=== Automatic Session Alias Inclusion with encodeURL
-
-The nice thing about specifying the session alias in the URL is that we can have multiple tabs open with different active sessions.
-The bad thing is that we need to include the session alias in every URL of our application.
-Fortunately, Spring Session will automatically include the session alias in any URL that passes through http://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletResponse.html#encodeURL(java.lang.String)[HttpServletResponse#encodeURL(java.lang.String)]
-
-This means that if you are using standard tag libraries the session alias is automatically included in the URL.
-For example, if we are currently using the session with the alias of *1*, then the following:
-
-.src/main/webapp/index.jsp
-[source,xml,indent=0]
-----
-include::{samples-dir}users/src/main/webapp/index.jsp[tags=link]
-----
-
-will output a link of:
-
-[source,html]
-----
-<a id="navLink" href="/link.jsp?_s=1">Link</a>
-----
-
-// end::how-does-it-work[]

docs/src/docs/asciidoc/guides/xml-jdbc.adoc

@@ -26,7 +26,7 @@ If you are using Maven, ensure to add the following dependencies:
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -76,7 +76,7 @@ Add the following Spring Configuration:
 .src/main/webapp/WEB-INF/spring/session.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-jdbc-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
 ----
 
 <1> We use the combination of `<context:annotation-config/>` and `JdbcHttpSessionConfiguration` because Spring Session does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
@@ -87,7 +87,7 @@ In this instance Spring Session is backed by a relational database.
 We configure the H2 database to create database tables using the SQL script which is included in Spring Session.
 <3> We create a `transactionManager` that manages transactions for previously configured `dataSource`.
 
-For additional information on how to configure data access related concerns, please refer to the http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
+For additional information on how to configure data access related concerns, please refer to the https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/data-access.html[Spring Framework Reference Documentation].
 
 == XML Servlet Container Initialization
 
@@ -101,11 +101,11 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
-The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
+The https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/core.html#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
 The following snippet performs this last step for us:
@@ -113,10 +113,10 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
-The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy] will look up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
+The https://docs.spring.io/spring-framework/docs/{spring-framework-version}/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy] will look up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
 For every request that `DelegatingFilterProxy` is invoked, the `springSessionRepositoryFilter` will be invoked.
 
 // end::config[]
@@ -129,7 +129,7 @@ For every request that `DelegatingFilterProxy` is invoked, the `springSessionRep
 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
 
 ----
-$ ./gradlew :samples:httpsession-jdbc-xml:tomcatRun
+$ ./gradlew :spring-session-sample-xml-jdbc:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -150,12 +150,12 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc-xml/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}xml/jdbc/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in H2 database.
 Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/h2-console/ (use `jdbc:h2:mem:testdb` for JDBC URL)
 

docs/src/docs/asciidoc/guides/xml-redis.adoc

@@ -23,10 +23,15 @@ If you are using Maven, ensure to add the following dependencies:
 		<version>{spring-session-version}</version>
 		<type>pom</type>
 	</dependency>
+	<dependency>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
+		<version>{spring-framework-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -76,7 +81,7 @@ Add the following Spring Configuration:
 .src/main/webapp/WEB-INF/spring/session.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
 ----
 
 <1> We use the combination of `<context:annotation-config/>` and `RedisHttpSessionConfiguration` because Spring Session does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
@@ -85,7 +90,7 @@ The filter is what is in charge of replacing the `HttpSession` implementation to
 In this instance Spring Session is backed by Redis.
 <2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
 We configure the connection to connect to localhost on the default port (6379)
-For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+For more information on configuring Spring Data Redis, refer to the https://docs.spring.io/spring-data/data-redis/docs/{spring-data-redis-version}/reference/html/[reference documentation].
 
 == XML Servlet Container Initialization
 
@@ -99,11 +104,11 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
-The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
+The https://docs.spring.io/spring/docs/{spring-framework-version}/spring-framework-reference/core.html#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
 The following snippet performs this last step for us:
@@ -111,10 +116,10 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
-The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy] will look up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
+The https://docs.spring.io/spring-framework/docs/{spring-framework-version}/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy] will look up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
 For every request that `DelegatingFilterProxy` is invoked, the `springSessionRepositoryFilter` will be invoked.
 
 // end::config[]
@@ -128,12 +133,13 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+For the sample to work, you must https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `RedisConnectionFactory` to point to a Redis server.
+Another option is to use https://www.docker.com/[Docker] to run Redis on localhost. See https://hub.docker.com/_/redis/[Docker Redis repository] for detailed instructions.
 ====
 
 ----
-$ ./gradlew :samples:httpsession-xml:tomcatRun
+$ ./gradlew :spring-session-sample-xml-redis:tomcatRun
 ----
 
 You should now be able to access the application at http://localhost:8080/
@@ -154,21 +160,21 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-xml/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}xml/redis/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
 Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+Go ahead and view the cookies (click for help with https://developers.google.com/web/tools/chrome-devtools/manage-data/cookies[Chrome] or https://developer.mozilla.org/en-US/docs/Tools/Storage_Inspector[Firefox]).
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.
+Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

docs/src/integration-test/java/docs/AbstractGemFireIntegrationTests.java

@@ -1,467 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package docs;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheClosedException;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.ExpirationAction;
-import com.gemstone.gemfire.cache.ExpirationAttributes;
-import com.gemstone.gemfire.cache.GemFireCache;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.query.Index;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import org.junit.Before;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationListener;
-import org.springframework.session.ExpiringSession;
-import org.springframework.session.data.gemfire.GemFireOperationsSessionRepository;
-import org.springframework.session.data.gemfire.support.GemFireUtils;
-import org.springframework.session.events.AbstractSessionEvent;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * AbstractGemFireIntegrationTests is an abstract base class encapsulating common
- * operations for writing Spring Session GemFire integration tests.
- *
- * @author John Blum
- * @since 1.1.0
- * @see org.springframework.session.ExpiringSession
- * @see org.springframework.session.events.AbstractSessionEvent
- * @see com.gemstone.gemfire.cache.Cache
- * @see com.gemstone.gemfire.cache.DataPolicy
- * @see com.gemstone.gemfire.cache.ExpirationAttributes
- * @see com.gemstone.gemfire.cache.GemFireCache
- * @see com.gemstone.gemfire.cache.Region
- * @see com.gemstone.gemfire.cache.client.ClientCache
- * @see com.gemstone.gemfire.cache.server.CacheServer
- */
-public class AbstractGemFireIntegrationTests {
-	public static final String GEMFIRE_LOG_LEVEL = System
-			.getProperty("spring.session.data.gemfire.log-level", "warning");
-
-	protected static final boolean DEFAULT_ENABLE_QUERY_DEBUGGING = false;
-	protected static final boolean GEMFIRE_QUERY_DEBUG = Boolean
-			.getBoolean("spring.session.data.gemfire.query.debug");
-
-	protected static final int DEFAULT_GEMFIRE_SERVER_PORT = CacheServer.DEFAULT_PORT;
-
-	protected static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
-	protected static final long DEFAULT_WAIT_INTERVAL = 500L;
-
-	protected static final File WORKING_DIRECTORY = new File(
-			System.getProperty("user.dir"));
-
-	protected static final String DEFAULT_PROCESS_CONTROL_FILENAME = "process.ctl";
-
-	protected static final String GEMFIRE_LOG_FILE_NAME = System
-			.getProperty("spring.session.data.gemfire.log-file", "server.log");
-
-	@Autowired
-	protected Cache gemfireCache;
-
-	@Autowired
-	protected GemFireOperationsSessionRepository sessionRepository;
-
-	@Before
-	public void setup() {
-		System.setProperty("gemfire.Query.VERBOSE",
-				String.valueOf(isQueryDebuggingEnabled()));
-	}
-
-	/* (non-Javadoc) */
-	protected static File createDirectory(String pathname) {
-		File directory = new File(WORKING_DIRECTORY, pathname);
-
-		assertThat(directory.isDirectory() || directory.mkdirs())
-				.as(String.format("Failed to create directory (%1$s)", directory))
-				.isTrue();
-
-		directory.deleteOnExit();
-
-		return directory;
-	}
-
-	/* (non-Javadoc) */
-	protected static List<String> createJavaProcessCommandLine(Class<?> type,
-			String... args) {
-		List<String> commandLine = new ArrayList<String>();
-
-		String javaHome = System.getProperty("java.home");
-		String javaExe = new File(new File(javaHome, "bin"), "java").getAbsolutePath();
-
-		commandLine.add(javaExe);
-		commandLine.add("-server");
-		commandLine.add("-ea");
-		commandLine.add(String.format("-Dgemfire.log-file=%1$s", GEMFIRE_LOG_FILE_NAME));
-		commandLine.add(String.format("-Dgemfire.log-level=%1$s", GEMFIRE_LOG_LEVEL));
-		commandLine
-				.add(String.format("-Dgemfire.Query.VERBOSE=%1$s", GEMFIRE_QUERY_DEBUG));
-		commandLine.addAll(extractJvmArguments(args));
-		commandLine.add("-classpath");
-		commandLine.add(System.getProperty("java.class.path"));
-		commandLine.add(type.getName());
-		commandLine.addAll(extractProgramArguments(args));
-
-		// System.err.printf("Java process command-line is (%1$s)%n", commandLine);
-
-		return commandLine;
-	}
-
-	/* (non-Javadoc) */
-	protected static List<String> extractJvmArguments(final String... args) {
-		List<String> jvmArgs = new ArrayList<String>(args.length);
-
-		for (String arg : args) {
-			if (arg.startsWith("-")) {
-				jvmArgs.add(arg);
-			}
-		}
-
-		return jvmArgs;
-	}
-
-	/* (non-Javadoc) */
-	protected static List<String> extractProgramArguments(final String... args) {
-		List<String> jvmArgs = new ArrayList<String>(args.length);
-
-		for (String arg : args) {
-			if (!arg.startsWith("-")) {
-				jvmArgs.add(arg);
-			}
-		}
-
-		return jvmArgs;
-	}
-
-	/* (non-Javadoc) */
-	protected static Process run(Class<?> type, File directory, String... args)
-			throws IOException {
-		return new ProcessBuilder().command(createJavaProcessCommandLine(type, args))
-				.directory(directory).start();
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(CacheServer cacheServer) {
-		return waitForCacheServerToStart(cacheServer, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(CacheServer cacheServer,
-			long duration) {
-		return waitForCacheServerToStart(cacheServer.getBindAddress(),
-				cacheServer.getPort(), duration);
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(String host, int port) {
-		return waitForCacheServerToStart(host, port, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitForCacheServerToStart(final String host, final int port,
-			long duration) {
-		return waitOnCondition(new Condition() {
-			AtomicBoolean connected = new AtomicBoolean(false);
-
-			public boolean evaluate() {
-				Socket socket = null;
-
-				try {
-					if (!connected.get()) {
-						socket = new Socket(host, port);
-						connected.set(true);
-					}
-				}
-				catch (IOException ignore) {
-				}
-				finally {
-					GemFireUtils.close(socket);
-				}
-
-				return connected.get();
-			}
-		}, duration);
-	}
-
-	// NOTE this method would not be necessary except Spring Sessions' build does not fork
-	// the test JVM
-	// for every test class.
-	/* (non-Javadoc) */
-	protected static boolean waitForClientCacheToClose() {
-		return waitForClientCacheToClose(DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitForClientCacheToClose(long duration) {
-		try {
-			final ClientCache clientCache = ClientCacheFactory.getAnyInstance();
-
-			clientCache.close();
-
-			waitOnCondition(new Condition() {
-				public boolean evaluate() {
-					return clientCache.isClosed();
-				}
-			}, duration);
-
-			return clientCache.isClosed();
-		}
-		catch (CacheClosedException ignore) {
-			return true;
-		}
-
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitForProcessToStart(Process process, File directory) {
-		return waitForProcessToStart(process, directory, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	@SuppressWarnings("all")
-	protected static boolean waitForProcessToStart(Process process, File directory,
-			long duration) {
-		final File processControl = new File(directory, DEFAULT_PROCESS_CONTROL_FILENAME);
-
-		waitOnCondition(new Condition() {
-			public boolean evaluate() {
-				return processControl.isFile();
-			}
-		}, duration);
-
-		return process.isAlive();
-	}
-
-	/* (non-Javadoc) */
-	protected static int waitForProcessToStop(Process process, File directory) {
-		return waitForProcessToStop(process, directory, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	protected static int waitForProcessToStop(Process process, File directory,
-			long duration) {
-		final long timeout = (System.currentTimeMillis() + duration);
-
-		try {
-			while (process.isAlive() && System.currentTimeMillis() < timeout) {
-				if (process.waitFor(DEFAULT_WAIT_INTERVAL, TimeUnit.MILLISECONDS)) {
-					return process.exitValue();
-				}
-			}
-		}
-		catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		}
-
-		return (process.isAlive() ? -1 : process.exitValue());
-	}
-
-	/* (non-Javadoc) */
-	protected static boolean waitOnCondition(Condition condition) {
-		return waitOnCondition(condition, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	@SuppressWarnings("all")
-	protected static boolean waitOnCondition(Condition condition, long duration) {
-		final long timeout = (System.currentTimeMillis() + duration);
-
-		try {
-			while (!condition.evaluate() && System.currentTimeMillis() < timeout) {
-				synchronized (condition) {
-					TimeUnit.MILLISECONDS.timedWait(condition, DEFAULT_WAIT_INTERVAL);
-				}
-			}
-		}
-		catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		}
-
-		return condition.evaluate();
-	}
-
-	/* (non-Javadoc) */
-	protected static File writeProcessControlFile(File path) throws IOException {
-		assertThat(path != null && path.isDirectory()).isTrue();
-
-		File processControl = new File(path, DEFAULT_PROCESS_CONTROL_FILENAME);
-
-		assertThat(processControl.createNewFile()).isTrue();
-
-		processControl.deleteOnExit();
-
-		return processControl;
-	}
-
-	/* (non-Javadoc) */
-	protected void assertRegion(Region<?, ?> actualRegion, String expectedName,
-			DataPolicy expectedDataPolicy) {
-		assertThat(actualRegion).isNotNull();
-		assertThat(actualRegion.getName()).isEqualTo(expectedName);
-		assertThat(actualRegion.getFullPath())
-				.isEqualTo(GemFireUtils.toRegionPath(expectedName));
-		assertThat(actualRegion.getAttributes()).isNotNull();
-		assertThat(actualRegion.getAttributes().getDataPolicy())
-				.isEqualTo(expectedDataPolicy);
-	}
-
-	/* (non-Javadoc) */
-	protected void assertIndex(Index index, String expectedExpression,
-			String expectedFromClause) {
-		assertThat(index).isNotNull();
-		assertThat(index.getIndexedExpression()).isEqualTo(expectedExpression);
-		assertThat(index.getFromClause()).isEqualTo(expectedFromClause);
-	}
-
-	/* (non-Javadoc) */
-	protected void assertEntryIdleTimeout(Region<?, ?> region,
-			ExpirationAction expectedAction, int expectedTimeout) {
-		assertEntryIdleTimeout(region.getAttributes().getEntryIdleTimeout(),
-				expectedAction, expectedTimeout);
-	}
-
-	/* (non-Javadoc) */
-	protected void assertEntryIdleTimeout(ExpirationAttributes actualExpirationAttributes,
-			ExpirationAction expectedAction, int expectedTimeout) {
-		assertThat(actualExpirationAttributes).isNotNull();
-		assertThat(actualExpirationAttributes.getAction()).isEqualTo(expectedAction);
-		assertThat(actualExpirationAttributes.getTimeout()).isEqualTo(expectedTimeout);
-	}
-
-	/* (non-Javadoc) */
-	protected boolean enableQueryDebugging() {
-		return DEFAULT_ENABLE_QUERY_DEBUGGING;
-	}
-
-	/* (non-Javadoc) */
-	protected boolean isQueryDebuggingEnabled() {
-		return (GEMFIRE_QUERY_DEBUG || enableQueryDebugging());
-	}
-
-	/* (non-Javadoc) */
-	protected List<String> listRegions(GemFireCache gemfireCache) {
-		Set<Region<?, ?>> regions = gemfireCache.rootRegions();
-
-		List<String> regionList = new ArrayList<String>(regions.size());
-
-		for (Region<?, ?> region : regions) {
-			regionList.add(region.getFullPath());
-		}
-
-		return regionList;
-	}
-
-	/* (non-Javadoc) */
-	@SuppressWarnings("unchecked")
-	protected <T extends ExpiringSession> T createSession() {
-		T expiringSession = (T) this.sessionRepository.createSession();
-		assertThat(expiringSession).isNotNull();
-		return expiringSession;
-	}
-
-	/* (non-Javadoc) */
-	@SuppressWarnings("unchecked")
-	protected <T extends ExpiringSession> T createSession(String principalName) {
-		GemFireOperationsSessionRepository.GemFireSession session = createSession();
-		session.setPrincipalName(principalName);
-		return (T) session;
-	}
-
-	/* (non-Javadoc) */
-	protected <T extends ExpiringSession> T expire(T session) {
-		session.setLastAccessedTime(0L);
-		return session;
-	}
-
-	/* (non-Javadoc) */
-	@SuppressWarnings("unchecked")
-	protected <T extends ExpiringSession> T get(String sessionId) {
-		return (T) this.sessionRepository.getSession(sessionId);
-	}
-
-	/* (non-Javadoc) */
-	protected <T extends ExpiringSession> T save(T session) {
-		this.sessionRepository.save(session);
-		return session;
-	}
-
-	/* (non-Javadoc) */
-	protected <T extends ExpiringSession> T touch(T session) {
-		session.setLastAccessedTime(System.currentTimeMillis());
-		return session;
-	}
-
-	/**
-	 * The SessionEventListener class is a Spring {@link ApplicationListener} listening
-	 * for Spring HTTP Session application events.
-	 *
-	 * @see org.springframework.context.ApplicationListener
-	 * @see org.springframework.session.events.AbstractSessionEvent
-	 */
-	public static class SessionEventListener
-			implements ApplicationListener<AbstractSessionEvent> {
-
-		private volatile AbstractSessionEvent sessionEvent;
-
-		/* (non-Javadoc) */
-		@SuppressWarnings("unchecked")
-		public <T extends AbstractSessionEvent> T getSessionEvent() {
-			T sessionEvent = (T) this.sessionEvent;
-			this.sessionEvent = null;
-			return sessionEvent;
-		}
-
-		/* (non-Javadoc) */
-		public void onApplicationEvent(AbstractSessionEvent event) {
-			this.sessionEvent = event;
-		}
-
-		/* (non-Javadoc) */
-		public <T extends AbstractSessionEvent> T waitForSessionEvent(long duration) {
-			waitOnCondition(new Condition() {
-				public boolean evaluate() {
-					return (SessionEventListener.this.sessionEvent != null);
-				}
-			}, duration);
-
-			return getSessionEvent();
-		}
-	}
-
-	/**
-	 * The Condition interface defines a logical condition that must be satisfied before
-	 * it is safe to proceed.
-	 */
-	protected interface Condition {
-		boolean evaluate();
-	}
-
-}

docs/src/integration-test/java/docs/http/HttpSessionGemFireIndexingITests.java

@@ -1,123 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package docs.http;
-
-import java.util.Map;
-import java.util.Properties;
-
-import docs.AbstractGemFireIntegrationTests;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.gemfire.CacheFactoryBean;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.test.context.support.WithMockUser;
-import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
-import org.springframework.session.ExpiringSession;
-import org.springframework.session.FindByIndexNameSessionRepository;
-import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Rob Winch
- *
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class HttpSessionGemFireIndexingITests extends AbstractGemFireIntegrationTests {
-
-	@Test
-	public void findByIndexName() {
-		ExpiringSession session = sessionRepository.createSession();
-		String username = "HttpSessionGemFireIndexingITests-findByIndexName-username";
-
-		// tag::findbyindexname-set[]
-		String indexName = FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME;
-		session.setAttribute(indexName, username);
-		// end::findbyindexname-set[]
-
-		sessionRepository.save(session);
-
-		// tag::findbyindexname-get[]
-		Map<String, ExpiringSession> idToSessions = sessionRepository
-				.findByIndexNameAndIndexValue(indexName, username);
-		// end::findbyindexname-get[]
-
-		assertThat(idToSessions.keySet()).containsOnly(session.getId());
-
-		sessionRepository.delete(session.getId());
-	}
-
-	@Test
-	@WithMockUser("HttpSessionGemFireIndexingITests-findBySpringSecurityIndexName")
-	public void findBySpringSecurityIndexName() {
-		ExpiringSession session = sessionRepository.createSession();
-
-		// tag::findbyspringsecurityindexname-context[]
-		SecurityContext context = SecurityContextHolder.getContext();
-		Authentication authentication = context.getAuthentication();
-		// end::findbyspringsecurityindexname-context[]
-
-		session.setAttribute(
-				HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY,
-				context);
-		sessionRepository.save(session);
-
-		// tag::findbyspringsecurityindexname-get[]
-		String indexName = FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME;
-		Map<String, ExpiringSession> idToSessions = sessionRepository
-				.findByIndexNameAndIndexValue(indexName, authentication.getName());
-		// end::findbyspringsecurityindexname-get[]
-
-		assertThat(idToSessions.keySet()).containsOnly(session.getId());
-
-		sessionRepository.delete(session.getId());
-	}
-
-	@Configuration
-	@EnableGemFireHttpSession
-	static class Config {
-
-		@Bean
-		Properties gemfireProperties() {
-			Properties gemfireProperties = new Properties();
-
-			gemfireProperties.setProperty("name", Config.class.getName());
-			gemfireProperties.setProperty("mcast-port", "0");
-			gemfireProperties.setProperty("log-level", GEMFIRE_LOG_LEVEL);
-
-			return gemfireProperties;
-		}
-
-		@Bean
-		CacheFactoryBean gemfireCache() {
-			CacheFactoryBean gemfireCache = new CacheFactoryBean();
-
-			gemfireCache.setClose(true);
-			gemfireCache.setProperties(gemfireProperties());
-
-			return gemfireCache;
-		}
-	}
-}

docs/src/integration-test/java/docs/http/gemfire/indexablesessionattributes/GemFireHttpSessionConfig.java

@@ -1,57 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package docs.http.gemfire.indexablesessionattributes;
-
-import java.util.Properties;
-
-import docs.AbstractGemFireIntegrationTests;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.gemfire.CacheFactoryBean;
-import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
-
-/**
- * @author Rob Winch
- *
- */
-// tag::class-start[]
-@EnableGemFireHttpSession(indexableSessionAttributes = { "name1", "name2", "name3" })
-public class GemFireHttpSessionConfig {
-	// end::class-start[]
-
-	@Bean
-	Properties gemfireProperties() {
-		Properties gemfireProperties = new Properties();
-
-		gemfireProperties.setProperty("name", GemFireHttpSessionConfig.class.getName());
-		gemfireProperties.setProperty("mcast-port", "0");
-		gemfireProperties.setProperty("log-level",
-				AbstractGemFireIntegrationTests.GEMFIRE_LOG_LEVEL);
-
-		return gemfireProperties;
-	}
-
-	@Bean
-	CacheFactoryBean gemfireCache() {
-		CacheFactoryBean gemfireCache = new CacheFactoryBean();
-
-		gemfireCache.setClose(true);
-		gemfireCache.setProperties(gemfireProperties());
-
-		return gemfireCache;
-	}
-}

docs/src/integration-test/java/docs/http/gemfire/indexablesessionattributes/HttpSessionGemFireIndexingCustomITests.java

@@ -1,61 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package docs.http.gemfire.indexablesessionattributes;
-
-import java.util.Map;
-
-import docs.AbstractGemFireIntegrationTests;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.session.ExpiringSession;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Rob Winch
- *
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = GemFireHttpSessionConfig.class)
-public class HttpSessionGemFireIndexingCustomITests
-		extends AbstractGemFireIntegrationTests {
-
-	@Test
-	public void findByIndexName() {
-		ExpiringSession session = sessionRepository.createSession();
-		String attrValue = "HttpSessionGemFireIndexingCustomITests-findByIndexName";
-
-		// tag::findbyindexname-set[]
-		String indexName = "name1";
-		session.setAttribute(indexName, attrValue);
-		// end::findbyindexname-set[]
-
-		sessionRepository.save(session);
-
-		// tag::findbyindexname-get[]
-		Map<String, ExpiringSession> idToSessions = sessionRepository
-				.findByIndexNameAndIndexValue(indexName, attrValue);
-		// end::findbyindexname-get[]
-
-		assertThat(idToSessions.keySet()).containsOnly(session.getId());
-
-		sessionRepository.delete(session.getId());
-	}
-}

docs/src/main/java/docs/Docs.java

@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package docs.http;
+package docs;
 
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-class MyJacksonModule extends SimpleModule {
+public class Docs {
 }

docs/src/test/java/docs/FindByIndexNameSessionRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.Session;
@@ -52,9 +52,7 @@ public class FindByIndexNameSessionRepositoryTests {
 		// tag::findby-username[]
 		String username = "username";
 		Map<String, Session> sessionIdToSession = this.sessionRepository
-				.findByIndexNameAndIndexValue(
-						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
-						username);
+				.findByPrincipalName(username);
 		// end::findby-username[]
 	}
 }

docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.session.ExpiringSession;
+import org.springframework.session.Session;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -33,12 +33,12 @@ import static org.mockito.Mockito.mock;
 /**
  * @author Rob Winch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 @WebAppConfiguration
 public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
 	@Autowired
-	SessionRepositoryFilter<? extends ExpiringSession> filter;
+	SessionRepositoryFilter<? extends Session> filter;
 
 	@Test
 	public void redisConnectionFactoryNotUsedSinceNoValidation() {

docs/src/test/java/docs/IndexDocTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,21 +16,28 @@
 
 package docs;
 
+import java.time.Duration;
+import java.util.concurrent.ConcurrentHashMap;
+
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.IMap;
 import org.junit.Test;
 
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.ReactiveRedisTemplate;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.mock.web.MockServletContext;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.MapSession;
 import org.springframework.session.MapSessionRepository;
+import org.springframework.session.ReactiveSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
+import org.springframework.session.data.redis.ReactiveRedisOperationsSessionRepository;
 import org.springframework.session.data.redis.RedisOperationsSessionRepository;
 import org.springframework.session.hazelcast.HazelcastSessionRepository;
 import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
@@ -49,8 +56,8 @@ public class IndexDocTests {
 
 	@Test
 	public void repositoryDemo() {
-		RepositoryDemo<ExpiringSession> demo = new RepositoryDemo<ExpiringSession>();
-		demo.repository = new MapSessionRepository();
+		RepositoryDemo<MapSession> demo = new RepositoryDemo<>();
+		demo.repository = new MapSessionRepository(new ConcurrentHashMap<>());
 
 		demo.demo();
 	}
@@ -68,7 +75,7 @@ public class IndexDocTests {
 
 			this.repository.save(toSave); // <4>
 
-			S session = this.repository.getSession(toSave.getId()); // <5>
+			S session = this.repository.findById(toSave.getId()); // <5>
 
 			// <6>
 			User user = session.getAttribute(ATTR_USER);
@@ -81,24 +88,24 @@ public class IndexDocTests {
 
 	@Test
 	public void expireRepositoryDemo() {
-		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
-		demo.repository = new MapSessionRepository();
+		ExpiringRepositoryDemo<MapSession> demo = new ExpiringRepositoryDemo<>();
+		demo.repository = new MapSessionRepository(new ConcurrentHashMap<>());
 
 		demo.demo();
 	}
 
 	// tag::expire-repository-demo[]
-	public class ExpiringRepositoryDemo<S extends ExpiringSession> {
+	public class ExpiringRepositoryDemo<S extends Session> {
 		private SessionRepository<S> repository; // <1>
 
 		public void demo() {
 			S toSave = this.repository.createSession(); // <2>
 			// ...
-			toSave.setMaxInactiveIntervalInSeconds(30); // <3>
+			toSave.setMaxInactiveInterval(Duration.ofSeconds(30)); // <3>
 
 			this.repository.save(toSave); // <4>
 
-			S session = this.repository.getSession(toSave.getId()); // <5>
+			S session = this.repository.findById(toSave.getId()); // <5>
 			// ...
 		}
 
@@ -110,17 +117,41 @@ public class IndexDocTests {
 	@SuppressWarnings("unused")
 	public void newRedisOperationsSessionRepository() {
 		// tag::new-redisoperationssessionrepository[]
-		JedisConnectionFactory factory = new JedisConnectionFactory();
-		SessionRepository<? extends ExpiringSession> repository = new RedisOperationsSessionRepository(
-				factory);
+		RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+
+		// ... configure redisTemplate ...
+
+		SessionRepository<? extends Session> repository =
+				new RedisOperationsSessionRepository(redisTemplate);
 		// end::new-redisoperationssessionrepository[]
 	}
 
+	@Test
+	@SuppressWarnings("unused")
+	public void newReactiveRedisOperationsSessionRepository() {
+		LettuceConnectionFactory connectionFactory = new LettuceConnectionFactory();
+		RedisSerializationContext<String, Object> serializationContext = RedisSerializationContext
+				.<String, Object>newSerializationContext(
+						new JdkSerializationRedisSerializer())
+				.build();
+
+		// tag::new-reactiveredisoperationssessionrepository[]
+		// ... create and configure connectionFactory and serializationContext ...
+
+		ReactiveRedisTemplate<String, Object> redisTemplate = new ReactiveRedisTemplate<>(
+				connectionFactory, serializationContext);
+
+		ReactiveSessionRepository<? extends Session> repository =
+				new ReactiveRedisOperationsSessionRepository(redisTemplate);
+		// end::new-reactiveredisoperationssessionrepository[]
+	}
+
 	@Test
 	@SuppressWarnings("unused")
 	public void mapRepository() {
 		// tag::new-mapsessionrepository[]
-		SessionRepository<? extends ExpiringSession> repository = new MapSessionRepository();
+		SessionRepository<? extends Session> repository = new MapSessionRepository(
+				new ConcurrentHashMap<>());
 		// end::new-mapsessionrepository[]
 	}
 
@@ -136,7 +167,7 @@ public class IndexDocTests {
 
 		// ... configure transactionManager ...
 
-		SessionRepository<? extends ExpiringSession> repository =
+		SessionRepository<? extends Session> repository =
 				new JdbcOperationsSessionRepository(jdbcTemplate, transactionManager);
 		// end::new-jdbcoperationssessionrepository[]
 	}
@@ -152,11 +183,8 @@ public class IndexDocTests {
 
 		HazelcastInstance hazelcastInstance = Hazelcast.newHazelcastInstance(config);
 
-		IMap<String, MapSession> sessions = hazelcastInstance
-				.getMap("spring:session:sessions");
-
 		HazelcastSessionRepository repository =
-				new HazelcastSessionRepository(sessions);
+				new HazelcastSessionRepository(hazelcastInstance);
 		// end::new-hazelcastsessionrepository[]
 	}
 

docs/src/test/java/docs/RedisHttpSessionConfigurationNoOpConfigureRedisActionTests.java

@@ -25,7 +25,7 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.session.data.redis.config.ConfigureRedisAction;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.mockito.Mockito.mock;
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock;
 /**
  * @author Rob Winch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 @WebAppConfiguration
 public class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {

docs/src/test/java/docs/SpringHttpSessionConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package docs;
 
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.session.MapSessionRepository;
@@ -27,7 +29,7 @@ import org.springframework.session.config.annotation.web.http.EnableSpringHttpSe
 public class SpringHttpSessionConfig {
 	@Bean
 	public MapSessionRepository sessionRepository() {
-		return new MapSessionRepository();
+		return new MapSessionRepository(new ConcurrentHashMap<>());
 	}
 }
 // end::class[]

docs/src/test/java/docs/SpringWebSessionConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package sample.config;
+
+package docs;
+
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.session.data.mongo.JdkMongoSessionConverter;
-import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
+import org.springframework.session.ReactiveMapSessionRepository;
+import org.springframework.session.ReactiveSessionRepository;
+import org.springframework.session.config.annotation.web.server.EnableSpringWebSession;
 
 // tag::class[]
-@EnableMongoHttpSession // <1>
-public class HttpSessionConfig {
-
+@EnableSpringWebSession
+public class SpringWebSessionConfig {
 	@Bean
-	public JdkMongoSessionConverter jdkMongoSessionConverter() {
-		return new JdkMongoSessionConverter(); // <2>
+	public ReactiveSessionRepository reactiveSessionRepository() {
+		return new ReactiveMapSessionRepository(new ConcurrentHashMap<>());
 	}
 }
 // end::class[]

docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 
 package docs.http;
 
+import java.util.Properties;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -27,18 +29,20 @@ import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.security.core.session.SessionDestroyedEvent;
 import org.springframework.session.MapSession;
 import org.springframework.session.Session;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 
 /**
  * @author Rob Winch
+ * @author Mark Paluch
  * @since 1.2
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @WebAppConfiguration
 public abstract class AbstractHttpSessionListenerTests {
 	@Autowired
@@ -63,6 +67,7 @@ public abstract class AbstractHttpSessionListenerTests {
 		RedisConnection connection = mock(RedisConnection.class);
 
 		given(factory.getConnection()).willReturn(connection);
+		given(connection.getConfig(anyString())).willReturn(new Properties());
 		return factory;
 	}
 
@@ -77,6 +82,7 @@ public abstract class AbstractHttpSessionListenerTests {
 		 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
 		 * springframework.context.ApplicationEvent)
 		 */
+		@Override
 		public void onApplicationEvent(SessionDestroyedEvent event) {
 			this.event = event;
 		}

docs/src/test/java/docs/http/HazelcastHttpSessionConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ public class HazelcastHttpSessionConfig {
 
 		Config config = new Config();
 
-		config.getMapConfig("spring:session:sessions") // <2>
+		config.getMapConfig(HazelcastSessionRepository.DEFAULT_SESSION_MAP_NAME) // <2>
 				.addMapAttributeConfig(attributeConfig)
 				.addMapIndexConfig(new MapIndexConfig(
 						HazelcastSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false));

docs/src/test/java/docs/http/MongoJacksonSessionConfiguration.java

@@ -1,48 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package docs.http;
-
-import java.util.Collections;
-
-import com.fasterxml.jackson.databind.Module;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.data.mongo.AbstractMongoSessionConverter;
-import org.springframework.session.data.mongo.JacksonMongoSessionConverter;
-import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
-
-/**
- *
- * @author Jakub Kubrynski
- * @author Rob Winch
- */
-// tag::config[]
-@Configuration
-@EnableMongoHttpSession
-public class MongoJacksonSessionConfiguration {
-
-	@Bean
-	public AbstractMongoSessionConverter mongoSessionConverter() {
-		return new JacksonMongoSessionConverter(getJacksonModules());
-	}
-
-	public Iterable<Module> getJacksonModules() {
-		return Collections.<Module>singletonList(new MyJacksonModule());
-	}
-}
-// end::config[]

docs/src/test/java/docs/http/MongoJdkSessionConfiguration.java

@@ -1,40 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package docs.http;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.data.mongo.AbstractMongoSessionConverter;
-import org.springframework.session.data.mongo.JdkMongoSessionConverter;
-import org.springframework.session.data.mongo.config.annotation.web.http.EnableMongoHttpSession;
-
-/**
- *
- * @author Jakub Kubrynski
- * @author Rob Winch
- */
-// tag::config[]
-@Configuration
-@EnableMongoHttpSession
-public class MongoJdkSessionConfiguration {
-
-	@Bean
-	public AbstractMongoSessionConverter mongoSessionConverter() {
-		return new JdkMongoSessionConverter();
-	}
-}
-// end::config[]

docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.security;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.authentication.RememberMeServices;
+import org.springframework.session.MapSessionRepository;
+import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
+import org.springframework.session.security.web.authentication.SpringSessionRememberMeServices;
+
+/**
+ * @author rwinch
+ */
+@EnableWebSecurity
+@EnableSpringHttpSession
+public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+	// @formatter:off
+	// tag::http-rememberme[]
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			// ... additional configuration ...
+			.rememberMe()
+				.rememberMeServices(rememberMeServices());
+		// end::http-rememberme[]
+
+		http
+			.formLogin().and()
+			.authorizeRequests()
+				.anyRequest().authenticated();
+	}
+
+	// tag::rememberme-bean[]
+	@Bean
+	RememberMeServices rememberMeServices() {
+		SpringSessionRememberMeServices rememberMeServices =
+				new SpringSessionRememberMeServices();
+		// optionally customize
+		rememberMeServices.setAlwaysRemember(true);
+		return rememberMeServices;
+	}
+	// end::rememberme-bean[]
+	// @formatter:on
+
+	@Override
+	@Bean
+	public InMemoryUserDetailsManager userDetailsService() {
+		return new InMemoryUserDetailsManager(User.withUsername("user")
+				.password("{noop}password").roles("USER").build());
+	}
+
+	@Bean
+	MapSessionRepository sessionRepository() {
+		return new MapSessionRepository(new ConcurrentHashMap<>());
+	}
+}
+// end::class[]

docs/src/test/java/docs/security/RememberMeSecurityConfigurationTests.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.security;
+
+import java.time.Duration;
+import java.util.Base64;
+
+import javax.servlet.http.Cookie;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.session.Session;
+import org.springframework.session.SessionRepository;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+
+/**
+ * @author rwinch
+ * @author Vedran Pavic
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration(classes = RememberMeSecurityConfiguration.class)
+@WebAppConfiguration
+@SuppressWarnings("rawtypes")
+public class RememberMeSecurityConfigurationTests<T extends Session> {
+	@Autowired
+	WebApplicationContext context;
+	@Autowired
+	SessionRepositoryFilter springSessionRepositoryFilter;
+	@Autowired
+	SessionRepository<T> sessions;
+
+	MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		// @formatter:off
+		this.mockMvc = MockMvcBuilders
+				.webAppContextSetup(this.context)
+				.addFilters(this.springSessionRepositoryFilter)
+				.apply(springSecurity())
+				.build();
+		// @formatter:on
+	}
+
+	@Test
+	public void authenticateWhenSpringSessionRememberMeEnabledThenCookieMaxAgeAndSessionExpirationSet()
+			throws Exception {
+		// @formatter:off
+		MvcResult result = this.mockMvc
+			.perform(formLogin())
+			.andReturn();
+		// @formatter:on
+
+		Cookie cookie = result.getResponse().getCookie("SESSION");
+		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
+		T session = this.sessions
+				.findById(new String(Base64.getDecoder().decode(cookie.getValue())));
+		assertThat(session.getMaxInactiveInterval())
+				.isEqualTo(Duration.ofDays(30));
+
+	}
+
+}
+// end::class[]

docs/src/test/java/docs/security/RememberMeSecurityConfigurationXmlTests.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.security;
+
+import java.time.Duration;
+import java.util.Base64;
+
+import javax.servlet.http.Cookie;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.session.Session;
+import org.springframework.session.SessionRepository;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+
+/**
+ * @author rwinch
+ * @author Vedran Pavic
+ */
+@RunWith(SpringRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+@SuppressWarnings("rawtypes")
+public class RememberMeSecurityConfigurationXmlTests<T extends Session> {
+	@Autowired
+	WebApplicationContext context;
+	@Autowired
+	SessionRepositoryFilter springSessionRepositoryFilter;
+	@Autowired
+	SessionRepository<T> sessions;
+
+	MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		// @formatter:off
+		this.mockMvc = MockMvcBuilders
+				.webAppContextSetup(this.context)
+				.addFilters(this.springSessionRepositoryFilter)
+				.apply(springSecurity())
+				.build();
+		// @formatter:on
+	}
+
+	@Test
+	public void authenticateWhenSpringSessionRememberMeEnabledThenCookieMaxAgeAndSessionExpirationSet()
+			throws Exception {
+		// @formatter:off
+		MvcResult result = this.mockMvc
+			.perform(formLogin())
+			.andReturn();
+		// @formatter:on
+
+		Cookie cookie = result.getResponse().getCookie("SESSION");
+		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
+		T session = this.sessions
+				.findById(new String(Base64.getDecoder().decode(cookie.getValue())));
+		assertThat(session.getMaxInactiveInterval())
+				.isEqualTo(Duration.ofDays(30));
+
+	}
+
+}
+// end::class[]

docs/src/test/java/docs/security/SecurityConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.FindByIndexNameSessionRepository;
+import org.springframework.session.Session;
 import org.springframework.session.security.SpringSessionBackedSessionRegistry;
 
 /**
@@ -33,20 +33,22 @@ import org.springframework.session.security.SpringSessionBackedSessionRegistry;
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
 	@Autowired
-	FindByIndexNameSessionRepository<ExpiringSession> sessionRepository;
+	private FindByIndexNameSessionRepository<Session> sessionRepository;
 
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
+		// @formatter:off
 		http
 			// other config goes here...
 			.sessionManagement()
 				.maximumSessions(2)
 				.sessionRegistry(sessionRegistry());
+		// @formatter:on
 	}
 
 	@Bean
 	SpringSessionBackedSessionRegistry sessionRegistry() {
-		return new SpringSessionBackedSessionRegistry(this.sessionRepository);
+		return new SpringSessionBackedSessionRegistry<>(this.sessionRepository);
 	}
 }
 // end::class[]

docs/src/test/java/docs/websocket/WebSocketConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@ package docs.websocket;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
 import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
 import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
 
 /**
  * @author Rob Winch
@@ -30,8 +30,9 @@ import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 @Configuration
 @EnableScheduling
 @EnableWebSocketMessageBroker
-public class WebSocketConfig extends AbstractWebSocketMessageBrokerConfigurer {
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
 
+	@Override
 	public void registerStompEndpoints(StompEndpointRegistry registry) {
 		registry.addEndpoint("/messages").withSockJS();
 	}

docs/src/test/resources/docs/security/RememberMeSecurityConfigurationXmlTests-context.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:security="http://www.springframework.org/schema/security"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<!-- tag::config[] -->
+	<security:http>
+		<!-- ... -->
+		<security:form-login />
+		<security:remember-me services-ref="rememberMeServices"/>
+	</security:http>
+
+	<bean id="rememberMeServices"
+		class="org.springframework.session.security.web.authentication.SpringSessionRememberMeServices"
+		p:alwaysRemember="true"/>
+	<!-- end::config[] -->
+
+
+	<security:user-service>
+		<security:user name="user" password="{noop}password" authorities="ROLE_USER"/>
+	</security:user-service>
+
+	<bean class="org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration"/>
+	<bean id="springSessionRepository" class="org.springframework.session.MapSessionRepository">
+		<constructor-arg>
+			<bean class="java.util.concurrent.ConcurrentHashMap"/>
+		</constructor-arg>
+	</bean>
+</beans>

docs/src/test/resources/docs/security/security-config.xml

@@ -9,7 +9,7 @@
 	<security:http>
 		<!-- other config goes here... -->
 		<security:session-management>
-			<security:concurrency-control max-sessions="2" session-registry-ref="sessionRegistry"
+			<security:concurrency-control max-sessions="2" session-registry-ref="sessionRegistry"/>
 		</security:session-management>
 	</security:http>
 
@@ -19,4 +19,4 @@
 	</bean>
 	<!-- end::config[] -->
 
-</beans>
+</beans>

etc/checkstyle/checkstyle.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+	<!-- Supressions -->
+	<module name="SuppressionFilter">
+		<property name="file" value="${config_loc}/suppressions.xml"/>
+	</module>
+
+	<!-- Root Checks -->
+	<module name="io.spring.javaformat.checkstyle.SpringChecks"/>
+</module>

etc/checkstyle/suppressions.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<!-- global -->
+	<suppress files="[\\/]src[\\/]integration-test[\\/]java[\\/]" checks="Javadoc*"/>
+
+	<!-- docs -->
+	<suppress files="[\\/]docs[\\/]" checks="Javadoc*"/>
+	<suppress files="[\\/]docs[\\/]" checks="InnerTypeLast"/>
+
+	<!-- samples -->
+	<suppress files="[\\/]samples[\\/]" checks="Javadoc*"/>
+	<suppress files="[\\/]samples[\\/].+Application\.java" checks="HideUtilityClassConstructor"/>
+</suppressions>

etc/eclipse/org.eclipse.jdt.ui.prefs

@@ -59,7 +59,7 @@ cleanup_profile=_Spring Boot Cleanup Conventions
 cleanup_settings_version=2
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Spring Boot Java Conventions
+formatter_profile=Spring Session Java Conventions
 formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true

gradle.properties

@@ -1,29 +1,2 @@
-bootstrapVersion=2.3.2
-commonsPoolVersion=2.4.2
-jacksonVersion=2.6.5
-jspApiVersion=2.0
-servletApiVersion=3.0.1
-jstlelVersion=1.2.5
-version=1.3.0.M2
-springDataRedisVersion=1.7.1.RELEASE
-html5ShivVersion=3.7.3
-commonsLoggingVersion=1.2
-junitVersion=4.12
-gebVersion=0.13.1
-mockitoVersion=1.10.19
-hazelcastVersion=3.6.5
-springDataGeodeVersion=1.0.0.APACHE-GEODE-INCUBATING-M2
-seleniumVersion=2.52.0
-springSecurityVersion=4.0.3.RELEASE
-springVersion=4.2.5.RELEASE
-httpClientVersion=4.5.1
-jedisVersion=2.8.1
-h2Version=1.4.192
-springDataMongoVersion=1.9.1.RELEASE
-springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.8.1.RELEASE
-assertjVersion=2.5.0
-spockVersion=1.0-groovy-2.4
-webjarsTaglibVersion=0.3
-jstlVersion=1.2.1
-groovyVersion=2.4.4
+springBootVersion=2.1.0.M2
+version=2.1.0.M3

gradle/dependency-management.gradle

@@ -0,0 +1,32 @@
+dependencyManagement {
+	imports {
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.9.6'
+		mavenBom 'io.projectreactor:reactor-bom:Californium-RC1'
+		mavenBom 'org.springframework:spring-framework-bom:5.1.0.RC3'
+		mavenBom 'org.springframework.data:spring-data-releasetrain:Lovelace-RC2'
+		mavenBom 'org.springframework.security:spring-security-bom:5.1.0.RC2'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.8.3'
+	}
+
+	dependencies {
+		dependencySet(group: 'com.hazelcast', version: '3.10.4') {
+			entry 'hazelcast'
+			entry 'hazelcast-client'
+		}
+
+		dependency 'com.h2database:h2:1.4.197'
+		dependency 'com.microsoft.sqlserver:mssql-jdbc:7.0.0.jre8'
+		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
+		dependency 'io.lettuce:lettuce-core:5.1.0.RC1'
+		dependency 'javax.annotation:javax.annotation-api:1.3.2'
+		dependency 'javax.servlet:javax.servlet-api:4.0.1'
+		dependency 'junit:junit:4.12'
+		dependency 'mysql:mysql-connector-java:8.0.12'
+		dependency 'org.apache.derby:derby:10.14.2.0'
+		dependency 'org.assertj:assertj-core:3.11.1'
+		dependency 'org.hsqldb:hsqldb:2.4.1'
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.3.0'
+		dependency 'org.mockito:mockito-core:2.22.0'
+		dependency 'org.postgresql:postgresql:42.2.5'
+	}
+}

gradle/ide.gradle

@@ -1,50 +0,0 @@
-import org.gradle.plugins.ide.eclipse.model.ProjectDependency
-import org.gradle.plugins.ide.eclipse.model.SourceFolder
-
-
-apply plugin: "propdeps-eclipse"
-apply plugin: "propdeps-idea"
-
-eclipse.project.buildCommand "net.sf.eclipsecs.core.CheckstyleBuilder"
-eclipse.project.natures "net.sf.eclipsecs.core.CheckstyleNature"
-
-// Include project specific settings
-task eclipseCheckstyle(type: Copy) {
-	from rootProject.files(
-		"eclipse/.checkstyle")
-	into project.projectDir
-	expand(configDir: rootProject.file('config/checkstyle').absolutePath)
-}
-
-task eclipseSettings(type: Copy) {
-	from rootProject.files(
-		"eclipse/org.eclipse.jdt.ui.prefs",
-		"eclipse/org.eclipse.wst.common.project.facet.core.xml")
-	into project.file('.settings/')
-	outputs.upToDateWhen { false }
-}
-
-task eclipseWstComponent(type: Copy) {
-	from rootProject.files(
-		"eclipse/org.eclipse.wst.common.component")
-	into project.file('.settings/')
-	expand(deployname: project.name)
-	outputs.upToDateWhen { false }
-}
-
-task eclipseJdtPrepare(type: Copy) {
-	from rootProject.file("eclipse/org.eclipse.jdt.core.prefs")
-	into project.file(".settings/")
-	outputs.upToDateWhen { false }
-}
-
-task cleanEclipseJdtUi(type: Delete) {
-	delete project.file(".settings/org.eclipse.jdt.core.prefs")
-	delete project.file(".settings/org.eclipse.jdt.ui.prefs")
-	delete project.file(".settings/org.eclipse.wst.common.component")
-	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
-}
-
-tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
-tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
-tasks["eclipse"].dependsOn(eclipseCheckstyle, eclipseSettings, eclipseWstComponent)

gradle/java.gradle

@@ -1,98 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'groovy'
-apply plugin: 'javadocHotfix'
-apply plugin: 'eclipse-wtp'
-apply plugin: 'propdeps'
-apply plugin: 'propdeps-idea'
-apply plugin: 'propdeps-eclipse'
-apply plugin: 'com.github.ben-manes.versions'
-apply plugin: 'checkstyle'
-apply from: IDE_GRADLE
-
-group = 'org.springframework.session'
-
-sourceCompatibility = 1.5
-targetCompatibility = 1.5
-
-ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'latest.integration'
-
-ext.spockDependencies = [
-		dependencies.create("org.spockframework:spock-core:$spockVersion") {
-			exclude group: 'junit', module: 'junit-dep'
-		}
-]
-
-ext.gebDependencies = spockDependencies + [
-		"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
-		"org.gebish:geb-spock:$gebVersion",
-		"org.codehaus.groovy:groovy:$groovyVersion"
-]
-
-ext.jstlDependencies = [
-		"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-		"org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
-]
-
-repositories {
-	mavenCentral()
-	maven { url 'https://repo.spring.io/libs-snapshot' }
-}
-
-configurations.all {
-	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-			if (details.requested.group == 'org.springframework') {
-				details.useVersion springVersion
-			}
-	}
-}
-// Integration test setup
-configurations {
-	integrationTestCompile {
-		extendsFrom testCompile, optional, provided
-	}
-	integrationTestRuntime {
-		extendsFrom integrationTestCompile, testRuntime
-	}
-}
-
-sourceSets {
-	integrationTest {
-		java.srcDir file('src/integration-test/java')
-		groovy.srcDirs file('src/integration-test/groovy')
-		resources.srcDir file('src/integration-test/resources')
-		compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile
-		runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime
-	}
-}
-
-task integrationTest(type: Test, dependsOn: jar) {
-	testClassesDir = sourceSets.integrationTest.output.classesDir
-	logging.captureStandardOutput(LogLevel.INFO)
-	classpath = sourceSets.integrationTest.runtimeClasspath
-	maxParallelForks = 1
-	reports {
-		html.destination = project.file("$project.buildDir/reports/integration-tests/")
-		junitXml.destination = project.file("$project.buildDir/integration-test-results/")
-	}
-}
-check.dependsOn integrationTest
-
-checkstyle {
-	configFile = rootProject.file('config/checkstyle/checkstyle.xml')
-	configProperties.configDir = configFile.parentFile
-	toolVersion = '6.16.1'
-}
-
-task checkstyle {
-	dependsOn project.tasks.findAll { task -> task.name.matches('checkstyle\\w+') }
-}
-
-eclipse {
-	classpath {
-		plusConfigurations += [ configurations.integrationTestCompile ]
-	}
-}
-
-project.idea.module {
-	scopes.TEST.plus += [project.configurations.integrationTestRuntime]
-}

gradle/publish-maven.gradle

@@ -1,51 +0,0 @@
-apply plugin: 'propdeps-maven'
-
-install {
-	repositories.mavenInstaller {
-		customizePom(pom, project)
-	}
-}
-
-def customizePom(pom, gradleProject) {
-	pom.whenConfigured { generatedPom ->
-
-		// sort to make pom dependencies order consistent to ease comparison of older poms
-		generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
-			"$dep.scope:$dep.groupId:$dep.artifactId"
-		}
-
-		// add all items necessary for maven central publication
-		generatedPom.project {
-			name = gradleProject.description
-			description = gradleProject.description
-			url = "https://github.com/spring-projects/spring-session"
-			organization {
-				name = "Spring IO"
-				url = "http://projects.spring.io/spring-session"
-			}
-			licenses {
-				license {
-					name "The Apache Software License, Version 2.0"
-					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
-					distribution "repo"
-				}
-			}
-			scm {
-				url = "https://github.com/spring-projects/spring-session"
-				connection = "scm:git:git://github.com/spring-projects/spring-session"
-				developerConnection = "scm:git:git://github.com/spring-projects/spring-session"
-			}
-			developers {
-				developer {
-					id = "rwinch"
-					name = "Rob Winch"
-					email = "rwinch@pivotal.io"
-				}
-			}
-			issueManagement {
-				system = "GitHub"
-				url = "https://github.com/spring-projects/spring-session/issues"
-			}
-		}
-	}
-}

gradle/sample.gradle

@@ -1,4 +0,0 @@
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarqube {
-	skipProject = true
-}

gradle/spring3.gradle

@@ -1,24 +0,0 @@
-configurations {
-	spring3TestRuntime.extendsFrom testRuntime
-}
-
-configurations.spring3TestRuntime {
-	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-		if (details.requested.group == 'org.springframework'
-				&& details.requested.name != 'spring-websocket'
-				&& details.requested.name != 'spring-messaging') {
-			details.useVersion '3.2.14.RELEASE'
-		}
-	}
-}
-
-task spring3Test(type: Test) {
-	jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
-	classpath = sourceSets.test.output + sourceSets.main.output + configurations.spring3TestRuntime
-	exclude "org/springframework/session/web/socket/**"
-	reports {
-		html.destination = project.file("$buildDir/spring3-test-results/")
-		junitXml.destination = project.file("$buildDir/reports/spring3-tests/")
-	}
-}
-check.dependsOn spring3Test

gradle/tomcat.gradle

@@ -1,63 +0,0 @@
-buildscript {
-	repositories {
-		maven { url "https://repo.spring.io/plugins-release" }
-	}
-	dependencies {
-		classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
-	}
-}
-
-apply plugin: 'war'
-apply plugin: 'com.bmuschko.tomcat'
-
-[tomcatRun,tomcatRunWar]*.contextPath = '/'
-
-
-task integrationTomcatRun(type: com.bmuschko.gradle.tomcat.tasks.TomcatRun) {
-	onlyIf { !sourceSets.integrationTest.allSource.empty }
-	contextPath = tomcatRun.contextPath
-	daemon = true
-	tomcatClasspath = tomcatRun.tomcatClasspath
-	webAppClasspath = tomcatRun.webAppClasspath
-	webAppSourceDirectory = tomcatRun.webAppSourceDirectory
-	doFirst {
-		def mainOutputDir = project.sourceSets.main.output.classesDir
-		if(mainOutputDir) {
-			classesDirectory = mainOutputDir
-		}
-		// delay reserving ports to ensure they are still available
-		def ports = reservePorts(3)
-		httpPort = ports[0]
-		ajpPort = ports[1]
-		stopPort = ports[2]
-
-		System.setProperty('spring.session.redis.namespace',project.name)
-	}
-}
-
-task integrationTomcatStop(type: com.bmuschko.gradle.tomcat.tasks.TomcatStop) {
-	onlyIf { !sourceSets.integrationTest.allSource.empty }
-	doFirst {
-		stopPort = integrationTomcatRun.stopPort
-	}
-}
-
-integrationTest {
-	dependsOn integrationTomcatRun
-	doFirst {
-		def host = 'localhost:' + integrationTomcatRun.httpPort
-		systemProperties['geb.build.baseUrl'] = 'http://'+host+'/' + integrationTomcatRun.contextPath
-		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
-	}
-	finalizedBy integrationTomcatStop
-}
-
-def reservePorts(int count) {
-	def sockets = []
-	for(int i in 1..count) {
-		sockets << new ServerSocket(0)
-	}
-	def result = sockets*.localPort
-	sockets*.close()
-	result
-}

gradle/tomcat6.gradle

@@ -1,8 +0,0 @@
-apply from: TOMCAT_GRADLE
-
-dependencies {
-	def tomcatVersion = '6.0.43'
-	tomcat "org.apache.tomcat:catalina:${tomcatVersion}",
-			"org.apache.tomcat:coyote:${tomcatVersion}",
-			"org.apache.tomcat:jasper:${tomcatVersion}"
-}

gradle/tomcat7.gradle

@@ -1,8 +0,0 @@
-apply from: TOMCAT_GRADLE
-
-dependencies {
-	def tomcatVersion = '7.0.59'
-	tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-			"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
-			"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
-}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Nov 25 20:57:10 CST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,47 +6,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +20,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=-Xmx1024M -XX:MaxPermSize=512M
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

samples/boot/README.adoc

@@ -1 +0,0 @@
-Demonstrates using Spring Session with Spring Boot and Spring Security. You can log in with the username "user" and the password "password".

samples/boot/build.gradle

@@ -1,56 +0,0 @@
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-	}
-}
-
-apply plugin: 'spring-boot'
-
-apply from: JAVA_GRADLE
-apply from: SAMPLE_GRADLE
-
-group = 'samples'
-
-dependencies {
-	compile project(':spring-session'),
-			"org.springframework.boot:spring-boot-starter-redis",
-			"org.springframework.boot:spring-boot-starter-web",
-			"org.springframework.boot:spring-boot-starter-thymeleaf",
-			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"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"
-
-	testCompile "org.springframework.boot:spring-boot-starter-test"
-
-	integrationTestCompile gebDependencies,
-			"org.spockframework:spock-spring:$spockVersion"
-
-}
-
-integrationTest {
-	doFirst {
-		def port = reservePort()
-
-		def host = 'localhost:' + port
-		systemProperties['geb.build.baseUrl'] = 'http://'+host+'/'
-		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
-		systemProperties['server.port'] = port
-		systemProperties['management.port'] = 0
-
-		systemProperties['spring.session.redis.namespace'] = project.name
-	}
-}
-
-def reservePort() {
-	def socket = new ServerSocket(0)
-	def result = socket.localPort
-	socket.close()
-	result
-}

samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle

@@ -0,0 +1,22 @@
+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-starter-data-redis"
+	compile "org.springframework.boot:spring-boot-devtools"
+	compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
+	compile "org.webjars:bootstrap"
+	compile "org.webjars:html5shiv"
+	compile "org.webjars:webjars-locator-core"
+	compile "com.maxmind.geoip2:geoip2"
+	compile "org.apache.httpcomponents:httpclient"
+
+	testCompile "org.springframework.boot:spring-boot-starter-test"
+	testCompile "org.assertj:assertj-core"
+
+	integrationTestCompile seleniumDependencies
+	integrationTestCompile "org.testcontainers:testcontainers"
+}

samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java

@@ -0,0 +1,101 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriver;
+import org.testcontainers.containers.GenericContainer;
+import sample.pages.HomePage;
+import sample.pages.LoginPage;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ * @author Vedran Pavic
+ */
+@RunWith(SpringRunner.class)
+@AutoConfigureMockMvc
+@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+public class FindByUsernameTests {
+
+	private static final String DOCKER_IMAGE = "redis:4.0.11";
+
+	@Autowired
+	private MockMvc mockMvc;
+
+	private WebDriver driver;
+
+	@Before
+	public void setup() {
+		this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
+	}
+
+	@After
+	public void tearDown() {
+		this.driver.quit();
+	}
+
+	@Test
+	public void home() {
+		LoginPage login = HomePage.go(this.driver);
+		login.assertAt();
+	}
+
+	@Test
+	public void login() {
+		LoginPage login = HomePage.go(this.driver);
+		HomePage home = login.form().login(HomePage.class);
+		home.assertAt();
+		home.containCookie("SESSION");
+		home.doesNotContainCookie("JSESSIONID");
+		home.terminateButtonDisabled();
+	}
+
+	@TestConfiguration
+	static class Config {
+
+		@Bean
+		public GenericContainer redisContainer() {
+			GenericContainer redisContainer = new GenericContainer(DOCKER_IMAGE)
+					.withExposedPorts(6379);
+			redisContainer.start();
+			return redisContainer;
+		}
+
+		@Bean
+		public LettuceConnectionFactory redisConnectionFactory() {
+			return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(),
+					redisContainer().getFirstMappedPort());
+		}
+
+	}
+
+}

samples/boot/findbyusername/src/integration-test/java/sample/pages/BasePage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,18 +14,28 @@
  * limitations under the License.
  */
 
-package org.springframework.session.web.http;
+package sample.pages;
+
+import org.openqa.selenium.WebDriver;
 
 /**
- * Thrown to indicate a bad input character in the Base64 stream.
- *
- * @author Luke Taylor
- * @since 1.2.2
+ * @author Eddú Meléndez
  */
-class InvalidBase64CharacterException extends IllegalArgumentException {
+public class BasePage {
 
-	InvalidBase64CharacterException(String message) {
-		super(message);
+	private WebDriver driver;
+
+	public BasePage(WebDriver driver) {
+		this.driver = driver;
+	}
+
+	public WebDriver getDriver() {
+		return this.driver;
+	}
+
+	public static void get(WebDriver driver, String get) {
+		String baseUrl = "http://localhost";
+		driver.get(baseUrl + get);
 	}
 
 }

samples/boot/findbyusername/src/integration-test/java/sample/pages/HomePage.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages;
+
+import java.util.Base64;
+import java.util.Set;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+public class HomePage extends BasePage {
+	@FindBy(css = "input[type=\"submit\"]")
+	WebElement logout;
+
+	public HomePage(WebDriver driver) {
+		super(driver);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle())
+				.isEqualTo("Spring Session Sample - Secured Content");
+	}
+
+	public void containCookie(String cookieName) {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").contains(cookieName);
+	}
+
+	public void doesNotContainCookie(String cookieName) {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").doesNotContain(cookieName);
+	}
+
+	public void terminateButtonDisabled() {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		String cookieValue = null;
+		for (Cookie cookie : cookies) {
+			if ("SESSION".equals(cookie.getName())) {
+				cookieValue = new String(Base64.getDecoder().decode(cookie.getValue()));
+			}
+		}
+		WebElement element = getDriver().findElement(By.id("terminate-" + cookieValue));
+		assertThat(element.isEnabled()).isFalse();
+	}
+
+	public HomePage logout() {
+		this.logout.click();
+		return PageFactory.initElements(getDriver(), HomePage.class);
+	}
+
+	public static LoginPage go(WebDriver driver) {
+		get(driver, "/");
+		return PageFactory.initElements(driver, LoginPage.class);
+	}
+}

samples/boot/findbyusername/src/integration-test/java/sample/pages/LoginPage.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages;
+
+import org.openqa.selenium.SearchContext;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+public class LoginPage extends BasePage {
+
+	public LoginPage(WebDriver driver) {
+		super(driver);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle()).isEqualTo("Spring Session Sample - Log In");
+	}
+
+	public Form form() {
+		return new Form(getDriver());
+	}
+
+	public class Form {
+
+		@FindBy(name = "username")
+		private WebElement username;
+
+		@FindBy(name = "password")
+		private WebElement password;
+
+		@FindBy(tagName = "button")
+		private WebElement button;
+
+		public Form(SearchContext context) {
+			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
+		}
+
+		public <T> T login(Class<T> page) {
+			this.username.sendKeys("user");
+			this.password.sendKeys("password");
+			this.button.click();
+			return PageFactory.initElements(getDriver(), page);
+		}
+	}
+}

samples/boot/findbyusername/src/main/java/sample/FindByUsernameApplication.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,16 +17,12 @@
 package sample;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * @author Rob Winch
  */
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
+@SpringBootApplication
 public class FindByUsernameApplication {
 
 	public static void main(String[] args) {

samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,29 +16,34 @@
 
 package sample.config;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 /**
+ * Spring Security configuration.
+ *
  * @author Rob Winch
+ * @author Vedran Pavic
  */
-@EnableWebSecurity
+@Configuration
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
+	// @formatter:off
 	// tag::config[]
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
-		http.formLogin().loginPage("/login").permitAll().and().authorizeRequests()
-				.antMatchers("/resources/**", "/webjars/**").permitAll().anyRequest().authenticated()
-				.and().logout().permitAll();
+		http
+			.authorizeRequests()
+				.requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
+				.anyRequest().authenticated()
+				.and()
+			.formLogin()
+				.loginPage("/login")
+				.permitAll();
 	}
 	// end::config[]
+	// @formatter:on
 
-	@Autowired
-	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth.inMemoryAuthentication().withUser("user").password("password").roles("USER");
-	}
 }

samples/boot/findbyusername/src/main/java/sample/config/WebMvcConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,25 +14,18 @@
  * limitations under the License.
  */
 
-package sample;
+package sample.config;
 
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-/**
- * @author Rob Winch
- */
-
-// tag::class[]
 @Configuration
-@EnableRedisHttpSession
-public class Config {
+public class WebMvcConfig implements WebMvcConfigurer {
 
-	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
+	@Override
+	public void addViewControllers(ViewControllerRegistry registry) {
+		registry.addViewController("/login").setViewName("login");
 	}
+
 }
-// end::class[]

samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@ import java.util.Collection;
 import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.FindByIndexNameSessionRepository;
+import org.springframework.session.Session;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -39,15 +39,12 @@ import org.springframework.web.bind.annotation.RequestMethod;
 public class IndexController {
 	// tag::findbyusername[]
 	@Autowired
-	FindByIndexNameSessionRepository<? extends ExpiringSession> sessions;
+	FindByIndexNameSessionRepository<? extends Session> sessions;
 
 	@RequestMapping("/")
 	public String index(Principal principal, Model model) {
-		Collection<? extends ExpiringSession> usersSessions = this.sessions
-				.findByIndexNameAndIndexValue(
-						FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
-						principal.getName())
-				.values();
+		Collection<? extends Session> usersSessions = this.sessions
+				.findByPrincipalName(principal.getName()).values();
 		model.addAttribute("sessions", usersSessions);
 		return "index";
 	}
@@ -56,11 +53,10 @@ public class IndexController {
 	@RequestMapping(value = "/sessions/{sessionIdToDelete}", method = RequestMethod.DELETE)
 	public String removeSession(Principal principal,
 			@PathVariable String sessionIdToDelete) {
-		Set<String> usersSessionIds = this.sessions.findByIndexNameAndIndexValue(
-				FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME,
-				principal.getName()).keySet();
+		Set<String> usersSessionIds = this.sessions
+				.findByPrincipalName(principal.getName()).keySet();
 		if (usersSessionIds.contains(sessionIdToDelete)) {
-			this.sessions.delete(sessionIdToDelete);
+			this.sessions.deleteById(sessionIdToDelete);
 		}
 
 		return "redirect:/";

samples/boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,7 @@ public class SessionDetailsFilter extends OncePerRequestFilter {
 	}
 
 	// tag::dofilterinternal[]
+	@Override
 	public void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
 			FilterChain chain) throws IOException, ServletException {
 		chain.doFilter(request, response);
@@ -91,7 +92,7 @@ public class SessionDetailsFilter extends OncePerRequestFilter {
 			}
 			return cityName + ", " + countryName;
 		}
-		catch (Exception e) {
+		catch (Exception ex) {
 			return UNKNOWN;
 
 		}

samples/boot/findbyusername/src/main/resources/application.properties

@@ -0,0 +1 @@
+spring.security.user.password=password

samples/boot/findbyusername/src/main/resources/templates/index.html

@@ -0,0 +1,36 @@
+<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>
+<body>
+	<div layout:fragment="content">
+		<h1>Secured Page</h1>
+		<p>This page is secured using Spring Boot, Spring Session, and Spring Security.</p>
+
+		<p>Your current session id is <span id="session-id" th:text="${#httpSession.id}"></span></p>
+
+		<table class="table table-stripped">
+			<tr>
+				<th>Id Suffix</th>
+				<th>Location</th>
+				<th>Created</th>
+				<th>Last Updated</th>
+				<th>Information</th>
+				<th>Terminate</th>
+			</tr>
+			<tr th:each="sessionElement : ${sessions}" th:with="details=${sessionElement.getAttribute('SESSION_DETAILS')}">
+				<td th:text="${sessionElement.id.substring(30)}"></td>
+				<td th:text="${details?.location}"></td>
+				<td th:text="${#temporals.format(sessionElement.creationTime.atZone(T(java.time.ZoneId).systemDefault()),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${#temporals.format(sessionElement.lastAccessedTime.atZone(T(java.time.ZoneId).systemDefault()),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${details?.accessType}"></td>
+				<td>
+					<form th:action="@{'/sessions/' + ${sessionElement.id}}" th:method="delete">
+						<input th:id="'terminate-' + ${sessionElement.id}" type="submit" value="Terminate" th:disabled="${sessionElement.id == #httpSession.id}"/>
+					</form>
+				</td>
+			</tr>
+		</table>
+	</div>
+</body>
+</html>

samples/boot/findbyusername/src/main/resources/templates/layout.html

@@ -3,8 +3,8 @@
 			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>
-		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
+		<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">
 			/* Sticky footer styles
@@ -79,7 +79,7 @@
 			<div class="navbar navbar-inverse navbar-static-top">
 				<div class="navbar-inner">
 					<div class="container">
-						<a class="brand" th:href="@{/}"><img th:src="@{/resources/img/logo.png}" alt="Spring Security Sample"/></a>
+						<a class="brand" th:href="@{/}"><img th:src="@{/images/logo.png}" alt="Spring Security Sample"/></a>
 
 <div class="nav-collapse collapse"
 		 th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">

samples/boot/findbyusername/src/main/resources/templates/login.html

@@ -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>
@@ -44,4 +44,4 @@
 		</div>
 	</div>
 </body>
-</html>
+</html>

samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java

@@ -20,12 +20,11 @@ import com.maxmind.geoip2.DatabaseReader;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import sample.config.GeoConfig;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Rob Winch
  *
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(classes = GeoConfig.class)
 public class SessionDetailsFilterTests {
 	@Autowired

samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle

@@ -0,0 +1,19 @@
+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"
+	compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
+	compile "org.webjars:bootstrap"
+	compile "org.webjars:html5shiv"
+	compile "org.webjars:webjars-locator-core"
+	compile "com.h2database:h2"
+
+	testCompile "org.springframework.boot:spring-boot-starter-test"
+	testCompile "org.assertj:assertj-core"
+
+	integrationTestCompile seleniumDependencies
+}