Release version 2.0.0.M2

For the release disable OSSRH Deploy since we will release only
to Artifactory for the milestone. We cannot deploy to OSSRH because
we have RC dependencies that are not in Maven Central.

.gitignore

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

CODE_OF_CONDUCT.adoc

@@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.
 
 This Code of Conduct is adapted from the
-https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

CONTRIBUTING.adoc

@@ -10,8 +10,8 @@ By participating, you  are expected to uphold this code. Please report unaccepta
 == Using GitHub issues
 
 We use GitHub issues to track bugs and enhancements. If you have a general usage question
-please ask on https://stackoverflow.com[Stack Overflow]. The Spring Session team and the
-broader community monitor the https://stackoverflow.com/tags/spring-session[`spring-session`]
+please ask on http://stackoverflow.com[Stack Overflow]. The Spring Session team and the
+broader community monitor the http://stackoverflow.com/tags/spring-session[`spring-session`]
 tag.
 
 If you are reporting a bug, please help to speed up problem diagnosis by providing as much

Jenkinsfile

@@ -0,0 +1,93 @@
+def projectProperties = [
+	[$class: 'BuildDiscarderProperty',
+		strategy: [$class: 'LogRotator', numToKeepStr: '5']],
+	pipelineTriggers([cron('@daily')])
+]
+properties(projectProperties)
+
+def SUCCESS = hudson.model.Result.SUCCESS.toString()
+currentBuild.result = SUCCESS
+
+try {
+	parallel check: {
+		stage('Check') {
+			node {
+				checkout scm
+				try {
+					sh "./gradlew clean check  --refresh-dependencies --no-daemon"
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: check'
+					throw e
+				} finally {
+					junit '**/build/*-results/*.xml'
+				}
+			}
+		}
+	},
+	sonar: {
+		stage('Sonar') {
+			node {
+				checkout scm
+				withCredentials([string(credentialsId: 'spring-sonar.login', variable: 'SONAR_LOGIN')]) {
+					try {
+						sh "./gradlew clean sonarqube -PexcludeProjects='**/samples/**' -Dsonar.host.url=$SPRING_SONAR_HOST_URL -Dsonar.login=$SONAR_LOGIN --refresh-dependencies --no-daemon"
+					} catch(Exception e) {
+						currentBuild.result = 'FAILED: sonar'
+						throw e
+					}
+				}
+			}
+		}
+	},
+	springio: {
+		stage('Spring IO') {
+			node {
+				checkout scm
+				try {
+					sh "./gradlew clean springIoCheck -PplatformVersion=Cairo-BUILD-SNAPSHOT -PexcludeProjects='**/samples/**' --refresh-dependencies --no-daemon --stacktrace"
+				} catch(Exception e) {
+					currentBuild.result = 'FAILED: springio'
+					throw e
+				} finally {
+					junit '**/build/spring-io*-results/*.xml'
+				}
+			}
+		}
+	}
+
+	if(currentBuild.result == 'SUCCESS') {
+		parallel docs: {
+			stage('Deploy Docs') {
+				node {
+					checkout scm
+					withCredentials([file(credentialsId: 'docs.spring.io-jenkins_private_ssh_key', variable: 'DEPLOY_SSH_KEY')]) {
+						sh "./gradlew deployDocs -PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY -PdeployDocsSshUsername=$SPRING_DOCS_USERNAME --refresh-dependencies --no-daemon --stacktrace"
+					}
+				}
+			}
+		}
+	}
+} finally {
+	def buildStatus = currentBuild.result
+	def buildNotSuccess =  !SUCCESS.equals(buildStatus)
+	def lastBuildNotSuccess = !SUCCESS.equals(currentBuild.previousBuild?.result)
+
+	if(buildNotSuccess || lastBuildNotSuccess) {
+
+		stage('Notifiy') {
+			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_SECURITY_TEAM_EMAILS"
+				)
+			}
+		}
+	}
+}

README.adoc

@@ -19,8 +19,8 @@ By participating, you  are expected to uphold this code. Please report unaccepta
 
 = Spring Session Project Site
 
-You can find the documentation, issue management, support, samples, and guides for using Spring Session at https://projects.spring.io/spring-session/
+You can find the documentation, issue management, support, samples, and guides for using Spring Session at http://projects.spring.io/spring-session/
 
 = License
 
-Spring Session is Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 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,76 +1,21 @@
 buildscript {
-	repositories {
-		maven { url "https://repo.spring.io/plugins-release" }
-		maven { url "https://repo.spring.io/milestone" }
-	}
 	dependencies {
-		classpath 'io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE'
-		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.6.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.1.RELEASE'
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+	}
+	repositories {
+		maven { url 'https://repo.spring.io/libs-snapshot' }
+		maven { url 'https://repo.spring.io/plugins-snapshot' }
 	}
 }
-
-plugins {
-	id "org.sonarqube" version "2.1"
-}
+apply plugin: 'io.spring.convention.root'
 
 group = 'org.springframework.session'
+description = 'Spring Session'
 
-ext.springBootVersion = '1.5.4.RELEASE'
-ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
-ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
-ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
-ext.BOM_GRADLE = "$rootDir/gradle/bom.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']) {
-	doLast {
-		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,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 	<!-- Suppressions -->
 	<module name="SuppressionFilter">
@@ -75,7 +75,7 @@
 		<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.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo"/>
+					value="org.assertj.core.api.Assertions.*, org.mockito.Mockito.*, org.mockito.BDDMockito.*, org.mockito.AdditionalMatchers.*, org.mockito.ArgumentMatchers.*, 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.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo"/>
 		</module>
 		<module name="IllegalImport"/>
 		<module name="RedundantImport"/>

config/checkstyle/header.txt

@@ -5,7 +5,7 @@
 ^\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 *      https://www.apache.org/licenses/LICENSE-2.0\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$

config/checkstyle/suppressions.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress files=".+Application\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".+Configuration\.java" checks="HideUtilityClassConstructor"/>

docs/build.gradle

@@ -1,80 +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
-}
-
-repositories {
-	maven { url 'http://dist.gemstone.com/maven/release' }
-}
-
-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.data:spring-data-gemfire:$springDataGemFireVersion",
-				"org.springframework:spring-webmvc:${springVersion}",
-				"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:$junitVersion",
-				"org.mockito:mockito-core:$mockitoVersion",
-				"org.springframework:spring-test:$springVersion",
-				"org.assertj:assertj-core:$assertjVersion",
-				"com.hazelcast:hazelcast:$hazelcastVersion",
-				"biz.paluch.redis:lettuce:$lettuceVersion",
-				"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,
-			'lettuce-version' : lettuceVersion,
-			'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
-}
-
-eclipse.project.name = 'spring-session-docs'

docs/spring-session-docs.gradle

@@ -0,0 +1,43 @@
+apply plugin: 'io.spring.convention.docs'
+apply plugin: 'io.spring.convention.spring-test'
+
+dependencies {
+	testCompile project(':spring-session')
+	testCompile project(':spring-session-data-redis')
+	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	'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' : versions['org.springframework:spring-core'],
+			'lettuce-version' : versions['io.lettuce:lettuce-core'],
+			'hazelcast-version' : versions['com.hazelcast:hazelcast'],
+			'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/'
+}

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

@@ -108,7 +108,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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.
 ====
 

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

@@ -1,270 +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}boot/gemfire/src/main/java/sample/server/GemFireServer.java[tags=class]
-----
-
-<1> The `@EnableGemFireHttpSession` annotation is used on the GemFire Server to mainly 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` that allow us to configure certain aspects of the GemFire Server using
-https://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 configure and start a `CacheServer` running in the GemFire Server to listen for connections
-from cache clients.  The `CacheServer's` `Socket` will be used to connect our GemFire cache client,
-_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 our _Spring Boot_ Web application exposing our Web service with Spring MVC, running as a
-GemFire cache client connected to our _Spring Boot_-based GemFire Server, using Spring Session backed by GemFire
-to manage Session state in a clustered, replicated fashion.
-
-[source,java]
-----
-include::{samples-dir}boot/gemfire/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 to also override the (HTTP) Web application container's `HttpSession` and replace it with a Session implementation
-backed by _Spring Session_ and 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,
-on the server, which will appropriately notify the cache client when the Session times out.  Again, we have just
-resorted to using the default named 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> Similarly 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 a
-pool of 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 are 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> Navigates the Web application to the home page (`index.html`), which uses **Thymeleaf** templates for server-side
-pages.
-<7> Heartbeat Web service endpoint (useful for manual testing purposes).
-<8> Web service endpoint allowing the user to add a Session attribute 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 https://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 https://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 https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
-with a GemFire https://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.
-* `poolName` - name of the dedicated GemFire Pool used to connect a client to the cluster of servers.  The attribute
-is only used when the application is a GemFire cache client.  Defaults to `gemfirePool`.
-* `serverRegionShort` - specifies GemFire's https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
-using a GemFire https://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 remember 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 https://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
-
-NOTE: In order to run the following, you must uncomment the lines in the `GemFireServer` class, `gemfireProperties` bean
-for the following GemFire System properties: `jmx-manager` and `jmx-manager-start`.
-
-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 https://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/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}boot/jdbc/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+spring.session.store-type=jdbc
 ----
 
-<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.session.timeout= # Session timeout in seconds.
+spring.session.jdbc.initializer.enabled= # Create the required session tables on startup if necessary. Enabled automatically if the default table name is set or a custom schema is configured.
+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 database table used to store sessions.
+----
+
+For more information, refer to http://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
@@ -95,12 +70,12 @@ spring.datasource.username=myapp
 spring.datasource.password=secret
 ----
 
-For more information, refer to https://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 http://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.

docs/src/docs/asciidoc/guides/boot-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}boot/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 https://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/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/redis/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+spring.session.store-type=redis
 ----
 
-<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.session.timeout= # Session timeout in seconds.
+spring.session.redis.flush-mode= # Sessions flush mode.
+spring.session.redis.namespace= # Namespace for keys used to store sessions.
+----
+
+For more information, refer to http://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
@@ -93,12 +67,12 @@ spring.redis.password=secret
 spring.redis.port=6379
 ----
 
-For more information, refer to https://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 http://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,18 +80,18 @@ 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 https://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+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.
 ====
 
@@ -153,7 +127,7 @@ If you like, you can easily remove the session using redis-cli. For example, on
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for http://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

@@ -73,18 +73,17 @@ 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}boot/websocket/src/main/java/sample/config/WebSecurityConfig.java[tags=enable-redis-httpsession]
+server.session.timeout=60
 ----
 ====
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 

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

@@ -70,7 +70,7 @@ spring:
     port: 6397
 ----
 
-For more information, refer to https://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 http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
 
 [[grails3-sample]]
 == Grails 3 Sample Application
@@ -84,7 +84,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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.
 ====
 
@@ -120,7 +120,7 @@ If you like, you can easily remove the session using redis-cli. For example, on
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for http://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/java-custom-cookie.adoc

@@ -27,7 +27,7 @@ This allows sharing a session across domains and applications.
 If the regular expression does not match, no domain is set and the existing domain will be used.
 If the regular expression matches, the first https://docs.oracle.com/javase/tutorial/essential/regex/groups.html[grouping] will be used as the domain.
 This means that a request to https://child.example.com will set the domain to example.com.
-However, a request to http://localhost:8080/ or https://192.168.1.100:8080/ will leave the cookie unset and thus still work in development without any changes necessary for production.
+However, a request to http://localhost:8080/ or http://192.168.1.100:8080/ will leave the cookie unset and thus still work in development without any changes necessary for production.
 
 [WARNING]
 ====
@@ -78,7 +78,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 

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

@@ -1,272 +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}javaconfig/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
-and GemFire.
-<2> Next, we register a `Properties` bean that allows us to configure certain aspects of the GemFire client cache
-using https://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-<3> We use the `Properties` to configure an instance of a GemFire `ClientCache`.
-<4> 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
-https://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/client/PoolFactory.html[PoolFactory API].
-<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.
-
-The `BeanPostProcessor` uses a GemFire https://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.
-
-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 https://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 https://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 https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
-with a GemFire https://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.
-* `poolName` - name of the dedicated GemFire Pool used to connect a client to the cluster of servers.  The attribute
-is only used when the application is a GemFire cache client.  Defaults to `gemfirePool`.
-* `serverRegionShort` - specifies GemFire's https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
-using a GemFire https://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`.  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
-
-We have only covered one side of the equation.  We also need a GemFire Server for our client to talk to and send
-session state to the server to manage.
-
-In this sample, we will use the following GemFire Server Java Configuration:
-
-[source,java]
-----
-include::{samples-dir}javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java[tags=class]
-----
-
-<1> On the server, we also configure Spring Session using the `@EnableGemFireHttpSession` annotation. This ensures
-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 a GemFire peer `Cache` initialized with our GemFire System Properties.
-<4> We also setup a GemFire `CacheServer` instance running on **localhost**, listening to port **12480**,
-ready 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}javaconfig/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}javaconfig/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 https://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 https://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/java-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}javaconfig/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 https://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 https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policies]
-with a GemFire https://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}javaconfig/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}javaconfig/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 https://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 https://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-hazelcast.adoc

@@ -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 https://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/latest/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 
 == Servlet Container Initialization
 
@@ -130,7 +130,7 @@ 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
-https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[reference documentation].
+http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 ====
 
 ----
@@ -161,9 +161,9 @@ Go ahead and view the cookies (click for help with https://developer.chrome.com/
 
 === Interact with the data store
 
-If you like, you can remove the session using https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-java-client[a Java client],
-https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#other-client-implementations[one of the other clients], or the
-https://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/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].
 
 ==== 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 https://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/latest/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 
-https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#rest-client[REST API]
+http://docs.hazelcast.org/docs/latest/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

@@ -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 https://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 http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
 
 == Java Servlet Container Initialization
 

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

@@ -24,8 +24,8 @@ If you are using Maven, ensure to add the following dependencies:
 		<type>pom</type>
 	</dependency>
 	<dependency>
-		<groupId>biz.paluch.redis</groupId>
-		<artifactId>lettuce</artifactId>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
 		<version>{lettuce-version}</version>
 	</dependency>
 	<dependency>
@@ -88,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 https://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+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].
 
 == Java Servlet Container Initialization
 
@@ -125,7 +125,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 
@@ -162,7 +162,7 @@ If you like, you can easily remove the session using redis-cli. For example, on
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for http://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/java-rest.adoc

@@ -24,8 +24,8 @@ If you are using Maven, ensure to add the following dependencies:
 		<type>pom</type>
 	</dependency>
 	<dependency>
-		<groupId>biz.paluch.redis</groupId>
-		<artifactId>lettuce</artifactId>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
 		<version>{lettuce-version}</version>
 	</dependency>
 	<dependency>
@@ -88,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 https://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+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].
 <3> We customize Spring Session's HttpSession integration to use HTTP headers to convey the current session information instead of cookies.
 
 == Servlet Container Initialization
@@ -126,7 +126,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 
@@ -208,7 +208,7 @@ 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 https://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for http://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/java-security.adoc

@@ -25,8 +25,8 @@ If you are using Maven, ensure to add the following dependencies:
 		<type>pom</type>
 	</dependency>
 	<dependency>
-		<groupId>biz.paluch.redis</groupId>
-		<artifactId>lettuce</artifactId>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
 		<version>{lettuce-version}</version>
 	</dependency>
 	<dependency>
@@ -87,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 https://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+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].
 
 == Servlet Container Initialization
 
@@ -130,7 +130,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 
@@ -164,7 +164,7 @@ If you like, you can easily remove the session using redis-cli. For example, on
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for http://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/java-users.adoc

@@ -19,7 +19,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 
@@ -140,7 +140,7 @@ For example, if the URL is http://localhost:8080/?_s=1 this alias would be used.
 
 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 https://docs.oracle.com/javaee/6/api/javax/servlet/http/HttpServletResponse.html#encodeURL(java.lang.String)[HttpServletResponse#encodeURL(java.lang.String)]
+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:

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

@@ -1,273 +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}xml/gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
-----
-
-<1> 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.
-<2> The `META-INF/spring/application.properties` file are used along with the `PropertySourcesPlaceholderConfigurer`
-bean to replace placeholders in the Spring XML configuration meta-data with the approrpriate property values.
-<3> Then the `GemFireCacheSeverReadyBeanPostProcessor`is registered to determine whether a GemFire Server
-at the designated host/port is running and listening for client connections, blocking client startup until
-the server is available and ready.
-<4> Next, we include a `Properties` bean to configure certain aspects of the GemFire client cache using
-https://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 application-specific System property, defaulting
-to `warning` if unspecified.
-<5> Then we create a instance of a GemFire `ClientCache` initialized with our `gemfireProperties`.
-<6> We 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.
-<7> Finally, the `GemFireHttpSessionConfiguration` is registered to enable Spring Session functionality.
-
-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 https://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 https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/[reference guide].
-
-=== Server Configuration
-
-We have only covered one side of the equation.  We also need a GemFire Server for our client to talk to and send
-session state information to the server to manage.
-
-In this sample, we will use the following GemFire Server Java Configuration:
-
-[source,xml]
-----
-include::{samples-dir}xml/gemfire-clientserver/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 in the `META-INF/spring/application.properties` file.
-<3> 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.
-<4> Then we create an instance of a GemFire peer `Cache` initialized with our GemFire System Properties.
-<5> We also setup a GemFire `CacheServer` instance running on *localhost*, listening to port **11235**,
-ready to accept our client connection.
-<6> Finally, we enable the same Spring Session functionality 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.
-
-The GemFire Server configuration gets bootstrapped with the following:
-
-[source,java]
-----
-include::{samples-dir}xml/gemfire-clientserver/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}xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=listeners]
-----
-
-The https://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}xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
-----
-
-The https://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}xml/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 https://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 https://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/xml-gemfire-p2p.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}xml/gemfire-p2p/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 https://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}xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=listeners]
-----
-
-The https://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}xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
-----
-
-The https://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}xml/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 https://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 https://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/xml-jdbc.adoc

@@ -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 https://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 http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
 
 == XML Servlet Container Initialization
 
@@ -105,7 +105,7 @@ include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=context-para
 include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
-The https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
+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.
 
 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:
@@ -116,7 +116,7 @@ The following snippet performs this last step for us:
 include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
-The https://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 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[]

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

@@ -24,8 +24,8 @@ If you are using Maven, ensure to add the following dependencies:
 		<type>pom</type>
 	</dependency>
 	<dependency>
-		<groupId>biz.paluch.redis</groupId>
-		<artifactId>lettuce</artifactId>
+		<groupId>io.lettuce</groupId>
+		<artifactId>lettuce-core</artifactId>
 		<version>{lettuce-version}</version>
 	</dependency>
 	<dependency>
@@ -90,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 https://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
+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].
 
 == XML Servlet Container Initialization
 
@@ -108,7 +108,7 @@ include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=context-par
 include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
-The https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
+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.
 
 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:
@@ -119,7 +119,7 @@ The following snippet performs this last step for us:
 include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
-The https://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 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[]
@@ -133,7 +133,7 @@ You can run the sample by obtaining the {download-url}[source code] and invoking
 
 [NOTE]
 ====
-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).
+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 `LettuceConnectionFactory` to point to a Redis server.
 ====
 
@@ -170,7 +170,7 @@ If you like, you can easily remove the session using redis-cli. For example, on
 
 	$ redis-cli keys '*' | xargs redis-cli del
 
-TIP: The Redis documentation has instructions for https://redis.io/topics/quickstart[installing redis-cli].
+TIP: The Redis documentation has instructions for http://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/index.adoc

@@ -31,8 +31,8 @@ https://github.com/spring-projects/spring-session/milestone/18?closed=1[1.3.0.M2
 https://github.com/spring-projects/spring-session/milestone/16?closed=1[1.3.0.RC1], and
 https://github.com/spring-projects/spring-session/milestone/19?closed=1[1.3.0.RELEASE].
 
-* First class support for https://docs.spring.io/spring-session/docs/1.3.0.RELEASE/reference/html5/#httpsession-hazelcast[Hazelcast]
-* First class support for https://docs.spring.io/spring-session/docs/1.3.0.RELEASE/reference/html5/#spring-security-concurrent-sessions-how[Spring Security's concurrent session management]
+* First class support for http://docs.spring.io/spring-session/docs/1.3.0.RELEASE/reference/html5/#httpsession-hazelcast[Hazelcast]
+* First class support for http://docs.spring.io/spring-session/docs/1.3.0.RELEASE/reference/html5/#spring-security-concurrent-sessions-how[Spring Security's concurrent session management]
 * Added https://github.com/maseev/spring-session-orientdb[OrientDB Community Extension]
 * https://github.com/spring-projects/spring-session/tree/1.3.0.RELEASE/samples/httpsession-redis-json[GenericJackson2JsonRedisSerializer sample] with Spring Security's new Jackson Support
 * Guides now https://github.com/spring-projects/spring-session/pull/652[use Lettuce]
@@ -52,14 +52,6 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Redis.
 | link:guides/boot-redis.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}boot/gemfire[HttpSession with GemFire]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology.
-| link:guides/boot-gemfire.html[HttpSession with GemFire Guide]
-
-| {gh-samples-url}boot/mongo[HttpSession with Mongo]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with Mongo.
-| link:guides/boot-mongo.html[HttpSession with Mongo Guide]
-
 | {gh-samples-url}boot/jdbc[HttpSession with JDBC]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
 | link:guides/boot-jdbc.html[HttpSession with JDBC Guide]
@@ -86,14 +78,6 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Redis.
 | link:guides/java-redis.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}javaconfig/gemfire-clientserver[HttpSession with GemFire (Client/Server)]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology.
-| link:guides/java-gemfire-clientserver.html[HttpSession with GemFire (Client/Server) Guide]
-
-| {gh-samples-url}javaconfig/gemfire-p2p[HttpSession with GemFire (P2P)]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a P2P topology.
-| link:guides/java-gemfire-p2p.html[HttpSession with GemFire (P2P) Guide]
-
 | {gh-samples-url}javaconfig/jdbc[HttpSession with JDBC]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
 | link:guides/java-jdbc.html[HttpSession with JDBC Guide]
@@ -128,14 +112,6 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store.
 | link:guides/xml-redis.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}xml/gemfire-clientserver[HttpSession with GemFire (Client/Server)]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology.
-| link:guides/xml-gemfire-clientserver.html[HttpSession with GemFire (Client/Server) Guide]
-
-| {gh-samples-url}xml/gemfire-p2p[HttpSession with GemFire (P2P)]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a P2P topology.
-| link:guides/xml-gemfire-p2p.html[HttpSession with GemFire (P2P) Guide]
-
 | {gh-samples-url}xml/jdbc[HttpSession with JDBC]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
 | link:guides/xml-jdbc.html[HttpSession with JDBC Guide]
@@ -200,110 +176,6 @@ You can read the basic steps for integration below, but you are encouraged to fo
 
 include::guides/xml-redis.adoc[tags=config,leveloffset=+3]
 
-[[httpsession-gemfire]]
-=== HttpSession with Pivotal GemFire
-
-When https://pivotal.io/big-data/pivotal-gemfire[Pivotal GemFire] is used with Spring Session, a web application's
-`HttpSession` can be replaced with a **clustered** implementation managed by GemFire and conveniently accessed
-with Spring Session's API.
-
-The two most common topologies to manage Spring Sessions using GemFire include:
-
-* <<httpsession-gemfire-clientserver,Client-Server>>
-* <<httpsession-gemfire-p2p,Peer-To-Peer (P2P)>>
-
-Additionally, GemFire supports site-to-site replication using https://gemfire.docs.pivotal.io/docs-gemfire/topologies_and_comm/multi_site_configuration/chapter_overview.html[WAN functionality].
-The ability to configure and use GemFire's WAN support is independent of Spring Session, and is beyond the scope
-of this document. More details on GemFire WAN functionality can be found https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#bootstrap:gateway[here].
-
-[[httpsession-gemfire-clientserver]]
-==== GemFire Client-Server
-
-The https://gemfire.docs.pivotal.io/docs-gemfire/latest/topologies_and_comm/cs_configuration/chapter_overview.html[Client-Server]
-topology will probably be the more common configuration preference for users when using GemFire as a provider in
-Spring Session since a GemFire server will have significantly different and unique JVM heap requirements when compared
-to the application. Using a client-server topology enables an application to manage (e.g. replicate) application state
-independently from other application processes.
-
-In a client-server topology, an application using Spring Session will open a client cache connection to a (remote)
-GemFire server cluster to manage and provide consistent access to all `HttpSession` state.
-
-You can configure a Client-Server topology with either:
-
-* <<httpsession-gemfire-clientserver-java,Java-based Configuration>>
-* <<httpsession-gemfire-clientserver-xml,XML-based Configuration>>
-
-[[httpsession-gemfire-clientserver-java]]
-===== GemFire Client-Server Java-based Configuration
-
-This section describes how to use GemFire's Client-Server topology to back an `HttpSession` with Java-based configuration.
-
-NOTE: The <<samples,HttpSession with GemFire (Client-Server) Sample>> provides a working sample on how to integrate
-Spring Session and GemFire to replace the HttpSession using Java configuration. You can read the basic steps for
-integration below, but you are encouraged to follow along with the detailed HttpSession with GemFire (Client-Server)
-Guide when integrating with your own application.
-
-include::guides/java-gemfire-clientserver.adoc[tags=config,leveloffset=+3]
-
-[[http-session-gemfire-clientserver-xml]]
-===== GemFire Client-Server XML-based Configuration
-
-This section describes how to use GemFire's Client-Server topology to back an `HttpSession` with XML-based configuration.
-
-NOTE: The <<samples,HttpSession with GemFire (Client-Server) using XML Sample>> provides a working sample on how to
-integrate Spring Session and GemFire to replace the `HttpSession` using XML configuration. You can read the basic steps
-for integration below, but you are encouraged to follow along with the detailed HttpSession with GemFire (Client-Server)
-using XML Guide when integrating with your own application.
-
-include::guides/xml-gemfire-clientserver.adoc[tags=config,leveloffset=+3]
-
-[[httpsession-gemfire-p2p]]
-==== GemFire Peer-To-Peer (P2P)
-
-Perhaps less common would be to configure the Spring Session application as a peer member in the GemFire cluster using
-the https://gemfire.docs.pivotal.io/docs-gemfire/latest/topologies_and_comm/p2p_configuration/chapter_overview.html[Peer-To-Peer (P2P)] topology.
-In this configuration, a Spring Session application would be an actual data node (server) in the GemFire cluster,
-and **not** a cache client as before.
-
-One advantage to this approach is the proximity of the application to the application's state (i.e. it's data). However,
-there are other effective means of accomplishing similar data dependent computations, such as using GemFire's
-https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/function_exec/chapter_overview.html[Function Execution].
-Any of GemFire's other https://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/product_intro.html[features]
-can be used when GemFire is serving as a provider in Spring Session.
-
-P2P is very useful for both testing purposes as well as smaller, more focused and self-contained applications,
-such as those found in a microservices architecture, and will most certainly improve on your application's latency,
-throughput and consistency needs.
-
-You can configure a Peer-To-Peer (P2P) topology with either:
-
-* <<httpsession-gemfire-p2p-java,Java-based Configuration>>
-* <<httpsession-gemfire-p2p-xml,XML-based Configuration>>
-
-[[httpsession-gemfire-p2p-java]]
-===== GemFire Peer-To-Peer (P2P) Java-based Configuration
-
-This section describes how to use GemFire's Peer-To-Peer (P2P) topology to back an `HttpSession` using Java-based configuration.
-
-NOTE: The <<samples, HttpSession with GemFire (P2P) Sample>> provides a working sample on how to integrate
-Spring Session and GemFire to replace the `HttpSession` using Java configuration. You can read the basic steps
-for integration below, but you are encouraged to follow along with the detailed HttpSession with GemFire (P2P) Guide
-when integrating with your own application.
-
-include::guides/java-gemfire-p2p.adoc[tags=config,leveloffset=+3]
-
-[[httpsession-gemfire-p2p-xml]]
-===== GemFire Peer-To-Peer (P2P) XML-based Configuration
-
-This section describes how to use GemFire's Peer-To-Peer (P2P) topology to back an `HttpSession` using XML-based configuration.
-
-NOTE: The <<samples, HttpSession with GemFire (P2P) using XML Sample>> provides a working sample on how to integrate
-Spring Session and GemFire to replace the `HttpSession` using XML configuration. You can read the basic steps for
-integration below, but you are encouraged to follow along with the detailed HttpSession with GemFire (P2P) using XML
-Guide when integrating with your own application.
-
-include::guides/xml-gemfire-p2p.adoc[tags=config,leveloffset=+3]
-
 [[httpsession-jdbc]]
 === HttpSession with JDBC
 
@@ -344,57 +216,6 @@ You can read the basic steps for integration below, but you are encouraged to fo
 
 include::guides/boot-jdbc.adoc[tags=config,leveloffset=+3]
 
-[[httpsession-mongo]]
-=== HttpSession with Mongo
-
-Using Spring Session with `HttpSession` is enabled by adding a Servlet Filter before anything that uses the `HttpSession`.
-
-This section describes how to use Mongo to back `HttpSession` using Java based configuration.
-
-NOTE: The <<samples, HttpSession Mongo Sample>> provides a working sample on how to integrate Spring Session and `HttpSession` using Java configuration.
-You can read the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession Guide when integrating with your own application.
-
-include::guides/boot-mongo.adoc[tags=config,leveloffset=+3]
-
-==== Session serialization mechanisms
-
-To be able to persist session objects in MongoDB we need to provide the serialization/deserialization mechanism.
-Depending on your classpath Spring Session will choose one of two build-in converters:
-
-* `JacksonMongoSessionConverter` when `ObjectMapper` class is available, or
-* `JdkMongoSessionConverter` otherwise.
-
-===== JacksonMongoSessionConverter
-
-This mechanism uses Jackson to serialize session objects to/from JSON.
-`JacksonMongoSessionConverter` will be the default when Jackson is detected on the classpath and the user has not explicitly registered a `AbstractMongoSessionConverter` Bean.
-
-If you would like to provide custom Jackson modules you can do it by explicitly registering `JacksonMongoSessionConverter`:
-
-[source,java,indent=0]
-----
-include::{docs-test-dir}docs/http/MongoJacksonSessionConfiguration.java[tags=config]
-----
-
-==== JdkMongoSessionConverter
-
-`JdkMongoSessionConverter` uses standard Java serialization to persist session attributes map to MongoDB in a binary form.
-However, standard session elements like id, access time, etc are still written as a plain Mongo objects and can be read and queried without additional effort.
-`JdkMongoSessionConverter` is used if Jackson is not on the classpath and no explicit `AbstractMongoSessionConverter` Bean has been defined.
-You can explicitly register `JdkMongoSessionConverter` by defining it as a Bean.
-
-[source,java,indent=0]
-----
-include::{docs-test-dir}docs/http/MongoJdkSessionConfiguration.java[tags=config]
-----
-
-There is also a constructor taking `Serializer` and `Deserializer` objects, allowing you to pass custom implementations, which is especially important when you want to use non-default classloader.
-
-==== Using custom converters
-
-You can create your own session converter by extending `AbstractMongoSessionConverter` class.
-The implementation will be used for serializing, deserializing your objects and for providing queries to access the session.
-
 [[httpsession-hazelcast]]
 === HttpSession with Hazelcast
 
@@ -552,7 +373,7 @@ Spring Session provides integration with Spring Security.
 [[spring-security-rememberme]]
 === Spring Security Remember-Me Support
 
-Spring Session provides integration with https://docs.spring.io/spring-security/site/docs/4.2.x/reference/htmlsingle/#remember-me[Spring Security's Remember-Me Authentication].
+Spring Session provides integration with http://docs.spring.io/spring-security/site/docs/4.2.x/reference/htmlsingle/#remember-me[Spring Security's Remember-Me Authentication].
 The support will:
 
 * Change the session expiration length
@@ -604,7 +425,7 @@ include::{docs-test-resources-dir}docs/security/security-config.xml[tags=config]
 ----
 
 This assumes that your Spring Session `SessionRegistry` bean is called `sessionRegistry`, which is the name used by all
-`SpringHttpSessionConfiguration` subclasses except for the one for MongoDB: there it's called `mongoSessionRepository`.
+`SpringHttpSessionConfiguration` subclasses.
 
 [[spring-security-concurrent-sessions-limitations]]
 === Limitations
@@ -757,7 +578,7 @@ You can customize the serialization by creating a Bean named `springSessionDefau
 
 `RedisOperationsSessionRepository` is subscribed to receive events from redis using a `RedisMessageListenerContainer`.
 You can customize the way those events are dispatched, by creating a Bean named `springSessionRedisTaskExecutor` and/or a Bean `springSessionRedisSubscriptionExecutor`.
-More details on configuring redis task executors can be found https://docs.spring.io/spring-data-redis/docs/current/reference/html/#redis:pubsub:subscribe:containers[here].
+More details on configuring redis task executors can be found http://docs.spring.io/spring-data-redis/docs/current/reference/html/#redis:pubsub:subscribe:containers[here].
 
 [[api-redisoperationssessionrepository-storage]]
 ==== Storage Details
@@ -836,7 +657,7 @@ The `SessionRepository.getSession(String)` method ensures that no expired sessio
 This means there is no need to check the expiration before using a session.
 ====
 
-Spring Session relies on the delete and expired https://redis.io/topics/notifications[keyspace notifications] from Redis to fire a <<api-redisoperationssessionrepository-sessiondestroyedevent,SessionDeletedEvent>> and <<api-redisoperationssessionrepository-sessiondestroyedevent,SessionExpiredEvent>> respectively.
+Spring Session relies on the delete and expired http://redis.io/topics/notifications[keyspace notifications] from Redis to fire a <<api-redisoperationssessionrepository-sessiondestroyedevent,SessionDeletedEvent>> and <<api-redisoperationssessionrepository-sessiondestroyedevent,SessionExpiredEvent>> respectively.
 It is the `SessionDeletedEvent` or `SessionExpiredEvent` that ensures resources associated with the Session are cleaned up.
 For example, when using Spring Session's WebSocket support the Redis expired or delete event is what triggers any WebSocket connections associated with the session to be closed.
 
@@ -851,7 +672,7 @@ When a session expires key is deleted or expires, the keyspace notification trig
 
 One problem with relying on Redis expiration exclusively is that Redis makes no guarantee of when the expired event will be fired if they key has not been accessed.
 Specifically the background task that Redis uses to clean up expired keys is a low priority task and may not trigger the key expiration.
-For additional details see https://redis.io/topics/notifications[Timing of expired events] section in the Redis documentation.
+For additional details see http://redis.io/topics/notifications[Timing of expired events] section in the Redis documentation.
 
 To circumvent the fact that expired events are not guaranteed to happen we can ensure that each key is accessed when it is expected to expire.
 This means that if the TTL is expired on the key, Redis will remove the key and fire the expired event when we try to access they key.
@@ -886,7 +707,7 @@ This is necessary to ensure resources associated with the `Session` are properly
 
 For example, when integrating with WebSockets the `SessionDestroyedEvent` is in charge of closing any active WebSocket connections.
 
-Firing `SessionDeletedEvent` or `SessionExpiredEvent` is made available through the `SessionMessageListener` which listens to https://redis.io/topics/notifications[Redis Keyspace events].
+Firing `SessionDeletedEvent` or `SessionExpiredEvent` is made available through the `SessionMessageListener` which listens to http://redis.io/topics/notifications[Redis Keyspace events].
 In order for this to work, Redis Keyspace events for Generic commands and Expired events needs to be enabled.
 For example:
 
@@ -925,7 +746,7 @@ If registered as a MessageListener (default), then `RedisOperationsSessionReposi
 [[api-redisoperationssessionrepository-cli]]
 ==== Viewing the Session in Redis
 
-After https://redis.io/topics/quickstart[installing redis-cli], you can inspect the values in Redis https://redis.io/commands#hash[using the redis-cli].
+After http://redis.io/topics/quickstart[installing redis-cli], you can inspect the values in Redis http://redis.io/commands#hash[using the redis-cli].
 For example, enter the following into a terminal:
 
 [source,bash]
@@ -952,89 +773,6 @@ redis 127.0.0.1:6379> hget spring:session:sessions:4fc39ce3-63b3-4e17-b1c4-5e1ed
 "\xac\xed\x00\x05t\x00\x03rob"
 ----
 
-[[api-gemfireoperationssessionrepository]]
-=== GemFireOperationsSessionRepository
-
-`GemFireOperationsSessionRepository` is a `SessionRepository` that is implemented using Spring Data's `GemFireOperationsSessionRepository`.
-In a web environment, this is typically used in combination with `SessionRepositoryFilter`.
-The implementation supports `SessionDestroyedEvent` and `SessionCreatedEvent` through `SessionMessageListener`.
-
-[[api-gemfireoperationssessionrepository-indexing]]
-==== Using Indexes with GemFire
-
-While best practices concerning the proper definition of indexes that positively impact GemFire's performance is beyond
-the scope of this document, it is important to realize that Spring Session Data GemFire creates and uses indexes to
-query and find Sessions efficiently.
-
-Out-of-the-box, Spring Session Data GemFire creates 1 Hash-typed Index on the principal name. There are two different buit in
-strategies for finding the principal name. The first strategy is that the value of the session attribute with the name
-`FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME` will be indexed to the same index name. For example:
-
-[source,java,indent=0]
-----
-include::{docs-itest-dir}docs/http/HttpSessionGemFireIndexingITests.java[tags=findbyindexname-set]
-include::{docs-itest-dir}docs/http/HttpSessionGemFireIndexingITests.java[tags=findbyindexname-get]
-----
-
-[[api-gemfireoperationssessionrepository-indexing-security]]
-==== Using Indexes with GemFire & Spring Security
-
-Alternatively, Spring Session Data GemFire will map Spring Security's current `Authentication#getName()` to the index
-`FindByIndexNameSessionRepository.PRINCIPAL_NAME_INDEX_NAME`. For example, if you are using Spring Security you can
-find the current user's sessions using:
-
-[source,java,indent=0]
-----
-include::{docs-itest-dir}docs/http/HttpSessionGemFireIndexingITests.java[tags=findbyspringsecurityindexname-context]
-include::{docs-itest-dir}docs/http/HttpSessionGemFireIndexingITests.java[tags=findbyspringsecurityindexname-get]
-----
-
-[[api-gemfireoperationssessionrepository-indexing-custom]]
-==== Using Custom Indexes with GemFire
-
-This enables developers using the `GemFireOperationsSessionRepository` programmatically to query and find all Sessions
-with a given principal name efficiently.
-
-Additionally, Spring Session Data GemFire will create a Range-based Index on the implementing Session's Map-type
-`attributes` property (i.e. on any arbitrary Session attribute) when a developer identifies 1 or more named Session
-attributes that should be indexed by GemFire.
-
-Sessions attributes to index can be specified with the `indexableSessionAttributes` attribute on the `@EnableGemFireHttpSession`
-annotation.  A developer adds this annotation to their Spring application `@Configuration` class when s/he wishes to
-enable Spring Session support for HttpSession backed by GemFire.
-
-For example, the following configuration:
-
-[source,java,indent=0]
-----
-include::{docs-itest-dir}docs/http/gemfire/indexablesessionattributes/GemFireHttpSessionConfig.java[tags=class-start]
-	// ...
-}
-----
-
-will allow searching for sessions using the following:
-
-[source,java,indent=0]
-----
-include::{docs-itest-dir}docs/http/gemfire/indexablesessionattributes/HttpSessionGemFireIndexingCustomITests.java[tags=findbyindexname-set]
-include::{docs-itest-dir}docs/http/gemfire/indexablesessionattributes/HttpSessionGemFireIndexingCustomITests.java[tags=findbyindexname-get]
-----
-
-NOTE: Only Session attribute names identified in the `@EnableGemFireHttpSession` annotation's `indexableSessionAttributes`
-attribute will have an Index defined.  All other Session attributes will not be indexed.
-
-However, there is one caveat. Any values stored in indexable Session attributes must implement the `java.lang.Comparable<T>`
-interface. If those object values do not implement `Comparable`, then GemFire will throw an error on startup when the
-Index is defined for Regions with persistent Session data, or when an attempt is made at runtime to assign the indexable
-Session attribute a value that is not `Comparable` and the Session is saved to GemFire.
-
-NOTE: Any Session attribute that is not indexed may store non-`Comparable` values.
-
-To learn more about GemFire's Range-based Indexes, see https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/query_index/creating_map_indexes.html[Creating Indexes on Map Fields].
-
-To learn more about GemFire Indexing in general, see https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/query_index/query_index.html[Working with Indexes].
-
-
 [[api-mapsessionrepository]]
 === MapSessionRepository
 
@@ -1086,7 +824,7 @@ A typical example of how to create a new instance can be seen below:
 include::{indexdoc-tests}[tags=new-jdbcoperationssessionrepository]
 ----
 
-For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, refer to the https://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
+For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, refer to the http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
 
 [[api-jdbcoperationssessionrepository-config]]
 ==== EnableJdbcHttpSession
@@ -1153,12 +891,12 @@ A typical example of how to create a new instance can be seen below:
 include::{indexdoc-tests}[tags=new-hazelcastsessionrepository]
 ----
 
-For additional information on how to create and configure Hazelcast instance, refer to the https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[Hazelcast documentation].
+For additional information on how to create and configure Hazelcast instance, refer to the http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[Hazelcast documentation].
 
 [[api-enablehazelcasthttpsession]]
 ==== EnableHazelcastHttpSession
 
-If you wish to use https://hazelcast.org/[Hazelcast] as your backing source for the `SessionRepository`, then the `@EnableHazelcastHttpSession` annotation
+If you wish to use http://hazelcast.org/[Hazelcast] as your backing source for the `SessionRepository`, then the `@EnableHazelcastHttpSession` annotation
 can be added to an `@Configuration` class. This extends the functionality provided by the `@EnableSpringHttpSession` annotation but makes the `SessionRepository` for you in Hazelcast.
 You must provide a single `HazelcastInstance` bean for the configuration to work.
 Complete configuration example can be found in the <<samples>>
@@ -1199,7 +937,7 @@ Please find additional information below.
 [[community-support]]
 === Support
 
-You can get help by asking questions on https://stackoverflow.com/questions/tagged/spring-session[StackOverflow with the tag spring-session].
+You can get help by asking questions on http://stackoverflow.com/questions/tagged/spring-session[StackOverflow with the tag spring-session].
 Similarly we encourage helping others by answering questions on StackOverflow.
 
 [[community-source]]
@@ -1220,12 +958,12 @@ We appreciate https://help.github.com/articles/using-pull-requests/[Pull Request
 [[community-license]]
 === License
 
-Spring Session is Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
+Spring Session is Open Source software released under the http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
 
 [[community-extensions]]
 === Community Extensions
 https://github.com/maseev/spring-session-orientdb[Spring Session OrientDB]
-https://infinispan.org/docs/dev/user_guide/user_guide.html#externalizing_session_using_spring_session[Spring Session Infinispan]
+http://infinispan.org/docs/dev/user_guide/user_guide.html#externalizing_session_using_spring_session[Spring Session Infinispan]
 
 [[minimum-requirements]]
 == Minimum Requirements
@@ -1240,6 +978,6 @@ While we re-run all unit tests against Spring 3.2.x, we recommend using the late
 
 [NOTE]
 ====
-At its core Spring Session only has a required dependency on commons-logging.
+At its core Spring Session only has a required dependency on `spring-jcl`.
 For an example of using Spring Session without any other Spring dependencies, refer to the <<samples,hazelcast sample>> application.
 ====

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

@@ -1,465 +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
- *
- *      https://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 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", "gemfire-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
- *
- *      https://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
- *
- *      https://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
- *
- *      https://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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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;

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -49,7 +49,7 @@ public class IndexDocTests {
 
 	@Test
 	public void repositoryDemo() {
-		RepositoryDemo<ExpiringSession> demo = new RepositoryDemo<ExpiringSession>();
+		RepositoryDemo<ExpiringSession> demo = new RepositoryDemo<>();
 		demo.repository = new MapSessionRepository();
 
 		demo.demo();
@@ -81,7 +81,7 @@ public class IndexDocTests {
 
 	@Test
 	public void expireRepositoryDemo() {
-		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
+		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<>();
 		demo.repository = new MapSessionRepository();
 
 		demo.demo();

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

docs/src/test/java/docs/http/HttpSessionListenerJavaConfigTests.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

docs/src/test/java/docs/http/HttpSessionListenerXmlTests.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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
- *
- *      https://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
- *
- *      https://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/http/MyJacksonModule.java

@@ -1,22 +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
- *
- *      https://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 com.fasterxml.jackson.databind.module.SimpleModule;
-
-class MyJacksonModule extends SimpleModule {
-}

docs/src/test/java/docs/http/RedisHttpSessionConfig.java

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,6 +16,7 @@
 
 package docs.security;
 
+import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.Cookie;
@@ -79,7 +80,8 @@ public class RememberMeSecurityConfigurationTests<T extends ExpiringSession> {
 
 		Cookie cookie = result.getResponse().getCookie("SESSION");
 		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
-		T session = this.sessions.getSession(cookie.getValue());
+		T session = this.sessions
+				.getSession(new String(Base64.getDecoder().decode(cookie.getValue())));
 		assertThat(session.getMaxInactiveIntervalInSeconds())
 				.isEqualTo((int) TimeUnit.DAYS.toSeconds(30));
 

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

@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,6 +16,7 @@
 
 package docs.security;
 
+import java.util.Base64;
 import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.Cookie;
@@ -79,7 +80,8 @@ public class RememberMeSecurityConfigurationXmlTests<T extends ExpiringSession>
 
 		Cookie cookie = result.getResponse().getCookie("SESSION");
 		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
-		T session = this.sessions.getSession(cookie.getValue());
+		T session = this.sessions
+				.getSession(new String(Base64.getDecoder().decode(cookie.getValue())));
 		assertThat(session.getMaxInactiveIntervalInSeconds())
 				.isEqualTo((int) TimeUnit.DAYS.toSeconds(30));
 

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

docs/src/test/resources/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests-context.xml

@@ -4,9 +4,9 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-4.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd">
 
 	<context:annotation-config/>
 

docs/src/test/resources/docs/http/HttpSessionListenerXmlTests-context.xml

@@ -4,9 +4,9 @@
 	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:p="http://www.springframework.org/schema/p"
 	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util-4.1.xsd">
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd">
 
 	<!-- tag::config[] -->
 	<bean class="org.springframework.security.web.session.HttpSessionEventPublisher"/>

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

@@ -3,8 +3,8 @@
 	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 https://www.springframework.org/schema/security/spring-security.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+	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>

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

@@ -2,8 +2,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"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-						   http://www.springframework.org/schema/security https://www.springframework.org/schema/security/spring-security.xsd">
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+						   http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
 
 	<!-- tag::config[] -->
 	<security:http>

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,30 +1,2 @@
-assertjVersion=2.6.0
-bootstrapVersion=2.3.2
-commonsLoggingVersion=1.2
-commonsPoolVersion=2.4.2
-gebVersion=0.13.1
-groovyVersion=2.4.11
-h2Version=1.4.195
-hazelcastVersion=3.7.7
-httpClientVersion=4.5.3
-html5ShivVersion=3.7.3
-jacksonVersion=2.8.8
-jedisVersion=2.9.0
-jspApiVersion=2.0
-jstlVersion=1.2.1
-jstlelVersion=1.2.5
-junitVersion=4.12
-lettuceVersion=4.3.0.Final
-mockitoVersion=1.10.19
-seleniumVersion=2.52.0
-servletApiVersion=3.0.1
-springVersion=4.3.9.RELEASE
-springDataGemFireVersion=1.9.4.RELEASE
-springDataGeodeVersion=1.0.0.INCUBATING-RELEASE
-springDataMongoVersion=1.10.4.RELEASE
-springDataRedisVersion=1.8.4.RELEASE
-springSecurityVersion=4.2.3.RELEASE
-springShellVersion=1.1.0.RELEASE
-spockVersion=1.0-groovy-2.4
-webjarsTaglibVersion=0.3
-version=1.4.0.BUILD-SNAPSHOT
+springBootVersion=1.5.3.RELEASE
+version=2.0.0.M1

gradle/dependency-management.gradle

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

gradle/ide.gradle

@@ -51,7 +51,8 @@ task cleanEclipseJdtUi(type: Delete) {
 	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
 }
 
-task eclipseConfiguration(dependsOn: [eclipseCheckstyle, eclipseSettings, eclipseWstComponent]) {
+task eclipseConfiguration(dependsOn: [eclipseCheckstyle, eclipseJdtPrepare, eclipseSettings, eclipseWstComponent]) {
+	group 'ide'
 }
 
 tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)

gradle/java.gradle

@@ -11,36 +11,25 @@ apply from: IDE_GRADLE
 
 group = 'org.springframework.session'
 
-sourceCompatibility = 1.5
-targetCompatibility = 1.5
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
 
-ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'Brussels-SR3'
-
-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.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'Cairo-BUILD-SNAPSHOT'
 
 ext.seleniumDependencies = [
-		"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
+		"org.seleniumhq.selenium:htmlunit-driver:$htmlUnitVersion",
 		"org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
 ]
 
 ext.jstlDependencies = [
 		"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-		"org.apache.taglibs:taglibs-standard-jstlel:$jstlelVersion"
+		"org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
 ]
 
 repositories {
 	mavenCentral()
 	maven { url 'https://repo.spring.io/libs-snapshot' }
+	maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
 }
 
 configurations.all {

gradle/publish-maven.gradle

@@ -21,12 +21,12 @@ def customizePom(pom, gradleProject) {
 			url = "https://github.com/spring-projects/spring-session"
 			organization {
 				name = "Spring IO"
-				url = "https://projects.spring.io/spring-session"
+				url = "http://projects.spring.io/spring-session"
 			}
 			licenses {
 				license {
 					name "The Apache Software License, Version 2.0"
-					url "https://www.apache.org/licenses/LICENSE-2.0.txt"
+					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
 					distribution "repo"
 				}
 			}

gradle/spring3.gradle

@@ -0,0 +1,36 @@
+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.18.RELEASE'
+		}
+		if (details.requested.group == 'org.springframework.data') {
+			if (details.requested.name == 'spring-data-commons') {
+				details.useVersion '1.12.1.RELEASE'
+			}
+			if (details.requested.name == 'spring-data-keyvalue') {
+				details.useVersion '1.1.1.RELEASE'
+			}
+			if (details.requested.name == 'spring-data-redis') {
+				details.useVersion '1.7.1.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/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

samples/boot/findbyusername/README.adoc

@@ -1,4 +1,4 @@
 Demonstrates using Spring Session to lookup a user's session by the username.
 The sample provides a hook to add the current username to the session (required for finding the user) by providing a custom implementation of Spring Security's `AuthenticationSuccessHandler`.
 
-NOTE: This product includes GeoLite2 data created by MaxMind, available from https://www.maxmind.com
+NOTE: This product includes GeoLite2 data created by MaxMind, available from http://www.maxmind.com

samples/boot/findbyusername/build.gradle

@@ -1,55 +0,0 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		maven { url "https://repo.spring.io/milestone" }
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-	}
-}
-
-apply plugin: 'org.springframework.boot'
-
-apply from: JAVA_GRADLE
-apply from: SAMPLE_GRADLE
-
-group = 'samples'
-
-dependencies {
-	compile project(':spring-session'),
-			"org.springframework.boot:spring-boot-starter-data-redis",
-			"org.springframework.boot:spring-boot-starter-web",
-			"org.springframework.boot:spring-boot-starter-security",
-			"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",
-			"com.maxmind.geoip2:geoip2:2.3.1",
-			"org.apache.httpcomponents:httpclient"
-
-	testCompile "org.springframework.boot:spring-boot-starter-test",
-				"org.assertj:assertj-core:$assertjVersion"
-
-	integrationTestCompile seleniumDependencies
-
-}
-
-integrationTest {
-	doFirst {
-		def port = reservePort()
-
-		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,31 @@
+apply plugin: 'io.spring.convention.spring-sample-boot'
+
+dependencies {
+	compile project(':spring-session-data-redis')
+	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"
+	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
+}
+
+integrationTest {
+	doFirst {
+		systemProperties['spring.session.redis.namespace'] = project.name
+	}
+}
+
+integrationTest {
+	doFirst {
+		systemProperties['spring.session.redis.namespace'] = project.name
+	}
+}

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,6 +16,7 @@
 
 package sample.pages;
 
+import java.util.Base64;
 import java.util.Set;
 
 import org.openqa.selenium.By;
@@ -59,7 +60,7 @@ public class HomePage extends BasePage {
 		String cookieValue = null;
 		for (Cookie cookie : cookies) {
 			if ("SESSION".equals(cookie.getName())) {
-				cookieValue = cookie.getValue();
+				cookieValue = new String(Base64.getDecoder().decode(cookie.getValue()));
 			}
 		}
 		WebElement element = getDriver().findElement(By.id("terminate-" + cookieValue));

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -1,30 +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
- *
- *      https://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.config;
-
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-
-/**
- *
- * @author Rob Winch
- *
- */
-// tag::class[]
-@EnableRedisHttpSession // <1>
-public class HttpSessionConfig {
-}
-// end::class[]

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

@@ -1,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,29 +16,27 @@
 
 package sample.config;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+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;
 
 /**
  * @author Rob Winch
  */
-@EnableWebSecurity
+@Configuration
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
 	// 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
+			.formLogin()
+				.loginPage("/login")
+				.permitAll()
+				.and()
+			.authorizeRequests()
+				.anyRequest().authenticated();
 	}
 	// end::config[]
 
-	@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,11 +1,11 @@
 /*
- * 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.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -14,20 +14,18 @@
  * limitations under the License.
  */
 
-package sample;
+package sample.config;
 
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
+import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
-@SuppressWarnings("resource")
-// tag::class[]
-@Configuration // <1>
-@ImportResource("META-INF/spring/session-server.xml") // <2>
-public class Application {
+@Configuration
+public class WebMvcConfig extends WebMvcConfigurerAdapter {
 
-	public static void main(final String[] args) {
-		new AnnotationConfigApplicationContext(Application.class).registerShutdownHook();
+	@Override
+	public void addViewControllers(ViewControllerRegistry registry) {
+		registry.addViewController("/login").setViewName("login");
 	}
+
 }
-// tag::end[]

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -1,34 +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
- *
- *      https://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.mvc;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * Returns view for log in page
- *
- * @author Rob Winch
- */
-@Controller
-public class LoginController {
-
-	@RequestMapping("/login")
-	public String login() {
-		return "login";
-	}
-}

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

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

@@ -1,2 +1,2 @@
-spring.thymeleaf.cache=false
-spring.template.cache=false
+spring.session.store-type=redis
+security.user.password=password

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

@@ -1,4 +1,4 @@
-<html xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layout">
+<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
 <head>
 	<title>Secured Content</title>
 </head>
@@ -18,19 +18,19 @@
 				<th>Information</th>
 				<th>Terminate</th>
 			</tr>
-			<tr th:each="session : ${sessions}" th:with="details=${session.getAttribute('SESSION_DETAILS')}">
-				<td th:text="${session.id.substring(30)}"></td>
-				<td th:text="${details.location}"></td>
-				<td th:text="${#dates.format(new java.util.Date(session.creationTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
-				<td th:text="${#dates.format(new java.util.Date(session.lastAccessedTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
-				<td th:text="${details.accessType}"></td>
+			<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="${#dates.format(new java.util.Date(sessionElement.creationTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${#dates.format(new java.util.Date(sessionElement.lastAccessedTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${details?.accessType}"></td>
 				<td>
-					<form th:action="@{'/sessions/' + ${session.id}}" th:method="delete">
-						<input th:id="'terminate-' + ${session.id}" type="submit" value="Terminate" th:disabled="${session.id == #httpSession.id}"/>
+					<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>
+</html>

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

@@ -1,10 +1,10 @@
-<!DOCTYPE html SYSTEM "https://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">
+<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
-			xmlns:th="https://www.thymeleaf.org"
-			xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
+			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"/>
+		<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}">
@@ -115,7 +115,7 @@
 
 		<div id="footer">
 			<div class="container">
-				<p class="muted credit">This product includes GeoLite2 data created by MaxMind, available from <a href="https://www.maxmind.com">https://www.maxmind.com</a>.</p>
+				<p class="muted credit">This product includes GeoLite2 data created by MaxMind, available from <a href="http://www.maxmind.com">http://www.maxmind.com</a>.</p>
 			</div>
 		</div>
 	</body>

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

@@ -1,5 +1,5 @@
-<html xmlns:th="https://www.thymeleaf.org"
-	xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"
+<html xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
 	layout:decorator="layout">
 <head>
 <title>Log In</title>

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

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,

samples/boot/gemfire/build.gradle

@@ -1,99 +0,0 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		maven { url "https://repo.spring.io/milestone" }
-	}
-	dependencies {
-		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
-	}
-}
-
-apply from: JAVA_GRADLE
-apply plugin: "application"
-apply plugin: 'org.springframework.boot'
-apply from: SAMPLE_GRADLE
-
-dependencies {
-	compile project(':spring-session-data-gemfire'),
-		"org.springframework.boot:spring-boot-starter-thymeleaf",
-		"org.springframework.boot:spring-boot-starter-web",
-		"org.webjars:bootstrap:$bootstrapVersion",
-		"org.webjars:webjars-locator"
-
-	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
-
-	testCompile "org.springframework.boot:spring-boot-starter-test"
-
-	integrationTestCompile seleniumDependencies
-
-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
-}
-
-run {
-	doFirst {
-		mainClassName = 'sample.server.GemFireServer'
-	}
-}
-
-springBoot {
-	mainClass = 'sample.client.Application'
-}
-
-task runGemFireServer() {
-	doLast {
-		ext.port = reservePort()
-
-		println "Starting GemFire Server on port [$port] ..."
-
-		def out = new StringBuilder()
-		def err = new StringBuilder()
-
-		String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
-
-		String[] commandLine = [
-			'java', '-server', '-ea', '-classpath', classpath,
-			//"-Dgemfire.log-file=gemfire-server.log",
-			//"-Dgemfire.log-level=config",
-			"-Dspring-session-data-gemfire.cache.server.port=$port",
-			"-Dspring-session-data-gemfire.log.level="
-				+ System.getProperty('spring-session-data-gemfire.log.level', 'warning'),
-			'sample.server.GemFireServer'
-		]
-
-		//println commandLine
-
-		ext.process = commandLine.execute()
-		//ext.process = new ProcessBuilder().command(commandLine).redirectErrorStream(true).start();
-
-		ext.process.consumeProcessOutput(out, err)
-
-		//println 'OUT: ' + out
-		//println 'ERR: ' + err
-	}
-}
-
-
-integrationTest {
-	dependsOn runGemFireServer
-	doFirst {
-		def port = reservePort()
-		systemProperties['management.port'] = 0
-		systemProperties['server.port'] = port
-		//systemProperties['gemfire.log-file'] = "gemfire-client.log"
-		//systemProperties['gemfire.log-level'] = "config"
-		systemProperties['spring-session-data-gemfire.cache.server.port'] = runGemFireServer.port
-		systemProperties['spring-session-data-gemfire.log.level'] = System.getProperty("spring-session-data-gemfire.log.level", "warning")
-	}
-	doLast {
-		println 'Stopping GemFire Server...'
-		runGemFireServer.process?.destroyForcibly()
-	}
-}
-
-
-def reservePort() {
-	def socket = new ServerSocket(0)
-	def result = socket.localPort
-	socket.close()
-	result
-}

samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java

@@ -1,96 +0,0 @@
-/*
- * 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
- *
- *      https://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 java.util.List;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openqa.selenium.WebDriver;
-import sample.client.Application;
-import sample.pages.HomePage;
-import sample.pages.HomePage.Attribute;
-
-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.test.context.junit4.SpringRunner;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Eddú Meléndez
- * @author Rob Winch
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.MOCK)
-@AutoConfigureMockMvc
-public class AttributeTests {
-
-	@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() {
-		HomePage home = HomePage.go(this.driver);
-		home.assertAt();
-	}
-
-	@Test
-	public void noAttributes() {
-		HomePage home = HomePage.go(this.driver);
-		assertThat(home.attributes()).isEmpty();
-	}
-
-	@Test
-	public void createAttribute() {
-		HomePage home = HomePage.go(this.driver);
-		// @formatter:off
-		home = home.form()
-				.attributeName("a")
-				.attributeValue("b")
-				.submit(HomePage.class);
-		// @formatter:on
-
-		List<Attribute> attributes = home.attributes();
-		assertThat(attributes).hasSize(2);
-		assertThat(attributes.get(0).getAttributeName()).isEqualTo("requestCount");
-		assertThat(attributes.get(0).getAttributeValue()).isEqualTo("1");
-		assertThat(attributes.get(1).getAttributeName()).isEqualTo("a");
-		assertThat(attributes.get(1).getAttributeValue()).isEqualTo("b");
-	}
-
-}

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

@@ -1,135 +0,0 @@
-/*
- * 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
- *
- *      https://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.ArrayList;
-import java.util.List;
-
-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 HomePage {
-
-	private WebDriver driver;
-
-	@FindBy(css = "form")
-	WebElement form;
-
-	@FindBy(css = "table tbody tr")
-	List<WebElement> trs;
-
-	List<Attribute> attributes;
-
-	public HomePage(WebDriver driver) {
-		this.driver = driver;
-		this.attributes = new ArrayList<Attribute>();
-	}
-
-	private static void get(WebDriver driver, String get) {
-		String baseUrl = "http://localhost:" + System.getProperty("tomcat.port", "8080");
-		driver.get(baseUrl + get);
-	}
-
-	public static HomePage go(WebDriver driver) {
-		get(driver, "/");
-		return PageFactory.initElements(driver, HomePage.class);
-	}
-
-	public void assertAt() {
-		assertThat(this.driver.getTitle()).isEqualTo("Session Attributes");
-	}
-
-	public List<Attribute> attributes() {
-		List<Attribute> rows = new ArrayList<Attribute>();
-		for (WebElement tr : this.trs) {
-			rows.add(new Attribute(tr));
-		}
-		this.attributes.addAll(rows);
-		return this.attributes;
-	}
-
-	public Form form() {
-		return new Form(this.form);
-	}
-
-	public class Form {
-		@FindBy(name = "attributeName")
-		WebElement attributeName;
-
-		@FindBy(name = "attributeValue")
-		WebElement attributeValue;
-
-		@FindBy(css = "input[type=\"submit\"]")
-		WebElement submit;
-
-		public Form(SearchContext context) {
-			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
-		}
-
-		public Form attributeName(String text) {
-			this.attributeName.sendKeys(text);
-			return this;
-		}
-
-		public Form attributeValue(String text) {
-			this.attributeValue.sendKeys(text);
-			return this;
-		}
-
-		public <T> T submit(Class<T> page) {
-			this.submit.click();
-			return PageFactory.initElements(HomePage.this.driver, page);
-		}
-	}
-
-	public static class Attribute {
-		@FindBy(xpath = ".//td[1]")
-		WebElement attributeName;
-
-		@FindBy(xpath = ".//td[2]")
-		WebElement attributeValue;
-
-		public Attribute(SearchContext context) {
-			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
-		}
-
-		/**
-		 * @return the attributeName
-		 */
-		public String getAttributeName() {
-			return this.attributeName.getText();
-		}
-
-		/**
-		 * @return the attributeValue
-		 */
-		public String getAttributeValue() {
-			return this.attributeValue.getText();
-		}
-	}
-
-}

samples/boot/gemfire/src/main/java/sample/client/Application.java

@@ -1,338 +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
- *
- *      https://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.client;
-
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.servlet.http.HttpSession;
-
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.client.internal.PoolImpl;
-import com.gemstone.gemfire.management.membership.ClientMembership;
-import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
-import com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapter;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
-import org.springframework.data.gemfire.config.xml.GemfireConstants;
-import org.springframework.data.gemfire.support.ConnectionEndpoint;
-import org.springframework.data.gemfire.util.CollectionUtils;
-import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
-import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-/**
- * A Spring Boot, GemFire cache client, web application that reveals the current state of the HTTP Session.
- *
- * @author John Blum
- * @see javax.servlet.http.HttpSession
- * @see org.springframework.boot.SpringApplication
- * @see org.springframework.boot.autoconfigure.SpringBootApplication
- * @see org.springframework.context.annotation.Bean
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
- * @see org.springframework.stereotype.Controller
- * @see com.gemstone.gemfire.cache.client.ClientCache
- * @see com.gemstone.gemfire.cache.client.Pool
- * @since 1.2.1
- */
-// tag::class[]
-@SpringBootApplication
-@EnableGemFireHttpSession(poolName = "DEFAULT")// <1>
-@Controller
-public class Application {
-
-	static final long DEFAULT_TIMEOUT = TimeUnit.SECONDS.toMillis(60);
-
-	static final CountDownLatch LATCH = new CountDownLatch(1);
-
-	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
-	static final String GEMFIRE_DEFAULT_POOL_NAME = "DEFAULT";
-	static final String INDEX_TEMPLATE_VIEW_NAME = "index";
-	static final String PING_RESPONSE = "PONG";
-	static final String REQUEST_COUNT_ATTRIBUTE_NAME = "requestCount";
-
-	public static void main(String[] args) {
-		SpringApplication.run(Application.class, args);
-	}
-
-	@Bean
-	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
-		return new PropertySourcesPlaceholderConfigurer();
-	}
-
-	Properties gemfireProperties() { // <2>
-		Properties gemfireProperties = new Properties();
-
-		gemfireProperties.setProperty("name", applicationName());
-		//gemfireProperties.setProperty("log-file", "gemfire-client.log");
-		gemfireProperties.setProperty("log-level", logLevel());
-
-		return gemfireProperties;
-	}
-
-	String applicationName() {
-		return "spring-session-data-gemfire-boot-sample.".concat(getClass().getSimpleName());
-	}
-
-	String logLevel() {
-		return System.getProperty("spring-session-data-gemfire.log.level", DEFAULT_GEMFIRE_LOG_LEVEL);
-	}
-
-	@Bean
-	ClientCacheFactoryBean gemfireCache(
-			@Value("${spring-session-data-gemfire.cache.server.host:localhost}") String host,
-			@Value("${spring-session-data-gemfire.cache.server.port:12480}") int port) { // <3>
-
-		ClientCacheFactoryBean gemfireCache = new ClientCacheFactoryBean();
-
-		gemfireCache.setClose(true);
-		gemfireCache.setProperties(gemfireProperties());
-
-		// GemFire Pool settings <4>
-		gemfireCache.setKeepAlive(false);
-		gemfireCache.setPingInterval(TimeUnit.SECONDS.toMillis(5));
-		gemfireCache.setReadTimeout(intValue(TimeUnit.SECONDS.toMillis(15)));
-		gemfireCache.setRetryAttempts(1);
-		gemfireCache.setSubscriptionEnabled(true);
-		gemfireCache.setThreadLocalConnections(false);
-		gemfireCache.setServers(Collections.singletonList(newConnectionEndpoint(host, port)));
-
-		registerClientMembershipListener(); // <5>
-
-		return gemfireCache;
-	}
-
-	int intValue(Number number) {
-		return number.intValue();
-	}
-
-	ConnectionEndpoint newConnectionEndpoint(String host, int port) {
-		return new ConnectionEndpoint(host, port);
-	}
-
-	void registerClientMembershipListener() {
-		ClientMembership.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-			@Override
-			public void memberJoined(ClientMembershipEvent event) {
-				LATCH.countDown();
-			}
-		});
-	}
-
-	@Bean
-	BeanPostProcessor gemfireClientServerReadyBeanPostProcessor(
-			@Value("${spring-session-data-gemfire.cache.server.host:localhost}") final String host,
-			@Value("${spring-session-data-gemfire.cache.server.port:12480}") final int port) { // <5>
-
-		return new BeanPostProcessor() {
-
-			private final AtomicBoolean checkGemFireServerIsRunning = new AtomicBoolean(true);
-			private final AtomicReference<Pool> defaultPool = new AtomicReference<Pool>(null);
-
-			public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-				if (shouldCheckWhetherGemFireServerIsRunning(bean, beanName)) {
-					try {
-						validateCacheClientNotified();
-						validateCacheClientSubscriptionQueueConnectionEstablished();
-					}
-					catch (InterruptedException e) {
-						Thread.currentThread().interrupt();
-					}
-				}
-
-				return bean;
-			}
-
-			private boolean shouldCheckWhetherGemFireServerIsRunning(Object bean, String beanName) {
-				return (isGemFireRegion(bean, beanName)
-					? checkGemFireServerIsRunning.compareAndSet(true, false)
-					: whenGemFireCache(bean, beanName));
-			}
-
-			private boolean isGemFireRegion(Object bean, String beanName) {
-				return (GemFireHttpSessionConfiguration.DEFAULT_SPRING_SESSION_GEMFIRE_REGION_NAME.equals(beanName)
-					|| bean instanceof Region);
-			}
-
-			private boolean whenGemFireCache(Object bean, String beanName) {
-				if (bean instanceof ClientCache) {
-					defaultPool.compareAndSet(null, ((ClientCache) bean).getDefaultPool());
-				}
-
-				return false;
-			}
-
-			private void validateCacheClientNotified() throws InterruptedException {
-				boolean didNotTimeout = LATCH.await(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
-
-				Assert.state(didNotTimeout, String.format(
-					"GemFire Cache Server failed to start on host [%s] and port [%d]", host, port));
-			}
-
-			@SuppressWarnings("all")
-			private void validateCacheClientSubscriptionQueueConnectionEstablished() throws InterruptedException {
-				boolean cacheClientSubscriptionQueueConnectionEstablished = false;
-
-				Pool pool = defaultIfNull(this.defaultPool.get(), GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME,
-					GEMFIRE_DEFAULT_POOL_NAME);
-
-				if (pool instanceof PoolImpl) {
-					long timeout = (System.currentTimeMillis() + DEFAULT_TIMEOUT);
-
-					while (System.currentTimeMillis() < timeout
-						&& !((PoolImpl) pool).isPrimaryUpdaterAlive()) {
-
-						synchronized (pool) {
-							TimeUnit.MILLISECONDS.timedWait(pool, 500L);
-						}
-
-					}
-
-					cacheClientSubscriptionQueueConnectionEstablished |=
-						((PoolImpl) pool).isPrimaryUpdaterAlive();
-				}
-
-				Assert.state(cacheClientSubscriptionQueueConnectionEstablished, String.format(
-					"Cache client subscription queue connection not established; GemFire Pool was [%s];"
-						+ " GemFire Pool configuration was [locators = %s, servers = %s]",
-							pool, pool.getLocators(), pool.getServers()));
-			}
-
-			private Pool defaultIfNull(Pool pool, String... poolNames) {
-				for (String poolName : poolNames) {
-					pool = (pool != null ? pool : PoolManager.find(poolName));
-				}
-
-				return pool;
-			}
-
-			public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-				return bean;
-			}
-		};
-	}
-
-	@RequestMapping("/")
-	public String index() { // <6>
-		return INDEX_TEMPLATE_VIEW_NAME;
-	}
-
-	@RequestMapping(method = RequestMethod.GET, path = "/ping")
-	@ResponseBody
-	public String ping() { // <7>
-		return PING_RESPONSE;
-	}
-
-	@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) { // <8>
-
-		modelMap.addAttribute("sessionAttributes",
-			attributes(setAttribute(updateRequestCount(session), name, value)));
-
-		return INDEX_TEMPLATE_VIEW_NAME;
-	}
-	// end::class[]
-
-	/* (non-Javadoc) */
-	@SuppressWarnings("all")
-	HttpSession updateRequestCount(HttpSession session) {
-		synchronized (session) {
-			Integer currentRequestCount = (Integer) session.getAttribute(REQUEST_COUNT_ATTRIBUTE_NAME);
-			session.setAttribute(REQUEST_COUNT_ATTRIBUTE_NAME, nullSafeIncrement(currentRequestCount));
-			return session;
-		}
-	}
-
-	/* (non-Javadoc) */
-	Integer nullSafeIncrement(Integer value) {
-		return (nullSafeIntValue(value) + 1);
-	}
-
-	/* (non-Javadoc) */
-	int nullSafeIntValue(Number value) {
-		return (value != null ? value.intValue() : 0);
-	}
-
-	/* (non-Javadoc) */
-	HttpSession setAttribute(HttpSession session, String attributeName, String attributeValue) {
-		if (isSet(attributeName, attributeValue)) {
-			session.setAttribute(attributeName, attributeValue);
-		}
-
-		return session;
-	}
-
-	/* (non-Javadoc) */
-	boolean isSet(String... values) {
-		boolean set = true;
-
-		for (String value : values) {
-			set &= StringUtils.hasText(value);
-		}
-
-		return set;
-	}
-
-	/* (non-Javadoc) */
-	Map<String, String> attributes(HttpSession session) {
-		Map<String, String> sessionAttributes = new HashMap<String, String>();
-
-		for (String attributeName : toIterable(session.getAttributeNames())) {
-			sessionAttributes.put(attributeName,
-				String.valueOf(session.getAttribute(attributeName)));
-		}
-
-		return sessionAttributes;
-	}
-
-	/* (non-Javadoc) */
-	<T> Iterable<T> toIterable(final Enumeration<T> enumeration) {
-		return new Iterable<T>() {
-			public Iterator<T> iterator() {
-				return (enumeration == null ? Collections.<T>emptyIterator()
-					: CollectionUtils.toIterator(enumeration));
-			}
-		};
-	}
-}

samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java

@@ -1,111 +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
- *
- *      https://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.server;
-
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import com.gemstone.gemfire.cache.Cache;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
-import org.springframework.data.gemfire.CacheFactoryBean;
-import org.springframework.data.gemfire.server.CacheServerFactoryBean;
-import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
-
-/**
- * A Spring Boot application bootstrapping a GemFire Cache Server JVM process.
- *
- * @author John Blum
- * @see org.springframework.boot.SpringApplication
- * @see org.springframework.boot.autoconfigure.SpringBootApplication
- * @see org.springframework.context.annotation.Bean
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
- * @see com.gemstone.gemfire.cache.Cache
- * @since 1.2.1
- */
-// tag::class[]
-@SpringBootApplication
-@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 20) // <1>
-public class GemFireServer {
-
-	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
-
-	public static void main(String[] args) {
-		SpringApplication springApplication = new SpringApplication(GemFireServer.class);
-		springApplication.setWebEnvironment(false);
-		springApplication.run(args);
-	}
-
-	@Bean
-	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
-		return new PropertySourcesPlaceholderConfigurer();
-	}
-
-	Properties gemfireProperties() { // <2>
-		Properties gemfireProperties = new Properties();
-
-		gemfireProperties.setProperty("name", applicationName());
-		//gemfireProperties.setProperty("log-file", "gemfire-server.log");
-		gemfireProperties.setProperty("log-level", logLevel());
-		//gemfireProperties.setProperty("jmx-manager", "true");
-		//gemfireProperties.setProperty("jmx-manager-start", "true");
-
-		return gemfireProperties;
-	}
-
-	String applicationName() {
-		return "spring-session-data-gemfire-boot-sample:".concat(getClass().getSimpleName());
-	}
-
-	String logLevel() {
-		return System.getProperty("spring-session-data-gemfire.log.level", DEFAULT_GEMFIRE_LOG_LEVEL);
-	}
-
-	@Bean
-	CacheFactoryBean gemfireCache() { // <3>
-		CacheFactoryBean gemfireCache = new CacheFactoryBean();
-
-		gemfireCache.setClose(true);
-		gemfireCache.setProperties(gemfireProperties());
-
-		return gemfireCache;
-	}
-
-	@Bean
-	CacheServerFactoryBean gemfireCacheServer(Cache gemfireCache,
-			@Value("${spring-session-data-gemfire.cache.server.bind-address:localhost}") String bindAddress,
-			@Value("${spring-session-data-gemfire.cache.server.hostname-for-clients:localhost}") String hostnameForClients,
-			@Value("${spring-session-data-gemfire.cache.server.port:12480}") int port) { // <4>
-
-		CacheServerFactoryBean gemfireCacheServer = new CacheServerFactoryBean();
-
-		gemfireCacheServer.setAutoStartup(true);
-		gemfireCacheServer.setBindAddress(bindAddress);
-		gemfireCacheServer.setCache(gemfireCache);
-		gemfireCacheServer.setHostNameForClients(hostnameForClients);
-		gemfireCacheServer.setMaxTimeBetweenPings(
-			Long.valueOf(TimeUnit.SECONDS.toMillis(60)).intValue());
-		gemfireCacheServer.setPort(port);
-
-		return gemfireCacheServer;
-	}
-}
-// end::class[]

samples/boot/gemfire/src/main/java/sample/server/NativeGemFireServer.java

@@ -1,186 +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
- *
- *      https://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.server;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Properties;
-
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.ExpirationAction;
-import com.gemstone.gemfire.cache.ExpirationAttributes;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.server.CacheServer;
-
-import org.springframework.session.data.gemfire.AbstractGemFireOperationsSessionRepository;
-import org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration;
-import org.springframework.util.StringUtils;
-
-/**
- * The {@link NativeGemFireServer} class uses the GemFire API to create a GemFire (cache) instance.
- *
- * @author John Blum
- * @see com.gemstone.gemfire.cache.Cache
- * @see com.gemstone.gemfire.cache.Region
- * @see com.gemstone.gemfire.cache.server.CacheServer
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration
- * @since 1.3.0
- */
-@SuppressWarnings("unused")
-public final class NativeGemFireServer implements Runnable {
-
-	private static final int GEMFIRE_CACHE_SERVER_PORT =
-		Integer.getInteger("spring-session-data-gemfire.cache.server.port", 12480);
-
-	private static final String GEMFIRE_CACHE_SERVER_HOST = "localhost";
-	private static final String GEMFIRE_CACHE_SERVER_HOSTNAME_FOR_CLIENTS = GEMFIRE_CACHE_SERVER_HOST;
-	private static final String GEMFIRE_LOG_FILENAME_PATTERN =
-		String.format("%s", NativeGemFireServer.class.getSimpleName()).concat("-%s.log");
-
-	public static void main(String[] args) {
-		newNativeGemFireServer(args).run();
-	}
-
-	private final String[] args;
-
-	private static File newGemFireLogFile(String suffix) {
-		return new File(String.format(GEMFIRE_LOG_FILENAME_PATTERN, suffix));
-	}
-
-	private static NativeGemFireServer newNativeGemFireServer(String[] args) {
-		return new NativeGemFireServer(args);
-	}
-
-	private static String[] nullSafeStringArray(String[] array) {
-		return (array != null ? array.clone() : new String[0]);
-	}
-
-	private static void writeStringTo(File file, String fileContents) {
-		PrintWriter fileWriter = null;
-
-		try {
-			fileWriter = new PrintWriter(new BufferedWriter(new FileWriter(file, true)), true);
-			fileWriter.println(fileContents);
-			fileWriter.flush();
-		}
-		catch (IOException e) {
-			throw new RuntimeException(String.format("Failed to write [%s] to file [%s]", fileContents, file), e);
-		}
-		finally {
-			if (fileWriter != null) {
-				fileWriter.close();
-			}
-		}
-	}
-	private NativeGemFireServer(String[] args) {
-		this.args = nullSafeStringArray(args);
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public void run() {
-		run(this.args);
-	}
-
-	private void run(String[] args) {
-		try {
-			writeStringTo(newGemFireLogFile("stdout"), "Before");
-
-			registerShutdownHook(addCacheServer(createRegion(gemfireCache(
-				gemfireProperties(applicationName())))));
-
-			writeStringTo(newGemFireLogFile("stdout"), "After");
-		}
-		catch (Throwable e) {
-			writeStringTo(newGemFireLogFile("stderr"), e.toString());
-		}
-	}
-
-	private String applicationName() {
-		return applicationName(null);
-	}
-
-	private String applicationName(String applicationName) {
-		return StringUtils.hasText(applicationName) ? applicationName
-			: "spring-session-data-gemfire.boot.sample." + NativeGemFireServer.class.getSimpleName();
-	}
-
-	private Properties gemfireProperties(String applicationName) {
-		Properties gemfireProperties = new Properties();
-
-		gemfireProperties.setProperty("name", applicationName);
-		gemfireProperties.setProperty("log-file", "gemfire-server.log");
-		gemfireProperties.setProperty("log-level", "config");
-		//gemfireProperties.setProperty("jmx-manager", "true");
-		//gemfireProperties.setProperty("jmx-manager-start", "true");
-
-		return gemfireProperties;
-	}
-
-	private Cache gemfireCache(Properties gemfireProperties) {
-		return new CacheFactory(gemfireProperties).create();
-	}
-
-	private Cache createRegion(Cache gemfireCache) {
-		RegionFactory<Object, AbstractGemFireOperationsSessionRepository.GemFireSession> regionFactory =
-			gemfireCache.createRegionFactory(RegionShortcut.PARTITION);
-
-		regionFactory.setKeyConstraint(Object.class);
-		regionFactory.setValueConstraint(AbstractGemFireOperationsSessionRepository.GemFireSession.class);
-		regionFactory.setStatisticsEnabled(true);
-		regionFactory.setEntryIdleTimeout(newExpirationAttributes(1800, ExpirationAction.INVALIDATE));
-
-		Region region = regionFactory.create(
-			GemFireHttpSessionConfiguration.DEFAULT_SPRING_SESSION_GEMFIRE_REGION_NAME);
-
-		return gemfireCache;
-	}
-
-	private ExpirationAttributes newExpirationAttributes(int expirationTime, ExpirationAction expirationAction) {
-		return new ExpirationAttributes(expirationTime, expirationAction);
-	}
-
-	private Cache addCacheServer(Cache gemfireCache) throws IOException {
-		CacheServer cacheServer = gemfireCache.addCacheServer();
-
-		cacheServer.setBindAddress(GEMFIRE_CACHE_SERVER_HOST);
-		cacheServer.setHostnameForClients(GEMFIRE_CACHE_SERVER_HOSTNAME_FOR_CLIENTS);
-		cacheServer.setPort(GEMFIRE_CACHE_SERVER_PORT);
-		cacheServer.start();
-
-		return gemfireCache;
-	}
-
-	private Cache registerShutdownHook(final Cache gemfireCache) {
-		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-			public void run() {
-				if (gemfireCache != null) {
-					gemfireCache.close();
-				}
-			}
-		}));
-
-		return gemfireCache;
-	}
-}

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

@@ -1,49 +0,0 @@
-<!DOCTYPE html SYSTEM "https://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="https://www.thymeleaf.org">
-<head>
-	<title>Session Attributes</title>
-	<link rel="stylesheet" th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css"/>
-	<style type="text/css">
-		body {
-			padding: 1em;
-		}
-	</style>
-</head>
-<body>
-	<div class="container">
-		<h1>Description</h1>
-		<p>
-			This application demonstrates how to use a GemFire instance to back your session. Notice that there
-			is no JSESSIONID cookie. We are also able to customize the way of identifying what the requested
-			session id is.
-		</p>
-
-		<h1>Try it</h1>
-
-		<form class="form-inline" role="form" action="./session" method="post">
-			<label for="attributeName">Attribute Name</label>
-			<input id="attributeName" type="text" name="attributeName"/>
-			<label for="attributeValue">Attribute Value</label>
-			<input id="attributeValue" type="text" name="attributeValue"/>
-			<input type="submit" value="Set Attribute"/>
-		</form>
-
-		<hr/>
-
-		<table class="table table-striped">
-			<thead>
-			<tr>
-				<th>Attribute Name</th>
-				<th>Attribute Value</th>
-			</tr>
-			</thead>
-			<tbody>
-				<tr th:each="attribute: ${sessionAttributes}">
-					<td th:text="${attribute.key}">name</td>
-					<td th:text="${attribute.value}">value</td>
-				</tr>
-			</tbody>
-		</table>
-	</div>
-</body>
-</html>

samples/boot/gradle/dependency-management.gradle

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

samples/boot/jdbc/build.gradle

@@ -1,57 +0,0 @@
-buildscript {
-	repositories {
-		mavenCentral()
-		maven { url "https://repo.spring.io/milestone" }
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-	}
-}
-
-apply plugin: 'org.springframework.boot'
-
-apply from: JAVA_GRADLE
-apply from: SAMPLE_GRADLE
-
-group = 'samples'
-
-dependencies {
-	compile project(':spring-session-jdbc'),
-			"org.springframework.boot:spring-boot-starter-jdbc",
-			"org.springframework.boot:spring-boot-starter-web",
-			"org.springframework.boot:spring-boot-starter-security",
-			"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",
-			"com.h2database:h2"
-
-	testCompile "org.springframework.boot:spring-boot-starter-test",
-			"org.assertj:assertj-core:$assertjVersion"
-
-	integrationTestCompile seleniumDependencies
-
-}
-
-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/jdbc/spring-session-sample-boot-jdbc.gradle

@@ -0,0 +1,18 @@
+apply plugin: 'io.spring.convention.spring-sample-boot'
+
+dependencies {
+	compile project(':spring-session-jdbc')
+	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"
+	compile "com.h2database:h2"
+
+	testCompile "org.springframework.boot:spring-boot-starter-test"
+	testCompile "org.assertj:assertj-core"
+
+	integrationTestCompile seleniumDependencies
+}