URL Cleanup (#1385)

This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener).

# Fixed URLs

## Fixed But Review Recommended
These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended.

* [ ] http://www.puppycrawl.com/dtds/configuration_1_3.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/configuration_1_3.dtd ([https](https://www.puppycrawl.com/dtds/configuration_1_3.dtd) result 404).
* [ ] http://www.puppycrawl.com/dtds/suppressions_1_1.dtd (404) with 1 occurrences migrated to:
  https://www.puppycrawl.com/dtds/suppressions_1_1.dtd ([https](https://www.puppycrawl.com/dtds/suppressions_1_1.dtd) result 404).

## Fixed Success
These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended.

* [ ] http://www.springframework.org/schema/beans/spring-beans.xsd with 13 occurrences migrated to:
  https://www.springframework.org/schema/beans/spring-beans.xsd ([https](https://www.springframework.org/schema/beans/spring-beans.xsd) result 200).
* [ ] http://www.springframework.org/schema/context/spring-context.xsd with 10 occurrences migrated to:
  https://www.springframework.org/schema/context/spring-context.xsd ([https](https://www.springframework.org/schema/context/spring-context.xsd) result 200).
* [ ] http://www.springframework.org/schema/gemfire/spring-gemfire.xsd with 4 occurrences migrated to:
  https://www.springframework.org/schema/gemfire/spring-gemfire.xsd ([https](https://www.springframework.org/schema/gemfire/spring-gemfire.xsd) result 200).
* [ ] http://www.springframework.org/schema/jdbc/spring-jdbc.xsd with 1 occurrences migrated to:
  https://www.springframework.org/schema/jdbc/spring-jdbc.xsd ([https](https://www.springframework.org/schema/jdbc/spring-jdbc.xsd) result 200).
* [ ] http://www.springframework.org/schema/security/spring-security.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/security/spring-security.xsd ([https](https://www.springframework.org/schema/security/spring-security.xsd) result 200).
* [ ] http://www.springframework.org/schema/util/spring-util-4.1.xsd with 2 occurrences migrated to:
  https://www.springframework.org/schema/util/spring-util-4.1.xsd ([https](https://www.springframework.org/schema/util/spring-util-4.1.xsd) result 200).
* [ ] http://www.springframework.org/schema/util/spring-util.xsd with 4 occurrences migrated to:
  https://www.springframework.org/schema/util/spring-util.xsd ([https](https://www.springframework.org/schema/util/spring-util.xsd) result 200).
* [ ] http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd with 4 occurrences migrated to:
  https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd ([https](https://java.sun.com/xml/ns/javaee/web-app_3_0.xsd) result 302).

# Ignored
These URLs were intentionally ignored.

* http://java.sun.com/xml/ns/javaee with 8 occurrences
* http://www.hazelcast.com/schema/config with 4 occurrences
* http://www.springframework.org/schema/beans with 26 occurrences
* http://www.springframework.org/schema/context with 20 occurrences
* http://www.springframework.org/schema/gemfire with 8 occurrences
* http://www.springframework.org/schema/jdbc with 2 occurrences
* http://www.springframework.org/schema/p with 8 occurrences
* http://www.springframework.org/schema/security with 4 occurrences
* http://www.springframework.org/schema/util with 12 occurrences
* http://www.w3.org/2001/XMLSchema-instance with 19 occurrences

.gitignore

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

build.gradle

@@ -1,11 +1,13 @@
 buildscript {
 	repositories {
 		maven { url "https://repo.spring.io/plugins-release" }
+		maven { url "https://repo.spring.io/milestone" }
 	}
 	dependencies {
-		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
+		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.4.RELEASE")
+		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'
@@ -13,16 +15,16 @@ buildscript {
 }
 
 plugins {
-	id "org.sonarqube" version "1.2"
+	id "org.sonarqube" version "2.1"
 }
 
 group = 'org.springframework.session'
 
-ext.springBootVersion = '1.3.2.RELEASE'
+ext.springBootVersion = '1.5.4.RELEASE'
 ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
 ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
-ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"
 ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
+ext.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"
@@ -49,12 +51,14 @@ sonarqube {
 	}
 }
 
-task configDocsZip(dependsOn: [':docs:asciidoctor',':spring-session:javadoc']) << {
-	project.tasks.docsZip.from(project(':docs').asciidoctor) {
-		into('reference')
-	}
-	project.tasks.docsZip.from(project(':spring-session').javadoc) {
-		into('api')
+task 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')
+		}
 	}
 }
 
@@ -69,4 +73,4 @@ task docsZip(type: Zip, dependsOn: 'configDocsZip') {
 
 artifacts {
 	archives docsZip
-}
+}

config/checkstyle/checkstyle.xml

@@ -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.hateoas.mvc.ControllerLinkBuilder.linkTo"/>
+					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"/>
 		</module>
 		<module name="IllegalImport"/>
 		<module name="RedundantImport"/>

docs/build.gradle

@@ -32,23 +32,25 @@ dependencies {
 				"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:4.11',
-				'org.mockito:mockito-core:1.9.5',
+				"junit:junit:$junitVersion",
+				"org.mockito:mockito-core:$mockitoVersion",
 				"org.springframework:spring-test:$springVersion",
 				"org.assertj:assertj-core:$assertjVersion",
 				"com.hazelcast:hazelcast:$hazelcastVersion",
-				"redis.clients:jedis:2.4.1",
+				"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/"
+	def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag"
 	attributes	'version-snapshot': snapshotBuild,
 			'version-milestone': milestoneBuild,
 			'version-release': releaseBuild,
@@ -57,6 +59,7 @@ asciidoctor {
 			'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/',
@@ -73,3 +76,5 @@ asciidoctor {
 			'docinfo1':'true',
 			'revnumber' : project.version
 }
+
+eclipse.project.name = 'spring-session-docs'

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

@@ -6,8 +6,6 @@ This guide describes how to use Spring Session to find sessions by username.
 
 NOTE: The completed guide can be found in the <<findbyusername-sample, findbyusername application>>.
 
-NOTE: This feature will likely be refactored in the next release to account for https://github.com/spring-projects/spring-session/issues/301[#301]
-
 
 [[findbyusername-assumptions]]
 == Assumptions
@@ -33,10 +31,10 @@ Consider the following scenario:
 Wouldn't it be nice if we could allow the user to invalidate the session at the library from any device they authenticate with?
 This sample demonstrates how this is possible.
 
-[[findbyprincipalnamesessionrepository]]
+[[findbyindexnamesessionrepository]]
 == FindByIndexNameSessionRepository
 
-In order to look up a user by their username, you must first choose a `SessionRepository` that implements <<index.doc#api-findbyprincipalnamesessionrepository,FindByIndexNameSessionRepository>>.
+In order to look up a user by their username, you must first choose a `SessionRepository` that implements link:../#api-findbyindexnamesessionrepository[FindByIndexNameSessionRepository].
 Our sample application assumes that the Redis support is already setup, so we are ready to go.
 
 == Mapping the username
@@ -67,7 +65,7 @@ For example, our sample application includes the location and access type of the
 
 [source,java,indent=0]
 ----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
 ----
 
 We then inject that information into the session on each HTTP request using a `SessionDetailsFilter`.
@@ -75,7 +73,7 @@ For example:
 
 [source,java,indent=0]
 ----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
 ----
 
 We obtain the information we want and then set the `SessionDetails` as an attribute in the `Session`.
@@ -95,7 +93,7 @@ We can now find all the sessions for a specific user.
 
 [source,java,indent=0]
 ----
-include::{samples-dir}findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
 ----
 
 In our instance, we find all sessions for the currently logged in user.

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

@@ -86,19 +86,20 @@ We start with the _Spring Boot_ application for configuring and bootstrapping a
 
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java[tags=class]
+include::{samples-dir}boot/gemfire/src/main/java/sample/server/GemFireServer.java[tags=class]
 ----
 
-<1> The `@EnableGemFireHttpSession` annotation is used on the GemFire Server mainly to define the corresponding
+<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` allowing us to configure certain aspects of the GemFire Server using
+<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 setup a Cache Server instance running in the GemFire Server to listen for connections from cache clients.
-The Cache Server `Socket` will be used to connect our GemFire client cache, _Spring Boot_ web application to the server.
+<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
@@ -106,38 +107,39 @@ configuration to affect GemFire and application configuration/behavior from the
 
 === Spring Boot-based GemFire cache client Web application
 
-Now, we create the _Spring Boot_ web application (a GemFire cache client), exposing our Web service
-using Spring MVC along with _Spring Session_ backed by GemFire, connected to our _Spring Boot_-based GemFire Server,
-in order to manage Session state in a cluster/replicated-enabled fashion.
+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}httpsession-gemfire-boot/src/main/java/sample/client/Application.java[tags=class]
+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 also to override the (HTTP) Web application container's `HttpSession` and replace it with a Session implementation
-backed by _Spring Session_ in conjunction with GemFire.  Also notice, we did not define any Session expiration timeout
-with the `maxInactiveIntervalInSeconds` attribute this time.  That is because the Session expiration is managed
-by GemFire, which will appropriately notify the cache client when the Session times out.  Again, we have just resorted
-to using the default Region, `ClusteredSpringSessions`.  Of course, we can change the Region name, but we must do so
-on both the client and the server.  That is a GemFire requirement, not a _Spring Session Data GemFire_ requirement.
-<2> Similary to the server configuration, we set a few basic GemFire System `Properties` on the client.
-<3> Although, this time, an instance of `ClientCache` is created with the `ClientCacheFactoryBean` from _Spring Data GemFire_.
-<4> However, in order to connect to the GemFire Server we must define a GemFire `Pool` bean containing pre-populated
-connections to the server.  Whenever a client Region entry operation corresponding to a Session update occurs,
+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 is not required by any production code.  Specifically, the `BeanPostProcessor` along with the code referenced in *6*
+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> See <5> above.
-<7> Navigates the Web application to the home page (`index.html`), which uses **Thymeleaf** templates for server-side
+<6> Navigates the Web application to the home page (`index.html`), which uses **Thymeleaf** templates for server-side
 pages.
-<8> Heartbeat web service endpoint (useful for manual testing purposes).
-<9> Web service endpoint for adding a Session attributes defined by the user using the Web application UI.  In addition,
+<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".
 
@@ -159,11 +161,13 @@ and GemFire out-of-the-box using the following attributes:
 * `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
+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
@@ -228,6 +232,9 @@ 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:
 

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

@@ -74,7 +74,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc-boot/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+include::{samples-dir}boot/jdbc/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableJdbcHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.

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

@@ -75,7 +75,7 @@ All you have to do is to add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}mongo/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+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.

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

@@ -72,7 +72,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}boot/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+include::{samples-dir}boot/redis/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.

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

@@ -38,7 +38,7 @@ For example:
 .src/main/java/samples/config/WebSocketConfig.java
 [source,java]
 ----
-include::{samples-dir}websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
+include::{samples-dir}boot/websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
 ----
 
 To hook in the Spring Session support we only need to change two things:
@@ -78,14 +78,14 @@ For the purposes of testing session expiration, you may want to change the sessi
 .src/main/java/samples/config/WebSecurityConfig.java
 [source,java]
 ----
-include::{samples-dir}websocket/src/main/java/sample/config/WebSecurityConfig.java[tags=enable-redis-httpsession]
+include::{samples-dir}boot/websocket/src/main/java/sample/config/WebSecurityConfig.java[tags=enable-redis-httpsession]
 ----
 ====
 
 [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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

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

@@ -17,7 +17,7 @@ You can find an example of customizing Spring Session's cookie below:
 
 [source,java]
 ----
-include::{samples-dir}custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
+include::{samples-dir}javaconfig/custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
 ----
 
 <1> We customize the name of the cookie to be JSESSIONID
@@ -79,7 +79,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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -98,4 +98,4 @@ Try using the application. Fill out the form with the following information:
 Now click the **Set Attribute** button.
 You should now see the values displayed in the table.
 
-If you look at the cookies for the application, you can see the cookie is saved to the custom name of JSESSIONID
+If you look at the cookies for the application, you can see the cookie is saved to the custom name of JSESSIONID

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

@@ -80,37 +80,30 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java[tags=class]
+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.
-In this instance, Spring Session is backed by GemFire.
+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> Then, we configure a `Pool` of client connections to talk to the GemFire Server in our Client/Server topology. In our
+<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].
-<4> After configuring a `Pool`, we create an instance of the GemFire client cache using the GemFire `Properties`
-and `Pool` to communicate with the server and perform cache data access operations.
 <5> Finally, we include a Spring `BeanPostProcessor` to block the client until our GemFire Server is up and running,
 listening for and accepting client connections.
 
 The `gemfireCacheServerReadyBeanPostProcessor` is necessary in order to coordinate the client and server in
 an automated fashion during testing, but unnecessary in situations where the GemFire cluster is already presently
-running, such as in production. This `BeanPostProcessor` implements 2 approaches to ensure our server has adequate
-time to startup.
+running, such as in production.
 
-The first approach uses a timed wait, checking at periodic intervals to determine whether a client `Socket` connection
-can be made to the server's `CacheServer` endpoint.
-
-The second approach uses a GemFire https://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/management/membership/ClientMembershipListener.html[ClientMembershipListener]
+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. Either one of these approaches are sufficient
-by themselves, but both are demonstrated here to illustrate how this might work and to give you ideas, or other options
-in practice.
+`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
@@ -122,11 +115,16 @@ NOTE: For more information on configuring _Spring Data GemFire_, refer to the ht
 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 https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policies]
+* `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`).
+(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
@@ -134,30 +132,30 @@ store Spring Sessions is `LOCAL`, however, keep in mind that your session state
 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.
+NOTE: `serverRegionShort` is ignored in a client/server cache configuration and only applies when
+a peer-to-peer (P2P) topology, and more specifically, a GemFire peer cache is used.
 
 === Server Configuration
 
-Now, we have only covered one side of the equation.  We also need a GemFire Server for our client to talk to and pass
-session state up to the server to manage.
+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}httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java[tags=class]
+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. For one, this
-ensures that the Region names on both the client and server match (in this sample, we use the default "_ClusteredSpringSessions_").
+<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.
+<2> Next, we configure the GemFire Server using GemFire System Properties very much like our P2P samples.
 With the `mcast-port` set to 0 and no `locators` property specified, our server will be standalone. We also allow a
 JMX client (e.g. _Gfsh_) to connect to our server with the use of the GemFire-specific JMX System properties.
-<3> Then, we create an instance of the GemFire peer cache using our GemFire System properties.
-<4> We also setup a GemFire `CacheServer` instance running on **localhost**, listening on port **12480**,
-to accept our client connection.
+<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.
 
@@ -176,7 +174,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/Initializer.java[tags=class]
+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`.
@@ -226,7 +224,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
+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.

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

@@ -80,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-p2p/src/main/java/sample/Config.java[tags=class]
+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
@@ -125,7 +125,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-p2p/src/main/java/sample/Initializer.java[tags=class]
+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`.
@@ -166,7 +166,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-p2p/src/main/java/sample/SessionServlet.java[tags=class]
+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.

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

@@ -64,6 +64,8 @@ Ensure you have the following in your pom.xml:
 ----
 endif::[]
 
+// tag::config[]
+
 [[security-spring-configuration]]
 == Spring Configuration
 
@@ -79,7 +81,9 @@ include::{docs-test-dir}docs/http/HazelcastHttpSessionConfig.java[tags=config]
 <1> The `@EnableHazelcastHttpSession` 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 Hazelcast.
-<2> We create a `HazelcastInstance` that connects Spring Session to Hazelcast.
+<2> In order to support retrieval of sessions by principal name index, appropriate `ValueExtractor` needs to be registered.
+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].
 
@@ -88,13 +92,13 @@ For more information on configuring Hazelcast, refer to the https://docs.hazelca
 Our <<security-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.
-Since our application is already loading Spring configuration using our `SecurityInitializer` class, we can simply add our Config class to it.
+In order for our `Filter` to do its magic, Spring needs to load our `SessionConfig` class.
+Since our application is already loading Spring configuration using our `SecurityInitializer` class, we can simply add our `SessionConfig` class to it.
 
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}hazelcast-spring/src/main/java/sample/SecurityInitializer.java[tags=class]
+include::{samples-dir}javaconfig/hazelcast/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -106,14 +110,14 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}hazelcast-spring/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/hazelcast/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
 
 By extending `AbstractHttpSessionApplicationInitializer` we ensure that the Spring Bean by the name `springSessionRepositoryFilter` is registered with our Servlet Container for every request before Spring Security's `springSecurityFilterChain`.
 
-
+// end::config[]
 
 [[hazelcast-spring-security-sample]]
 == Hazelcast Spring Security Sample Application
@@ -188,4 +192,4 @@ For example, you could delete an individual key as follows (replacing `7e8383a4-
 
 TIP: The port number of the Hazelcast node will be printed to the console on startup. Replace `xxxxx` above with the port number.
 
-Now observe that you are no longer authenticated with this session.
+Now observe that you are no longer authenticated with this session.

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

@@ -75,7 +75,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/jdbc/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableJdbcHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -100,7 +100,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/jdbc/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -140,7 +140,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}javaconfig/jdbc/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in H2 database.

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

@@ -23,6 +23,11 @@ If you are using Maven, ensure to add the following dependencies:
 		<version>{spring-session-version}</version>
 		<type>pom</type>
 	</dependency>
+	<dependency>
+		<groupId>biz.paluch.redis</groupId>
+		<artifactId>lettuce</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
@@ -75,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/redis/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -98,7 +103,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/redis/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -121,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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -146,7 +151,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}javaconfig/redis/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
@@ -163,4 +168,4 @@ Alternatively, you can also delete the explicit key. Enter the following into yo
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.
+Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

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

@@ -23,6 +23,11 @@ If you are using Maven, ensure to add the following dependencies:
 		<version>{spring-session-version}</version>
 		<type>pom</type>
 	</dependency>
+	<dependency>
+		<groupId>biz.paluch.redis</groupId>
+		<artifactId>lettuce</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
@@ -75,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements `Filter`.
@@ -96,7 +101,7 @@ In order for our `Filter` to do its magic, Spring needs to load our `Config` cla
 .src/main/java/sample/mvc/MvcInitializer.java
 [source,java,indent=0]
 ----
-include::{samples-dir}rest/src/main/java/sample/mvc/MvcInitializer.java[tags=config]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/mvc/MvcInitializer.java[tags=config]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -105,7 +110,7 @@ Fortunately, Spring Session provides a utility class named `AbstractHttpSessionA
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}rest/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -122,7 +127,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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -149,7 +154,7 @@ In the output you will notice the following:
 ----
 HTTP/1.1 200 OK
 ...
-x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3
+X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3
 
 {"username":"user"}
 ----
@@ -157,25 +162,25 @@ x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3
 Specifically, we notice the following things about our response:
 
 * The HTTP Status is now a 200
-* We have a header with the name of *x-auth-token* which contains a new session id
+* We have a header with the name of *X-Auth-Token* which contains a new session id
 * The current username is displayed
 
-We can now use the *x-auth-token* to make another request without providing the username and password again. For example, the following outputs the username just as before:
+We can now use the *X-Auth-Token* to make another request without providing the username and password again. For example, the following outputs the username just as before:
 
-	$ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/ -H "X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
 
 The only difference is that the session id is not provided in the response headers because we are reusing an existing session.
 
-If we invalidate the session, then the x-auth-token is displayed in the response with an empty value. For example, the following will invalidate our session:
+If we invalidate the session, then the X-Auth-Token is displayed in the response with an empty value. For example, the following will invalidate our session:
 
-	$ curl -v http://localhost:8080/logout -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/logout -H "X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
 
-You will see in the output that the x-auth-token provides an empty String indicating that the previous session was invalidated.
+You will see in the output that the X-Auth-Token provides an empty String indicating that the previous session was invalidated.
 
 ----
 HTTP/1.1 204 No Content
 ...
-x-auth-token:
+X-Auth-Token:
 ----
 
 === How does it work?
@@ -183,7 +188,7 @@ x-auth-token:
 Spring Security interacts with the standard `HttpSession` in `SecurityContextPersistenceFilter`.
 
 Instead of using Tomcat's `HttpSession`, Spring Security is now persisting the values in Redis.
-Spring Session creates a header named x-auth-token in your browser that contains the id of your session.
+Spring Session creates a header named X-Auth-Token in your browser that contains the id of your session.
 
 If you like, you can easily see that the session is created in Redis. First create a session using the following:
 
@@ -194,7 +199,7 @@ In the output you will notice the following:
 ----
 HTTP/1.1 200 OK
 ...
-x-auth-token: 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+X-Auth-Token: 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 {"username":"user"}
 ----
@@ -209,6 +214,6 @@ Alternatively, you can also delete the explicit key. Enter the following into yo
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-We can now use the *x-auth-token* to make another request with the session we deleted and observe we are prompted for a authentication. For example, the following returns an HTTP 401:
+We can now use the *X-Auth-Token* to make another request with the session we deleted and observe we are prompted for a authentication. For example, the following returns an HTTP 401:
 
-	$ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/ -H "X-Auth-Token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"

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

@@ -19,15 +19,20 @@ If you are using Maven, ensure to add the following dependencies:
 	<!-- ... -->
 
 	<dependency>
-	<groupId>org.springframework.session</groupId>
-	<artifactId>spring-session-data-redis</artifactId>
-	<version>{spring-session-version}</version>
-	<type>pom</type>
+		<groupId>org.springframework.session</groupId>
+		<artifactId>spring-session-data-redis</artifactId>
+		<version>{spring-session-version}</version>
+		<type>pom</type>
 	</dependency>
 	<dependency>
-	<groupId>org.springframework</groupId>
-	<artifactId>spring-web</artifactId>
-	<version>{spring-version}</version>
+		<groupId>biz.paluch.redis</groupId>
+		<artifactId>lettuce</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>{spring-version}</version>
 	</dependency>
 </dependencies>
 ----
@@ -74,7 +79,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -95,7 +100,7 @@ Since our application is already loading Spring configuration using our `Securit
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/SecurityInitializer.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -107,7 +112,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -126,7 +131,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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -165,4 +170,4 @@ Alternatively, you can also delete the explicit key. Enter the following into yo
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.
+Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

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

@@ -20,7 +20,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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -99,7 +99,7 @@ We can obtain the `HttpSessionManager` from the `HttpServletRequest` using the f
 .src/main/java/sample/UserAccountsFilter.java
 [source,java,indent=0]
 ----
-include::{samples-dir}users/src/main/java/sample/UserAccountsFilter.java[tags=HttpSessionManager]
+include::{samples-dir}javaconfig/users/src/main/java/sample/UserAccountsFilter.java[tags=HttpSessionManager]
 ----
 
 We can now use it to create a URL to add another session.
@@ -107,7 +107,7 @@ We can now use it to create a URL to add another session.
 .src/main/java/sample/UserAccountsFilter.java
 [source,java,indent=0]
 ----
-include::{samples-dir}users/src/main/java/sample/UserAccountsFilter.java[tags=addAccountUrl]
+include::{samples-dir}javaconfig/users/src/main/java/sample/UserAccountsFilter.java[tags=addAccountUrl]
 ----
 
 <1> We have an existing variable named `unauthenticatedAlias`.
@@ -148,7 +148,7 @@ For example, if we are currently using the session with the alias of *1*, then t
 .src/main/webapp/index.jsp
 [source,xml,indent=0]
 ----
-include::{samples-dir}users/src/main/webapp/index.jsp[tags=link]
+include::{samples-dir}javaconfig/users/src/main/webapp/index.jsp[tags=link]
 ----
 
 will output a link of:

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

@@ -80,26 +80,26 @@ Add the following Spring Configuration:
 
 [source,xml]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
+include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
 ----
 
-<1> First, a `Properties` bean is created to reference GemFire configuration common to both the client and server,
-stored in the `META-INF/spring/application.properties` file.
-<2> The `application.properties` are used along with the `PropertySourcesPlaceholderConfigurer` bean to replace
-placeholders in the Spring XML configuration meta-data with property values.
-<3> Spring annotation configuration support is enabled with `<context:annotation-config/>` element so that any
+<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.
-<4> `GemFireHttpSessionConfiguration` is registered to enable Spring Session functionality.
-<5> Then, a Spring `BeanPostProcessor` is registered to determine whether a GemFire Server at the designated host/port
-is running, blocking client startup until the server is available.
-<6> Next, we include a `Properties` bean to configure certain aspects of the GemFire client cache using
-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 sample application-specific System property, defaulting
+<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.
-<7> Finally, we create the GemFire client cache and configure a Pool of client connections to talk to the GemFire Server
-in our Client/Server topology. In our configuration, we use sensible settings for timeouts, number of connections
-and so on. Also, our `Pool` has been configured to connect directly to a server.
+<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
@@ -110,35 +110,36 @@ NOTE: For more information on configuring _Spring Data GemFire_, refer to the ht
 
 === Server Configuration
 
-Now, we have only covered one side of the equation.  We also need a GemFire Server for our client to talk to and pass
-session state information up to the server to manage.
+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}httpsession-gemfire-clientserver-xml/src/main/resources/META-INF/spring/session-server.xml[tags=beans]
+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 from `META-INF/spring/application.properties`.
-<3> We enable the same Spring Session functionality that we used on the client by registering an instance of `GemFireHttpSessionConfiguration`,
-except that we set the session expiration timeout to **30 seconds**. We will explain later what this means.
-<4> Next, we configure the GemFire Server using GemFire System properties very much like our P2P samples.
+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.
-<5> Then, we create an instance of the GemFire peer cache using our GemFire System properties.
-<6> And finally, we also setup a GemFire `CacheServer` instance running on *localhost*, listening on port **11235**,
-to accept our client connection.
+<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}httpsession-gemfire-clientserver-xml/src/main/java/sample/Application.java[tags=class]
+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_.
@@ -162,8 +163,8 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+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]
@@ -177,7 +178,7 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+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]
@@ -224,7 +225,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
+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.

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

@@ -81,7 +81,7 @@ Add the following Spring Configuration:
 .src/main/webapp/WEB-INF/spring/session.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+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
@@ -114,8 +114,8 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+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]
@@ -129,7 +129,7 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+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]
@@ -167,7 +167,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-gemfire-p2p-xml/src/main/java/sample/SessionServlet.java[tags=class]
+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.

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

@@ -76,7 +76,7 @@ Add the following Spring Configuration:
 .src/main/webapp/WEB-INF/spring/session.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-jdbc-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
 ----
 
 <1> We use the combination of `<context:annotation-config/>` and `JdbcHttpSessionConfiguration` because Spring Session does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
@@ -101,8 +101,8 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
 The https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
@@ -113,7 +113,7 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+include::{samples-dir}xml/jdbc/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
 The 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`.
@@ -150,7 +150,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-jdbc-xml/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}xml/jdbc/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in H2 database.

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

@@ -23,6 +23,11 @@ If you are using Maven, ensure to add the following dependencies:
 		<version>{spring-session-version}</version>
 		<type>pom</type>
 	</dependency>
+	<dependency>
+		<groupId>biz.paluch.redis</groupId>
+		<artifactId>lettuce</artifactId>
+		<version>{lettuce-version}</version>
+	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
 		<artifactId>spring-web</artifactId>
@@ -76,7 +81,7 @@ Add the following Spring Configuration:
 .src/main/webapp/WEB-INF/spring/session.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
 ----
 
 <1> We use the combination of `<context:annotation-config/>` and `RedisHttpSessionConfiguration` because Spring Session does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
@@ -99,8 +104,8 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
 The https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
@@ -111,7 +116,7 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+include::{samples-dir}xml/redis/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
 The 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`.
@@ -129,7 +134,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).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -154,7 +159,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession-xml/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}xml/redis/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
@@ -171,4 +176,4 @@ Alternatively, you can also delete the explicit key. Enter the following into yo
 
 	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.
+Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

docs/src/docs/asciidoc/index.adoc

@@ -1,3 +1,4 @@
+
 = Spring Session
 Rob Winch, Vedran Pavić, Jakub Kubrynski
 :doctype: book
@@ -22,111 +23,137 @@ Additional features include:
 
 * <<websocket,WebSocket>> - provides the ability to keep the `HttpSession` alive when receiving WebSocket messages
 
-== What's New in 1.2
+== What's New in 1.3
 
-Below are the highlights of what is new in Spring Session 1.2. You can find a complete list of what's new in https://github.com/spring-projects/spring-session/issues?utf8=%E2%9C%93&q=milestone%3A%221.2.0+RC1%22[1.2.0 RC1] by referring to the changelog.
+Below are the highlights of what is new in Spring Session 1.3. You can find a complete list of what's new by referring to the changelogs of
+https://github.com/spring-projects/spring-session/milestone/6?closed=1[1.3.0.M1],
+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].
 
-* Added <<httpsession-jdbc,JdbcOperationsSessionRepository>> (See https://github.com/spring-projects/spring-session/issues/364[#364]).
-* Added <<httpsession-mongo,MongoOperationsSessionRepository>> (See https://github.com/spring-projects/spring-session/pull/371[#371]).
-* SessionRepositoryFilter caches null session lookup (See https://github.com/spring-projects/spring-session/issues/423[#423])
-* link:guides/grails3.html[Grails 3 Sample & Guide]
-* Improved Workspace Setup (See https://github.com/spring-projects/spring-session/pull/417[#417])
+* 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]
+* 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]
+* `spring.session.cleanup.cron.expression` can be used to override the cleanup task’s cron expression
+* Lots of performance improvements and bug fixes
 
 [[samples]]
 == Samples and Guides (Start Here)
 
 If you are looking to get started with Spring Session, the best place to start is our Sample Applications.
 
-.Sample Applications
+.Sample Applications using Spring Boot
 |===
 | Source | Description | Guide
 
-| {gh-samples-url}httpsession[HttpSession]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store.
-| link:guides/httpsession.html[HttpSession Guide]
+| {gh-samples-url}boot/redis[HttpSession with Redis]
+| Demonstrates how to use Spring Session to replace the `HttpSession` with Redis.
+| link:guides/boot-redis.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}httpsession-xml[HttpSession XML]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store using XML based configuration.
-| link:guides/httpsession-xml.html[HttpSession XML Guide]
-
-| {gh-samples-url}httpsession-gemfire-boot[HttpSession with GemFire using Spring Boot]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology in a Spring Boot application.
-| link:guides/httpsession-gemfire-boot.html[HttpSession GemFire Boot Guide]
-
-| {gh-samples-url}httpsession-gemfire-clientserver[HttpSession with GemFire (Client/Server)]
+| {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/httpsession-gemfire-clientserver.html[HttpSession GemFire Client/Server Guide]
+| link:guides/boot-gemfire.html[HttpSession with GemFire Guide]
 
-| {gh-samples-url}httpsession-gemfire-clientserver-xml[HttpSession with GemFire (Client/Server) using XML]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology configured with XML.
-| link:guides/httpsession-gemfire-clientserver-xml.html[HttpSession GemFire Client/Server XML 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}httpsession-gemfire-p2p[HttpSession with GemFire (P2P)]
+| {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]
+
+| {gh-samples-url}boot/findbyusername[Find by Username]
+| Demonstrates how to use Spring Session to find sessions by username.
+| link:guides/boot-findbyusername.html[Find by Username Guide]
+
+| {gh-samples-url}boot/websocket[WebSockets]
+| Demonstrates how to use Spring Session with WebSockets.
+| link:guides/boot-websocket.html[WebSockets Guide]
+
+| {gh-samples-url}boot/redis-json[HttpSession with Redis JSON serialization]
+| Demonstrates how to use Spring Session to replace the `HttpSession` with Redis using JSON serialization.
+| TBD
+
+|===
+
+.Sample Applications using Spring Java based configuration
+|===
+| Source | Description | Guide
+
+| {gh-samples-url}javaconfig/redis[HttpSession with Redis]
+| 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/httpsession-gemfire-p2p.html[HttpSession GemFire P2P Guide]
+| link:guides/java-gemfire-p2p.html[HttpSession with GemFire (P2P) Guide]
 
-| {gh-samples-url}httpsession-gemfire-p2p-xml[HttpSession with GemFire (P2P) using XML]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a P2P topology configured with XML.
-| link:guides/httpsession-gemfire-p2p-xml.html[HttpSession GemFire P2P XML 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]
 
-| {gh-samples-url}custom-cookie[Custom Cookie]
+| {gh-samples-url}javaconfig/hazelcast[HttpSession with Hazelcast]
+| Demonstrates how to use Spring Session to replace the `HttpSession` with Hazelcast.
+| link:guides/java-hazelcast.html[HttpSession with Hazelcast Guide]
+
+| {gh-samples-url}javaconfig/custom-cookie[Custom Cookie]
 | Demonstrates how to use Spring Session and customize the cookie.
-| link:guides/custom-cookie.html[Custom Cookie Guide]
+| link:guides/java-custom-cookie.html[Custom Cookie Guide]
 
-| {gh-samples-url}boot[Spring Boot]
-| Demonstrates how to use Spring Session with Spring Boot.
-| link:guides/boot.html[Spring Boot Guide]
+| {gh-samples-url}javaconfig/security[Spring Security]
+| Demonstrates how to use Spring Session with an existing Spring Security application.
+| link:guides/java-security.html[Spring Security Guide]
 
-| {gh-samples-url}grails3[Grails 3]
+| {gh-samples-url}javaconfig/rest[REST]
+| Demonstrates how to use Spring Session in a REST application to support authenticating with a header.
+| link:guides/java-rest.html[REST Guide]
+
+| {gh-samples-url}javaconfig/users[Multiple Users]
+| Demonstrates how to use Spring Session to manage multiple simultaneous browser sessions (i.e Google Accounts).
+| link:guides/java-users.html[Multiple Users Guide]
+
+|===
+
+.Sample Applications using Spring XML based configuration
+|===
+| Source | Description | Guide
+
+| {gh-samples-url}xml/redis[HttpSession with Redis]
+| 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]
+
+|===
+
+.Misc sample Applications
+|===
+| Source | Description | Guide
+
+| {gh-samples-url}misc/grails3[Grails 3]
 | Demonstrates how to use Spring Session with Grails 3.
 | link:guides/grails3.html[Grails 3 Guide]
 
-| {gh-samples-url}security[Spring Security]
-| Demonstrates how to use Spring Session with an existing Spring Security application.
-| link:guides/security.html[Spring Security Guide]
-
-| {gh-samples-url}rest[REST]
-| Demonstrates how to use Spring Session in a REST application to support authenticating with a header.
-| link:guides/rest.html[REST Guide]
-
-| {gh-samples-url}findbyusername[Find by Username]
-| Demonstrates how to use Spring Session to find sessions by username.
-| link:guides/findbyusername.html[Find by Username]
-
-| {gh-samples-url}users[Multiple Users]
-| Demonstrates how to use Spring Session to manage multiple simultaneous browser sessions (i.e Google Accounts).
-| link:guides/users.html[Manage Multiple Users Guide]
-
-| {gh-samples-url}websocket[WebSocket]
-| Demonstrates how to use Spring Session with WebSockets.
-| link:guides/websocket.html[WebSocket Guide]
-
-| {gh-samples-url}mongo[Mongo]
-| Demonstrates how to use Spring Session with Mongo.
-| link:guides/mongo.html[Mongo Guide]
-
-[[samples-hazelcast]]
-| {gh-samples-url}hazelcast[Hazelcast]
-| Demonstrates how to use Spring Session with Hazelcast.
+| {gh-samples-url}misc/hazelcast[Hazelcast]
+| Demonstrates how to use Spring Session with Hazelcast in a Java EE application.
 | TBD
 
-[[samples-hazelcast-spring]]
-| {gh-samples-url}hazelcast-spring[Hazelcast Spring]
-| Demonstrates how to use Spring Session and Hazelcast with an existing Spring Security application.
-| link:guides/hazelcast-spring.html[Hazelcast Spring Guide]
-
-| {gh-samples-url}httpsession-jdbc[HttpSession JDBC]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
-| link:guides/httpsession-jdbc.html[HttpSession JDBC Guide]
-
-| {gh-samples-url}httpsession-jdbc-xml[HttpSession JDBC XML]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store using XML based configuration.
-| link:guides/httpsession-jdbc-xml.html[HttpSession JDBC XML Guide]
-
-| {gh-samples-url}httpsession-jdbc-boot[HttpSession JDBC Spring Boot]
-| Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store when using Spring Boot.
-| link:guides/httpsession-jdbc-boot.html[HttpSession JDBC Spring Boot Guide]
-
 |===
 
 [[httpsession]]
@@ -161,7 +188,7 @@ This section describes how to use Redis to back `HttpSession` using Java based c
 NOTE: The <<samples, HttpSession 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/httpsession.adoc[tags=config,leveloffset=+3]
+include::guides/java-redis.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-redis-xml]]
 ==== Redis XML Based Configuration
@@ -171,7 +198,7 @@ This section describes how to use Redis to back `HttpSession` using XML based co
 NOTE: The <<samples, HttpSession XML Sample>> provides a working sample on how to integrate Spring Session and `HttpSession` using XML configuration.
 You can read the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession XML Guide when integrating with your own application.
 
-include::guides/httpsession-xml.adoc[tags=config,leveloffset=+3]
+include::guides/xml-redis.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-gemfire]]
 === HttpSession with Pivotal GemFire
@@ -216,7 +243,7 @@ Spring Session and GemFire to replace the HttpSession using Java configuration.
 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/httpsession-gemfire-clientserver.adoc[tags=config,leveloffset=+3]
+include::guides/java-gemfire-clientserver.adoc[tags=config,leveloffset=+3]
 
 [[http-session-gemfire-clientserver-xml]]
 ===== GemFire Client-Server XML-based Configuration
@@ -228,7 +255,7 @@ integrate Spring Session and GemFire to replace the `HttpSession` using XML conf
 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/httpsession-gemfire-clientserver-xml.adoc[tags=config,leveloffset=+3]
+include::guides/xml-gemfire-clientserver.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-gemfire-p2p]]
 ==== GemFire Peer-To-Peer (P2P)
@@ -263,7 +290,7 @@ Spring Session and GemFire to replace the `HttpSession` using Java configuration
 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/httpsession-gemfire-p2p.adoc[tags=config,leveloffset=+3]
+include::guides/java-gemfire-p2p.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-gemfire-p2p-xml]]
 ===== GemFire Peer-To-Peer (P2P) XML-based Configuration
@@ -275,7 +302,7 @@ Spring Session and GemFire to replace the `HttpSession` using XML configuration.
 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/httpsession-gemfire-p2p-xml.adoc[tags=config,leveloffset=+3]
+include::guides/xml-gemfire-p2p.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-jdbc]]
 === HttpSession with JDBC
@@ -295,7 +322,7 @@ This section describes how to use a relational database to back `HttpSession` us
 NOTE: The <<samples, HttpSession JDBC 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 JDBC Guide when integrating with your own application.
 
-include::guides/httpsession-jdbc.adoc[tags=config,leveloffset=+3]
+include::guides/java-jdbc.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-jdbc-xml]]
 ==== JDBC XML Based Configuration
@@ -305,7 +332,7 @@ This section describes how to use a relational database to back `HttpSession` us
 NOTE: The <<samples, HttpSession JDBC XML Sample>> provides a working sample on how to integrate Spring Session and `HttpSession` using XML configuration.
 You can read the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession JDBC XML Guide when integrating with your own application.
 
-include::guides/httpsession-jdbc-xml.adoc[tags=config,leveloffset=+3]
+include::guides/xml-jdbc.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-jdbc-boot]]
 ==== JDBC Spring Boot Based Configuration
@@ -315,7 +342,7 @@ This section describes how to use a relational database to back `HttpSession` wh
 NOTE: The <<samples, HttpSession JDBC Spring Boot Sample>> provides a working sample on how to integrate Spring Session and `HttpSession` using Spring Boot.
 You can read the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession JDBC Spring Boot Guide when integrating with your own application.
 
-include::guides/httpsession-jdbc-boot.adoc[tags=config,leveloffset=+3]
+include::guides/boot-jdbc.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-mongo]]
 === HttpSession with Mongo
@@ -327,7 +354,7 @@ This section describes how to use Mongo to back `HttpSession` using Java based c
 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/mongo.adoc[tags=config,leveloffset=+3]
+include::guides/boot-mongo.adoc[tags=config,leveloffset=+3]
 
 ==== Session serialization mechanisms
 
@@ -368,6 +395,18 @@ There is also a constructor taking `Serializer` and `Deserializer` objects, allo
 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
+
+Using Spring Session with `HttpSession` is enabled by adding a Servlet Filter before anything that uses the `HttpSession`.
+
+This section describes how to use Hazelcast to back `HttpSession` using Java based configuration.
+
+NOTE: The <<samples, Hazelcast Spring 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 Hazelcast Spring Guide when integrating with your own application.
+
+include::guides/java-hazelcast.adoc[tags=config,leveloffset=+2]
+
 [[httpsession-how]]
 === How HttpSession Integration Works
 
@@ -433,7 +472,7 @@ This provides the ability to support authenticating with multiple users in the s
 NOTE: The <<samples,Manage Multiple Users Guide>> provides a complete working example of managing multiple users in the same browser instance.
 You can follow the basic steps for integration below, but you are encouraged to follow along with the detailed Manage Multiple Users Guide when integrating with your own application.
 
-include::guides/users.adoc[tags=how-does-it-work,leveloffset=+1]
+include::guides/java-users.adoc[tags=how-does-it-work,leveloffset=+1]
 
 [[httpsession-rest]]
 === HttpSession & RESTful APIs
@@ -444,7 +483,7 @@ Spring Session can work with RESTful APIs by allowing the session to be provided
 NOTE: The <<samples, REST Sample>> provides a working sample on how to use Spring Session in a REST application to support authenticating with a header.
 You can follow the basic steps for integration below, but you are encouraged to follow along with the detailed REST Guide when integrating with your own application.
 
-include::guides/rest.adoc[tags=config,leveloffset=+2]
+include::guides/java-rest.adoc[tags=config,leveloffset=+2]
 
 [[httpsession-httpsessionlistener]]
 === HttpSessionListener
@@ -477,7 +516,7 @@ include::{docs-test-resources-dir}docs/http/HttpSessionListenerXmlTests-context.
 
 Spring Session provides transparent integration with Spring's WebSocket support.
 
-include::guides/websocket.adoc[tags=disclaimer,leveloffset=+1]
+include::guides/boot-websocket.adoc[tags=disclaimer,leveloffset=+1]
 
 [[websocket-why]]
 === Why Spring Session & WebSockets?
@@ -503,7 +542,76 @@ You can follow the basic steps for integration below, but you are encouraged to
 
 Before using WebSocket integration, you should be sure that you have <<httpsession>> working first.
 
-include::guides/websocket.adoc[tags=config,leveloffset=+2]
+include::guides/boot-websocket.adoc[tags=config,leveloffset=+2]
+
+[[spring-security]]
+== Spring Security Integration
+
+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].
+The support will:
+
+* Change the session expiration length
+* Ensure the session cookie expires at `Integer.MAX_VALUE`.
+The cookie expiration is set to the largest possible value because the cookie is only set when the session is created.
+If it were set to the same value as the session expiration, then the session would get renewed when the user used it but the cookie expiration would not be updated causing the expiration to be fixed.
+
+To configure Spring Session with Spring Security in Java Configuration use the following as a guide:
+
+[source,java,indent=0]
+----
+include::{docs-test-dir}docs/security/RememberMeSecurityConfiguration.java[tags=http-rememberme]
+	}
+
+include::{docs-test-dir}docs/security/RememberMeSecurityConfiguration.java[tags=rememberme-bean]
+----
+
+An XML based configuration would look something like this:
+
+[source,xml,indent=0]
+----
+include::{docs-test-resources-dir}docs/security/RememberMeSecurityConfigurationXmlTests-context.xml[tags=config]
+----
+
+
+[[spring-security-concurrent-sessions]]
+=== Spring Security Concurrent Session Control
+
+
+Spring Session provides integration with Spring Security to support its concurrent session control.
+This allows limiting the number of active sessions that a single user can have concurrently, but unlike the default
+Spring Security support this will also work in a clustered environment. This is done by providing a custom
+implementation of Spring Security's `SessionRegistry` interface.
+
+When using Spring Security's Java config DSL, you can configure the custom `SessionRegistry` through the
+`SessionManagementConfigurer` like this:
+[source,java,indent=0]
+----
+include::{docs-test-dir}docs/security/SecurityConfiguration.java[tags=class]
+----
+
+This assumes that you've also configured Spring Session to provide a `FindByIndexNameSessionRepository` that
+returns `ExpiringSession` instances.
+
+When using XML configuration, it would look something like this:
+[source,xml,indent=0]
+----
+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`.
+
+[[spring-security-concurrent-sessions-limitations]]
+=== Limitations
+
+Spring Session's implementation of Spring Security's `SessionRegistry` interface does not support the `getAllPrincipals`
+method, as this information cannot be retrieved using Spring Session. This method is never called by Spring Security,
+so this only affects applications that access the `SessionRegistry` themselves.
 
 [[api]]
 == API Documentation
@@ -610,44 +718,6 @@ It is important to note that no infrastructure for session expirations is config
 This is because things like session expiration are highly implementation dependent.
 This means if you require cleaning up expired sessions, you are responsible for cleaning up the expired sessions.
 
-[[api-enablehazelcasthttpsession]]
-=== EnableHazelcastHttpSession
-
-If you wish to use https://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.
-For example:
-
-[source,java,indent=0]
-----
-include::{docs-test-dir}docs/http/HazelcastHttpSessionConfig.java[tags=config]
-----
-
-This will configure Hazelcast in embedded mode with default configuration.
-See the https://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[Hazelcast documentation] for
-detailed information on configuration options for Hazelcast.
-
-[[api-enablehazelcasthttpsession-storage]]
-==== Storage Details
-
-Sessions will be stored in a distributed `Map` in Hazelcast using a <<api-mapsessionrepository,MapSessionRepository>>.
-The `Map` interface methods will be used to `get()` and `put()` Sessions.
-The expiration of a session in the `Map` is handled by Hazelcast's support for setting the time to live on an entry when it is `put()` into the `Map`. Entries (sessions) that have been idle longer than the time to live will be automatically removed from the `Map`.
-
-You shouldn't need to configure any settings such as `max-idle-seconds` or `time-to-live-seconds` for the `Map` within the Hazelcast configuration.
-
-[[api-enablehazelcasthttpsession-customize]]
-==== Basic Customization
-You can use the following attributes on `@EnableHazelcastHttpSession` to customize the configuration:
-
-* **maxInactiveIntervalInSeconds** - the amount of time before the session will expire in seconds. Default is 1800 seconds (30 minutes)
-* **sessionMapName** - the name of the distributed `Map` that will be used in Hazelcast to store the session data.
-
-[[api-enablehazelcasthttpsession-events]]
-==== Session Events
-Using a `MapListener` to respond to entries being added, evicted, and removed from the distributed `Map`, these events will trigger
-publishing SessionCreatedEvent, SessionExpiredEvent, and SessionDeletedEvent events respectively using the `ApplicationEventPublisher`.
-
 [[api-redisoperationssessionrepository]]
 === RedisOperationsSessionRepository
 
@@ -837,7 +907,7 @@ For example, Java Configuration can use the following:
 include::{docs-test-dir}docs/RedisHttpSessionConfigurationNoOpConfigureRedisActionTests.java[tags=configure-redis-action]
 ----
 
-XML Configuraiton can use the following:
+XML Configuration can use the following:
 
 [source,xml,indent=0]
 ----
@@ -1043,6 +1113,7 @@ However, you can override the default `ConversionService` by providing a Bean na
 
 By default, this implementation uses `SPRING_SESSION` and `SPRING_SESSION_ATTRIBUTES` tables to store sessions.
 Note that the table name can be easily customized as already described. In that case the table used to store attributes will be named using the provided table name, suffixed with `_ATTRIBUTES`.
+If further customizations are needed, SQL queries used by the repository can be customized using `set*Query` setter methods. In this case you need to manually configure the `sessionRepository` bean.
 
 Due to the differences between the various database vendors, especially when it comes to storing binary data, make sure to use SQL script specific to your database.
 Scripts for most major database vendors are packaged as `org/springframework/session/jdbc/schema-\*.sql`, where `*` is the target database type.
@@ -1066,6 +1137,59 @@ include::{session-main-resources-dir}org/springframework/session/jdbc/schema-mys
 All JDBC operations in `JdbcOperationsSessionRepository` are executed in a transactional manner.
 Transactions are executed with propagation set to `REQUIRES_NEW` in order to avoid unexpected behavior due to interference with existing transactions (for example, executing `save` operation in a thread that already participates in a read-only transaction).
 
+[[api-hazelcastsessionrepository]]
+=== HazelcastSessionRepository
+
+`HazelcastSessionRepository` is a `SessionRepository` implementation that stores sessions in Hazelcast's distributed `IMap`.
+In a web environment, this is typically used in combination with `SessionRepositoryFilter`.
+
+[[api-hazelcastsessionrepository-new]]
+==== Instantiating a HazelcastSessionRepository
+
+A typical example of how to create a new instance can be seen below:
+
+[source,java,indent=0]
+----
+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].
+
+[[api-enablehazelcasthttpsession]]
+==== EnableHazelcastHttpSession
+
+If you wish to use https://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>>
+
+[[api-enablehazelcasthttpsession-customize]]
+==== Basic Customization
+You can use the following attributes on `@EnableHazelcastHttpSession` to customize the configuration:
+
+* **maxInactiveIntervalInSeconds** - the amount of time before the session will expire in seconds. Default is 1800 seconds (30 minutes)
+* **sessionMapName** - the name of the distributed `Map` that will be used in Hazelcast to store the session data.
+
+[[api-enablehazelcasthttpsession-events]]
+==== Session Events
+Using a `MapListener` to respond to entries being added, evicted, and removed from the distributed `Map`, these events will trigger
+publishing `SessionCreatedEvent`, `SessionExpiredEvent`, and `SessionDeletedEvent` events respectively using the `ApplicationEventPublisher`.
+
+[[api-enablehazelcasthttpsession-storage]]
+==== Storage Details
+
+Sessions will be stored in a distributed `IMap` in Hazelcast.
+The `IMap` interface methods will be used to `get()` and `put()` Sessions.
+Additionally, `values()` method is used to support `FindByIndexNameSessionRepository#findByIndexNameAndIndexValue` operation, together with appropriate `ValueExtractor` that needs to be registered with Hazelcast. Refer to <<samples, Hazelcast Spring Sample>> for more details on this configuration.
+The expiration of a session in the `IMap` is handled by Hazelcast's support for setting the time to live on an entry when it is `put()` into the `IMap`. Entries (sessions) that have been idle longer than the time to live will be automatically removed from the `IMap`.
+
+You shouldn't need to configure any settings such as `max-idle-seconds` or `time-to-live-seconds` for the `IMap` within the Hazelcast configuration.
+
+Note that if you use Hazelcast's `MapStore` to persist your sessions `IMap` there are some limitations when reloading the sessions from `MapStore`:
+
+* reload triggers `EntryAddedListener` which results in `SessionCreatedEvent` being re-published
+* reload uses default TTL for a given `IMap` which results in sessions losing their original TTL
+
 [[community]]
 == Spring Session Community
 
@@ -1098,6 +1222,11 @@ We appreciate https://help.github.com/articles/using-pull-requests/[Pull Request
 
 Spring Session is Open Source software released under the https://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]
+
 [[minimum-requirements]]
 == Minimum Requirements
 

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

@@ -71,8 +71,6 @@ public class AbstractGemFireIntegrationTests {
 	protected static final boolean GEMFIRE_QUERY_DEBUG = Boolean
 			.getBoolean("spring.session.data.gemfire.query.debug");
 
-	protected static final int DEFAULT_GEMFIRE_SERVER_PORT = CacheServer.DEFAULT_PORT;
-
 	protected static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
 	protected static final long DEFAULT_WAIT_INTERVAL = 500L;
 
@@ -82,7 +80,7 @@ public class AbstractGemFireIntegrationTests {
 	protected static final String DEFAULT_PROCESS_CONTROL_FILENAME = "process.ctl";
 
 	protected static final String GEMFIRE_LOG_FILE_NAME = System
-			.getProperty("spring.session.data.gemfire.log-file", "server.log");
+			.getProperty("spring.session.data.gemfire.log-file", "gemfire-server.log");
 
 	@Autowired
 	protected Cache gemfireCache;

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

@@ -14,20 +14,7 @@
  * limitations under the License.
  */
 
-package sample.pages
+package docs;
 
-import geb.*
-
-/**
- * The home page
- *
- * @author Rob Winch
- */
-class HomePage extends Page {
-	static url = ''
-	static at = { assert driver.title == 'Spring Session Sample - Secured Content'; true}
-	static content = {
-		username { $('#un').text() }
-		logout(to:LoginPage) { $('input[type=submit]').click() }
-	}
+public class Docs {
 }

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

@@ -16,17 +16,23 @@
 
 package docs;
 
+import com.hazelcast.config.Config;
+import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.core.IMap;
 import org.junit.Test;
 
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.session.ExpiringSession;
+import org.springframework.session.MapSession;
 import org.springframework.session.MapSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.data.redis.RedisOperationsSessionRepository;
+import org.springframework.session.hazelcast.HazelcastSessionRepository;
 import org.springframework.session.jdbc.JdbcOperationsSessionRepository;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -104,7 +110,7 @@ public class IndexDocTests {
 	@SuppressWarnings("unused")
 	public void newRedisOperationsSessionRepository() {
 		// tag::new-redisoperationssessionrepository[]
-		JedisConnectionFactory factory = new JedisConnectionFactory();
+		LettuceConnectionFactory factory = new LettuceConnectionFactory();
 		SessionRepository<? extends ExpiringSession> repository = new RedisOperationsSessionRepository(
 				factory);
 		// end::new-redisoperationssessionrepository[]
@@ -135,6 +141,25 @@ public class IndexDocTests {
 		// end::new-jdbcoperationssessionrepository[]
 	}
 
+	@Test
+	@SuppressWarnings("unused")
+	public void newHazelcastSessionRepository() {
+		// tag::new-hazelcastsessionrepository[]
+
+		Config config = new Config();
+
+		// ... configure Hazelcast ...
+
+		HazelcastInstance hazelcastInstance = Hazelcast.newHazelcastInstance(config);
+
+		IMap<String, MapSession> sessions = hazelcastInstance
+				.getMap("spring:session:sessions");
+
+		HazelcastSessionRepository repository =
+				new HazelcastSessionRepository(sessions);
+		// end::new-hazelcastsessionrepository[]
+	}
+
 	@Test
 	public void runSpringHttpSessionConfig() {
 		AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();

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

@@ -17,21 +17,37 @@
 package docs.http;
 
 import com.hazelcast.config.Config;
+import com.hazelcast.config.MapAttributeConfig;
+import com.hazelcast.config.MapIndexConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.session.hazelcast.HazelcastSessionRepository;
+import org.springframework.session.hazelcast.PrincipalNameExtractor;
 import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
 
 //tag::config[]
 @EnableHazelcastHttpSession // <1>
 @Configuration
 public class HazelcastHttpSessionConfig {
+
 	@Bean
-	public HazelcastInstance embeddedHazelcast() {
-		Config hazelcastConfig = new Config();
-		return Hazelcast.newHazelcastInstance(hazelcastConfig); // <2>
+	public HazelcastInstance hazelcastInstance() {
+		MapAttributeConfig attributeConfig = new MapAttributeConfig()
+				.setName(HazelcastSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
+				.setExtractor(PrincipalNameExtractor.class.getName());
+
+		Config config = new Config();
+
+		config.getMapConfig("spring:session:sessions") // <2>
+				.addMapAttributeConfig(attributeConfig)
+				.addMapIndexConfig(new MapIndexConfig(
+						HazelcastSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false));
+
+		return Hazelcast.newHazelcastInstance(config); // <3>
 	}
+
 }
 // end::config[]

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

@@ -0,0 +1,79 @@
+/*
+ * 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.security;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.authentication.RememberMeServices;
+import org.springframework.session.MapSessionRepository;
+import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
+import org.springframework.session.security.web.authentication.SpringSessionRememberMeServices;
+
+/**
+ * @author rwinch
+ */
+@EnableWebSecurity
+@EnableSpringHttpSession
+public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+	// @formatter:off
+	// tag::http-rememberme[]
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			// ... additional configuration ...
+			.rememberMe()
+				.rememberMeServices(rememberMeServices());
+		// end::http-rememberme[]
+
+		http
+			.formLogin().and()
+			.authorizeRequests()
+				.anyRequest().authenticated();
+	}
+
+	// tag::rememberme-bean[]
+	@Bean
+	RememberMeServices rememberMeServices() {
+		SpringSessionRememberMeServices rememberMeServices =
+				new SpringSessionRememberMeServices();
+		// optionally customize
+		rememberMeServices.setAlwaysRemember(true);
+		return rememberMeServices;
+	}
+	// end::rememberme-bean[]
+	// @formatter:on
+
+	@Override
+	@Bean
+	public InMemoryUserDetailsManager userDetailsService() {
+		InMemoryUserDetailsManager uds = new InMemoryUserDetailsManager();
+		uds.createUser(
+				User.withUsername("user").password("password").roles("USER").build());
+		return uds;
+	}
+
+	@Bean
+	MapSessionRepository sessionRepository() {
+		return new MapSessionRepository();
+	}
+}
+// end::class[]

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

@@ -0,0 +1,88 @@
+/*
+ * 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.security;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.Cookie;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.SessionRepository;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+
+/**
+ * @author rwinch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = RememberMeSecurityConfiguration.class)
+@WebAppConfiguration
+@SuppressWarnings("rawtypes")
+public class RememberMeSecurityConfigurationTests<T extends ExpiringSession> {
+	@Autowired
+	WebApplicationContext context;
+	@Autowired
+	SessionRepositoryFilter springSessionRepositoryFilter;
+	@Autowired
+	SessionRepository<T> sessions;
+
+	MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		// @formatter:off
+		this.mockMvc = MockMvcBuilders
+				.webAppContextSetup(this.context)
+				.addFilters(this.springSessionRepositoryFilter)
+				.apply(springSecurity())
+				.build();
+		// @formatter:on
+	}
+
+	@Test
+	public void authenticateWhenSpringSessionRememberMeEnabledThenCookieMaxAgeAndSessionExpirationSet()
+			throws Exception {
+		// @formatter:off
+		MvcResult result = this.mockMvc
+			.perform(formLogin())
+			.andReturn();
+		// @formatter:on
+
+		Cookie cookie = result.getResponse().getCookie("SESSION");
+		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
+		T session = this.sessions.getSession(cookie.getValue());
+		assertThat(session.getMaxInactiveIntervalInSeconds())
+				.isEqualTo((int) TimeUnit.DAYS.toSeconds(30));
+
+	}
+}
+// end::class[]

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

@@ -0,0 +1,88 @@
+/*
+ * 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.security;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.Cookie;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.SessionRepository;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestBuilders.formLogin;
+import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
+
+/**
+ * @author rwinch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+@SuppressWarnings("rawtypes")
+public class RememberMeSecurityConfigurationXmlTests<T extends ExpiringSession> {
+	@Autowired
+	WebApplicationContext context;
+	@Autowired
+	SessionRepositoryFilter springSessionRepositoryFilter;
+	@Autowired
+	SessionRepository<T> sessions;
+
+	MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		// @formatter:off
+		this.mockMvc = MockMvcBuilders
+				.webAppContextSetup(this.context)
+				.addFilters(this.springSessionRepositoryFilter)
+				.apply(springSecurity())
+				.build();
+		// @formatter:on
+	}
+
+	@Test
+	public void authenticateWhenSpringSessionRememberMeEnabledThenCookieMaxAgeAndSessionExpirationSet()
+			throws Exception {
+		// @formatter:off
+		MvcResult result = this.mockMvc
+			.perform(formLogin())
+			.andReturn();
+		// @formatter:on
+
+		Cookie cookie = result.getResponse().getCookie("SESSION");
+		assertThat(cookie.getMaxAge()).isEqualTo(Integer.MAX_VALUE);
+		T session = this.sessions.getSession(cookie.getValue());
+		assertThat(session.getMaxInactiveIntervalInSeconds())
+				.isEqualTo((int) TimeUnit.DAYS.toSeconds(30));
+
+	}
+}
+// end::class[]

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

@@ -0,0 +1,55 @@
+/*
+ * 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 docs.security;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.FindByIndexNameSessionRepository;
+import org.springframework.session.security.SpringSessionBackedSessionRegistry;
+
+/**
+ * @author Joris Kuipers
+ */
+// tag::class[]
+@Configuration
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+	@Autowired
+	private FindByIndexNameSessionRepository<ExpiringSession> sessionRepository;
+
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		// @formatter:off
+		http
+			// other config goes here...
+			.sessionManagement()
+				.maximumSessions(2)
+				.sessionRegistry(sessionRegistry());
+		// @formatter:on
+	}
+
+	@Bean
+	SpringSessionBackedSessionRegistry sessionRegistry() {
+		return new SpringSessionBackedSessionRegistry<ExpiringSession>(
+				this.sessionRepository);
+	}
+}
+// end::class[]

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

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

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xmlns:security="http://www.springframework.org/schema/security"
+	   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">
+
+	<!-- tag::config[] -->
+	<security:http>
+		<!-- other config goes here... -->
+		<security:session-management>
+			<security:concurrency-control max-sessions="2" session-registry-ref="sessionRegistry"/>
+		</security:session-management>
+	</security:http>
+
+	<bean id="sessionRegistry"
+		  class="org.springframework.session.security.SpringSessionBackedSessionRegistry">
+		<constructor-arg ref="sessionRepository"/>
+	</bean>
+	<!-- end::config[] -->
+
+</beans>

gradle.properties

@@ -1,27 +1,30 @@
+assertjVersion=2.6.0
 bootstrapVersion=2.3.2
-commonsPoolVersion=2.4.2
-jacksonVersion=2.6.5
-jspApiVersion=2.0
-servletApiVersion=3.0.1
-jstlelVersion=1.2.5
-version=1.2.3.BUILD-SNAPSHOT
-springDataRedisVersion=1.7.1.RELEASE
-html5ShivVersion=3.7.3
 commonsLoggingVersion=1.2
-junitVersion=4.12
+commonsPoolVersion=2.4.2
 gebVersion=0.13.1
-mockitoVersion=1.10.19
-hazelcastVersion=3.5.4
-seleniumVersion=2.52.0
-springSecurityVersion=4.0.3.RELEASE
-springVersion=4.2.5.RELEASE
-httpClientVersion=4.5.1
-jedisVersion=2.8.1
-h2Version=1.4.191
-springDataMongoVersion=1.9.1.RELEASE
-springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.8.1.RELEASE
-assertjVersion=2.3.0
-spockVersion=1.0-groovy-2.4
+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
-groovyVersion=2.4.4
+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

gradle/bom.gradle

@@ -0,0 +1,3 @@
+sonarqube {
+	skipProject = true
+}

gradle/ide.gradle

@@ -5,6 +5,12 @@ import org.gradle.plugins.ide.eclipse.model.SourceFolder
 apply plugin: "propdeps-eclipse"
 apply plugin: "propdeps-idea"
 
+eclipse {
+	jdt {
+		javaRuntimeName = "J2SE-1.5"
+	}
+}
+
 eclipse.project.buildCommand "net.sf.eclipsecs.core.CheckstyleBuilder"
 eclipse.project.natures "net.sf.eclipsecs.core.CheckstyleNature"
 
@@ -45,6 +51,9 @@ task cleanEclipseJdtUi(type: Delete) {
 	delete project.file(".settings/org.eclipse.wst.common.project.facet.core.xml")
 }
 
+task eclipseConfiguration(dependsOn: [eclipseCheckstyle, eclipseSettings, eclipseWstComponent]) {
+}
+
 tasks["eclipseJdt"].dependsOn(eclipseJdtPrepare)
 tasks["cleanEclipse"].dependsOn(cleanEclipseJdtUi)
-tasks["eclipse"].dependsOn(eclipseCheckstyle, eclipseSettings, eclipseWstComponent)
+tasks["eclipse"].dependsOn(eclipseConfiguration)

gradle/java.gradle

@@ -14,7 +14,7 @@ group = 'org.springframework.session'
 sourceCompatibility = 1.5
 targetCompatibility = 1.5
 
-ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'latest.integration'
+ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'Brussels-SR3'
 
 ext.spockDependencies = [
 		dependencies.create("org.spockframework:spock-core:$spockVersion") {
@@ -28,9 +28,14 @@ ext.gebDependencies = spockDependencies + [
 		"org.codehaus.groovy:groovy:$groovyVersion"
 ]
 
+ext.seleniumDependencies = [
+		"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
+		"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:1.2.1"
+		"org.apache.taglibs:taglibs-standard-jstlel:$jstlelVersion"
 ]
 
 repositories {

gradle/spring3.gradle

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

gradle/tomcat.gradle

@@ -3,19 +3,18 @@ buildscript {
 		maven { url "https://repo.spring.io/plugins-release" }
 	}
 	dependencies {
-		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
+		classpath("com.bmuschko:gradle-tomcat-plugin:2.2.5")
 	}
 }
 
 apply plugin: 'war'
-apply plugin: 'tomcat'
+apply plugin: 'com.bmuschko.tomcat'
 
 [tomcatRun,tomcatRunWar]*.contextPath = '/'
 
 
-task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
+task integrationTomcatRun(type: com.bmuschko.gradle.tomcat.tasks.TomcatRun) {
 	onlyIf { !sourceSets.integrationTest.allSource.empty }
-	buildscriptClasspath = tomcatRun.buildscriptClasspath
 	contextPath = tomcatRun.contextPath
 	daemon = true
 	tomcatClasspath = tomcatRun.tomcatClasspath
@@ -36,7 +35,7 @@ task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
 	}
 }
 
-task integrationTomcatStop(type: org.gradle.api.plugins.tomcat.tasks.TomcatStop) {
+task integrationTomcatStop(type: com.bmuschko.gradle.tomcat.tasks.TomcatStop) {
 	onlyIf { !sourceSets.integrationTest.allSource.empty }
 	doFirst {
 		stopPort = integrationTomcatRun.stopPort
@@ -46,9 +45,7 @@ task integrationTomcatStop(type: org.gradle.api.plugins.tomcat.tasks.TomcatStop)
 integrationTest {
 	dependsOn integrationTomcatRun
 	doFirst {
-		def host = 'localhost:' + integrationTomcatRun.httpPort
-		systemProperties['geb.build.baseUrl'] = 'http://'+host+'/' + integrationTomcatRun.contextPath
-		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
+		systemProperties['tomcat.port'] = integrationTomcatRun.httpPort
 	}
 	finalizedBy integrationTomcatStop
 }
@@ -61,4 +58,4 @@ def reservePorts(int count) {
 	def result = sockets*.localPort
 	sockets*.close()
 	result
-}
+}

gradle/tomcat7.gradle

@@ -3,8 +3,6 @@ apply from: TOMCAT_GRADLE
 dependencies {
 	def tomcatVersion = '7.0.59'
 	tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-			"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
-	tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {
-		exclude group: 'org.eclipse.jdt.core.compiler', module: 'ecj'
-	}
-}
+			"org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
+			"org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
+}

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -161,4 +161,9 @@ function splitJvmOpts() {
 eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
 JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+  cd "$(dirname "$0")"
+fi
+
 exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

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

samples/boot/findbyusername/build.gradle

@@ -1,13 +1,14 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		maven { url "https://repo.spring.io/milestone" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -16,23 +17,22 @@ group = 'samples'
 
 dependencies {
 	compile project(':spring-session'),
-			"org.springframework.boot:spring-boot-starter-redis",
+			"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.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion",
+			"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 gebDependencies,
-			"org.spockframework:spock-spring:$spockVersion"
+	integrationTestCompile seleniumDependencies
 
 }
 
@@ -40,9 +40,6 @@ 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
 

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

@@ -0,0 +1,75 @@
+/*
+ * 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 org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriver;
+import sample.pages.HomePage;
+import sample.pages.LoginPage;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+@RunWith(SpringRunner.class)
+@AutoConfigureMockMvc
+@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+public class FindByUsernameTests {
+
+	@Autowired
+	private MockMvc mockMvc;
+
+	private WebDriver driver;
+
+	@Before
+	public void setup() {
+		this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
+	}
+
+	@After
+	public void tearDown() {
+		this.driver.quit();
+	}
+
+	@Test
+	public void home() {
+		LoginPage login = HomePage.go(this.driver);
+		login.assertAt();
+	}
+
+	@Test
+	public void login() {
+		LoginPage login = HomePage.go(this.driver);
+		HomePage home = login.form().login(HomePage.class);
+		home.assertAt();
+		home.containCookie("SESSION");
+		home.doesNotContainCookie("JSESSIONID");
+		home.terminateButtonDisabled();
+	}
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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 org.openqa.selenium.WebDriver;
+
+/**
+ * @author Eddú Meléndez
+ */
+public class BasePage {
+
+	private WebDriver driver;
+
+	public BasePage(WebDriver driver) {
+		this.driver = driver;
+	}
+
+	public WebDriver getDriver() {
+		return this.driver;
+	}
+
+	public static void get(WebDriver driver, String get) {
+		String baseUrl = "http://localhost";
+		driver.get(baseUrl + get);
+	}
+
+}

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

@@ -0,0 +1,78 @@
+/*
+ * 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.Set;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+public class HomePage extends BasePage {
+	@FindBy(css = "input[type=\"submit\"]")
+	WebElement logout;
+
+	public HomePage(WebDriver driver) {
+		super(driver);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle())
+				.isEqualTo("Spring Session Sample - Secured Content");
+	}
+
+	public void containCookie(String cookieName) {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").contains(cookieName);
+	}
+
+	public void doesNotContainCookie(String cookieName) {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").doesNotContain(cookieName);
+	}
+
+	public void terminateButtonDisabled() {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		String cookieValue = null;
+		for (Cookie cookie : cookies) {
+			if ("SESSION".equals(cookie.getName())) {
+				cookieValue = cookie.getValue();
+			}
+		}
+		WebElement element = getDriver().findElement(By.id("terminate-" + cookieValue));
+		assertThat(element.isEnabled()).isFalse();
+	}
+
+	public HomePage logout() {
+		this.logout.click();
+		return PageFactory.initElements(getDriver(), HomePage.class);
+	}
+
+	public static LoginPage go(WebDriver driver) {
+		get(driver, "/");
+		return PageFactory.initElements(driver, LoginPage.class);
+	}
+}

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

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      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 org.openqa.selenium.SearchContext;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+public class LoginPage extends BasePage {
+
+	public LoginPage(WebDriver driver) {
+		super(driver);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle()).isEqualTo("Spring Session Sample - Log In");
+	}
+
+	public Form form() {
+		return new Form(getDriver());
+	}
+
+	public class Form {
+
+		@FindBy(name = "username")
+		private WebElement username;
+
+		@FindBy(name = "password")
+		private WebElement password;
+
+		@FindBy(tagName = "button")
+		private WebElement button;
+
+		public Form(SearchContext context) {
+			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
+		}
+
+		public <T> T login(Class<T> page) {
+			this.username.sendKeys("user");
+			this.password.sendKeys("password");
+			this.button.click();
+			return PageFactory.initElements(getDriver(), page);
+		}
+	}
+}

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

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

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

@@ -5,7 +5,7 @@
 	<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 th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+		<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
 			-------------------------------------------------- */
@@ -65,11 +65,11 @@
 				margin-left: 1em;
 			}
 		</style>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
-			<script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 

samples/boot/gemfire/build.gradle

@@ -0,0 +1,99 @@
+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

@@ -0,0 +1,96 @@
+/*
+ * 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

@@ -0,0 +1,135 @@
+/*
+ * 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

@@ -16,8 +16,6 @@
 
 package sample.client;
 
-import java.io.IOException;
-import java.net.Socket;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -27,15 +25,18 @@ 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
@@ -45,10 +46,11 @@ 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.client.PoolFactoryBean;
+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.support.GemFireUtils;
+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;
@@ -59,139 +61,118 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
- * A Spring Boot-based GemFire cache client web application that reveals the current state
- * of the HTTP Session.
+ * 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.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 // <1>
+@EnableGemFireHttpSession(poolName = "DEFAULT")// <1>
 @Controller
 public class Application {
 
-	static final int MAX_CONNECTIONS = 50;
+	static final long DEFAULT_TIMEOUT = TimeUnit.SECONDS.toMillis(60);
 
-	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
-	static final long DEFAULT_WAIT_INTERVAL = 500L;
+	static final CountDownLatch LATCH = new CountDownLatch(1);
 
-	static final CountDownLatch latch = new CountDownLatch(1);
-
-	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "config";
+	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";
 
-	static { // <6>
-		ClientMembership
-				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-					@Override
-					public void memberJoined(ClientMembershipEvent event) {
-						if (!event.isClient()) {
-							latch.countDown();
-						}
-					}
-				});
-	}
-
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
 
-	protected final Logger logger = LoggerFactory.getLogger(getClass());
-
 	@Bean
 	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
 		return new PropertySourcesPlaceholderConfigurer();
 	}
 
-	String applicationName() {
-		return "samples:httpsession-gemfire-boot-"
-				.concat(Application.class.getSimpleName());
+	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 gemfireLogLevel() {
-		return System.getProperty("gemfire.log-level", DEFAULT_GEMFIRE_LOG_LEVEL);
+	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);
 	}
 
-	Properties gemfireProperties() { // <2>
-		Properties gemfireProperties = new Properties();
-
-		gemfireProperties.setProperty("name", applicationName());
-		gemfireProperties.setProperty("log-level", gemfireLogLevel());
-
-		return gemfireProperties;
+	void registerClientMembershipListener() {
+		ClientMembership.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
+			@Override
+			public void memberJoined(ClientMembershipEvent event) {
+				LATCH.countDown();
+			}
+		});
 	}
 
 	@Bean
-	ClientCacheFactoryBean gemfireCache() { // <3>
-		ClientCacheFactoryBean gemfireCache = new ClientCacheFactoryBean();
-
-		gemfireCache.setClose(true);
-		gemfireCache.setProperties(gemfireProperties());
-
-		return gemfireCache;
-	}
-
-	@Bean
-	PoolFactoryBean gemfirePool(
-			@Value("${gemfire.cache.server.host:localhost}") String host,
-			@Value("${gemfire.cache.server.port:12480}") int port) { // <4>
-
-		PoolFactoryBean gemfirePool = new PoolFactoryBean();
-
-		gemfirePool.setMaxConnections(MAX_CONNECTIONS);
-		gemfirePool.setPingInterval(TimeUnit.SECONDS.toMillis(15));
-		gemfirePool.setRetryAttempts(1);
-		gemfirePool.setSubscriptionEnabled(true);
-		gemfirePool.setServerEndpoints(
-				Collections.singleton(newConnectionEndpoint(host, port)));
-
-		return gemfirePool;
-	}
-
-	@Bean
-	BeanPostProcessor gemfireCacheServerAvailabilityBeanPostProcessor(
-			@Value("${gemfire.cache.server.host:localhost}") final String host,
-			@Value("${gemfire.cache.server.port:12480}") final int port) { // <5>
+	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() {
 
-			public Object postProcessBeforeInitialization(Object bean, String beanName)
-					throws BeansException {
-				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
-					if (!waitForCacheServerToStart(host, port)) {
-						Application.this.logger.warn(
-								"No GemFire Cache Server found on [host: {}, port: {}]",
-								host, port);
-					}
-				}
+			private final AtomicBoolean checkGemFireServerIsRunning = new AtomicBoolean(true);
+			private final AtomicReference<Pool> defaultPool = new AtomicReference<Pool>(null);
 
-				return bean;
-			}
-
-			public Object postProcessAfterInitialization(Object bean, String beanName)
-					throws BeansException {
-				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
+			public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+				if (shouldCheckWhetherGemFireServerIsRunning(bean, beanName)) {
 					try {
-						Assert.state(
-								latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS),
-								String.format(
-										"GemFire Cache Server failed to start on [host: %1$s, port: %2$d]",
-										host, port));
+						validateCacheClientNotified();
+						validateCacheClientSubscriptionQueueConnectionEstablished();
 					}
 					catch (InterruptedException e) {
 						Thread.currentThread().interrupt();
@@ -200,27 +181,94 @@ public class Application {
 
 				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() { // <7>
+	public String index() { // <6>
 		return INDEX_TEMPLATE_VIEW_NAME;
 	}
 
 	@RequestMapping(method = RequestMethod.GET, path = "/ping")
 	@ResponseBody
-	public String ping() { // <8>
+	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) { // <9>
+			@RequestParam(name = "attributeValue", required = false) String value) { // <8>
 
 		modelMap.addAttribute("sessionAttributes",
-				attributes(setAttribute(updateRequestCount(session), name, value)));
+			attributes(setAttribute(updateRequestCount(session), name, value)));
 
 		return INDEX_TEMPLATE_VIEW_NAME;
 	}
@@ -230,27 +278,24 @@ public class Application {
 	@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));
+			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 (nullSafeInt(value) + 1);
+		return (nullSafeIntValue(value) + 1);
 	}
 
 	/* (non-Javadoc) */
-	int nullSafeInt(Number value) {
+	int nullSafeIntValue(Number value) {
 		return (value != null ? value.intValue() : 0);
 	}
 
 	/* (non-Javadoc) */
-	HttpSession setAttribute(HttpSession session, String attributeName,
-			String attributeValue) {
+	HttpSession setAttribute(HttpSession session, String attributeName, String attributeValue) {
 		if (isSet(attributeName, attributeValue)) {
 			session.setAttribute(attributeName, attributeValue);
 		}
@@ -269,97 +314,25 @@ public class Application {
 		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)));
+				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()
-						: new Iterator<T>() {
-					public boolean hasNext() {
-						return enumeration.hasMoreElements();
-					}
-
-					public T next() {
-						return enumeration.nextElement();
-					}
-
-					public void remove() {
-						throw new UnsupportedOperationException(
-								"Auto-generated method stub");
-					}
-				});
+					: CollectionUtils.toIterator(enumeration));
 			}
 		};
 	}
-
-	/* (non-Javadoc) */
-	boolean waitForCacheServerToStart(String host, int port) {
-		return waitForCacheServerToStart(host, port, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	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 {
-					// NOTE: this code is not intended to be an atomic, compound action (a
-					// possible race condition);
-					// opening another connection (at the expense of using system
-					// resources) after connectivity
-					// has already been established is not detrimental in this use case
-					if (!this.connected.get()) {
-						socket = new Socket(host, port);
-						this.connected.set(true);
-					}
-				}
-				catch (IOException ignore) {
-				}
-				finally {
-					GemFireUtils.close(socket);
-				}
-
-				return this.connected.get();
-			}
-		}, duration);
-	}
-
-	boolean waitOnCondition(Condition condition) {
-		return waitOnCondition(condition, DEFAULT_WAIT_DURATION);
-	}
-
-	@SuppressWarnings("all")
-	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();
-	}
-
-	interface Condition {
-		boolean evaluate();
-	}
 }

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

@@ -37,8 +37,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl
  * @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.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
  * @see com.gemstone.gemfire.cache.Cache
  * @since 1.2.1
  */
@@ -47,7 +46,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl
 @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 20) // <1>
 public class GemFireServer {
 
-	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "config";
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
 
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(GemFireServer.class);
@@ -60,25 +59,26 @@ public class GemFireServer {
 		return new PropertySourcesPlaceholderConfigurer();
 	}
 
-	String applicationName() {
-		return "samples:httpsession-gemfire-boot-"
-				.concat(GemFireServer.class.getSimpleName());
-	}
-
-	String gemfireLogLevel() {
-		return System.getProperty("gemfire.log-level", DEFAULT_GEMFIRE_LOG_LEVEL);
-	}
-
 	Properties gemfireProperties() { // <2>
 		Properties gemfireProperties = new Properties();
 
 		gemfireProperties.setProperty("name", applicationName());
-		gemfireProperties.setProperty("mcast-port", "0");
-		gemfireProperties.setProperty("log-level", gemfireLogLevel());
+		//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();
@@ -91,19 +91,18 @@ public class GemFireServer {
 
 	@Bean
 	CacheServerFactoryBean gemfireCacheServer(Cache gemfireCache,
-			@Value("${gemfire.cache.server.bind-address:localhost}") String bindAddress,
-			@Value("${gemfire.cache.server.hostname-for-clients:localhost}") String hostnameForClients,
-			@Value("${gemfire.cache.server.port:12480}") int port) { // <4>
+			@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.setCache(gemfireCache);
 		gemfireCacheServer.setBindAddress(bindAddress);
+		gemfireCacheServer.setCache(gemfireCache);
 		gemfireCacheServer.setHostNameForClients(hostnameForClients);
 		gemfireCacheServer.setMaxTimeBetweenPings(
-				Long.valueOf(TimeUnit.MINUTES.toMillis(1)).intValue());
-		gemfireCacheServer.setNotifyBySubscription(true);
+			Long.valueOf(TimeUnit.SECONDS.toMillis(60)).intValue());
 		gemfireCacheServer.setPort(port);
 
 		return gemfireCacheServer;

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

@@ -0,0 +1,186 @@
+/*
+ * 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

@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="https://www.thymeleaf.org">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="/webjars/bootstrap/2.2.2/css/bootstrap.min.css"/>
+	<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;

samples/boot/jdbc/build.gradle

@@ -1,13 +1,14 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		maven { url "https://repo.spring.io/milestone" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -18,19 +19,19 @@ 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",
-			"com.h2database:h2",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion"
+			"org.webjars:webjars-locator",
+			"com.h2database:h2"
 
-	testCompile "org.springframework.boot:spring-boot-starter-test"
+	testCompile "org.springframework.boot:spring-boot-starter-test",
+			"org.assertj:assertj-core:$assertjVersion"
 
-	integrationTestCompile gebDependencies,
-			"org.spockframework:spock-spring:$spockVersion"
+	integrationTestCompile seleniumDependencies
 
 }
 

samples/boot/jdbc/src/integration-test/java/sample/BootTests.java

@@ -0,0 +1,82 @@
+/*
+ * 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 org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.WebDriver;
+import sample.pages.HomePage;
+import sample.pages.LoginPage;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDriverBuilder;
+
+/**
+ * @author Eddú Meléndez
+ */
+@RunWith(SpringRunner.class)
+@AutoConfigureMockMvc
+@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+public class BootTests {
+
+	@Autowired
+	private MockMvc mockMvc;
+
+	private WebDriver driver;
+
+	@Before
+	public void setup() {
+		this.driver = MockMvcHtmlUnitDriverBuilder.mockMvcSetup(this.mockMvc).build();
+	}
+
+	@After
+	public void tearDown() {
+		this.driver.quit();
+	}
+
+	@Test
+	public void home() {
+		LoginPage login = HomePage.go(this.driver);
+		login.assertAt();
+		HomePage home = login.form().login(HomePage.class);
+		home.assertAt();
+	}
+
+	@Test
+	public void login() {
+		LoginPage login = HomePage.go(this.driver);
+		HomePage home = login.form().login(HomePage.class);
+		home.containCookie("SESSION");
+		home.doesNotContainCookie("JSESSIONID");
+	}
+
+	@Test
+	public void logout() {
+		LoginPage login = HomePage.go(this.driver);
+		HomePage home = login.form().login(HomePage.class);
+		login = home.logout();
+		login.assertAt();
+	}
+
+}

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

@@ -0,0 +1,41 @@
+/*
+ * 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 org.openqa.selenium.WebDriver;
+
+/**
+ * @author Eddú Meléndez
+ */
+public class BasePage {
+
+	private WebDriver driver;
+
+	public BasePage(WebDriver driver) {
+		this.driver = driver;
+	}
+
+	public WebDriver getDriver() {
+		return this.driver;
+	}
+
+	public static void get(WebDriver driver, String get) {
+		String baseUrl = "http://localhost";
+		driver.get(baseUrl + get);
+	}
+
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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.Set;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.PageFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ */
+public class HomePage extends BasePage {
+
+	public HomePage(WebDriver driver) {
+		super(driver);
+	}
+
+	public static LoginPage go(WebDriver driver) {
+		get(driver, "/");
+		return PageFactory.initElements(driver, LoginPage.class);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle()).isEqualTo("Spring Session Sample - Secured Content");
+	}
+
+	public void containCookie(String cookieName) {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").contains(cookieName);
+	}
+
+	public void doesNotContainCookie(String cookieName) {
+		Set<Cookie> cookies = getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").doesNotContain(cookieName);
+	}
+
+	public LoginPage logout() {
+		WebElement logout = getDriver().findElement(By.cssSelector("input[type=\"submit\"]"));
+		logout.click();
+		return PageFactory.initElements(getDriver(), LoginPage.class);
+	}
+
+}

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

@@ -0,0 +1,69 @@
+/*
+ * 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 org.openqa.selenium.SearchContext;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.pagefactory.DefaultElementLocatorFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Eddú Meléndez
+ * @author Rob Winch
+ */
+public class LoginPage extends BasePage {
+
+	public LoginPage(WebDriver driver) {
+		super(driver);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle()).isEqualTo("Login Page");
+	}
+
+	public Form form() {
+		return new Form(getDriver());
+	}
+
+	public class Form {
+
+		@FindBy(name = "username")
+		private WebElement username;
+
+		@FindBy(name = "password")
+		private WebElement password;
+
+		@FindBy(name = "submit")
+		private WebElement button;
+
+		public Form(SearchContext context) {
+			PageFactory.initElements(new DefaultElementLocatorFactory(context), this);
+		}
+
+		public <T> T login(Class<T> page) {
+			this.username.sendKeys("user");
+			this.password.sendKeys("password");
+			this.button.click();
+			return PageFactory.initElements(getDriver(), page);
+		}
+	}
+
+}

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

@@ -5,7 +5,7 @@
 	<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 th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap.min.css" rel="stylesheet"></link>
+		<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
 			-------------------------------------------------- */
@@ -65,11 +65,11 @@
 				margin-left: 1em;
 			}
 		</style>
-		<link th:href="@{/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/2.3.2/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
+		<link th:href="@{/webjars/bootstrap/css/bootstrap-responsive.min.css}" href="/webjars/bootstrap/css/bootstrap-responsive.min.css" rel="stylesheet"></link>
 
 		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
 		<!--[if lt IE 9]>
-			<script th:src="@{/webjars/html5shiv/3.7.3/html5shiv.min.js}" src="/webjars/html5shiv/3.7.3/html5shiv.min.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 

samples/boot/mongo/build.gradle

@@ -1,13 +1,14 @@
 buildscript {
 	repositories {
 		mavenCentral()
+		maven { url "https://repo.spring.io/milestone" }
 	}
 	dependencies {
 		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -18,19 +19,18 @@ dependencies {
 	compile project(':spring-session'),
 			"org.springframework.boot:spring-boot-starter-data-mongodb",
 			"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",
-			"de.flapdoodle.embed:de.flapdoodle.embed.mongo",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion"
+			"org.webjars:webjars-locator",
+			"de.flapdoodle.embed:de.flapdoodle.embed.mongo"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 
-	integrationTestCompile gebDependencies,
-			"org.spockframework:spock-spring:$spockVersion"
+	integrationTestCompile seleniumDependencies
 
 }
 
@@ -38,9 +38,6 @@ 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
 

samples/boot/mongo/src/integration-test/java/sample/BootTests.java

@@ -0,0 +1,104 @@
+/*
+ * 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.Set;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.openqa.selenium.By;
+import org.openqa.selenium.Cookie;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import sample.pages.HomePage;
+import sample.pages.LoginPage;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.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 Pool Dolorier
+ */
+@RunWith(SpringRunner.class)
+@AutoConfigureMockMvc
+@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
+public class BootTests {
+
+	@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 unauthenticatedUserSentToLogInPage() {
+		HomePage homePage = HomePage.go(this.driver);
+		LoginPage loginPage = homePage.unauthenticated();
+		loginPage.assertAt();
+	}
+
+	@Test
+	public void logInViewsHomePage() {
+		LoginPage loginPage = LoginPage.go(this.driver);
+		loginPage.assertAt();
+		HomePage homePage = loginPage.login("user", "password");
+		homePage.assertAt();
+		WebElement username = homePage.getDriver().findElement(By.id("un"));
+		assertThat(username.getText()).isEqualTo("user");
+		Set<Cookie> cookies = homePage.getDriver().manage().getCookies();
+		assertThat(cookies).extracting("name").contains("SESSION");
+		assertThat(cookies).extracting("name").doesNotContain("JSESSIONID");
+	}
+
+	@Test
+	public void logoutSuccess() {
+		LoginPage loginPage = LoginPage.go(this.driver);
+		HomePage homePage = loginPage.login("user", "password");
+		LoginPage successLogoutPage = homePage.logout();
+		successLogoutPage.assertAt();
+	}
+
+	@Test
+	public void loggedOutUserSentToLoginPage() {
+		LoginPage loginPage = LoginPage.go(this.driver);
+		HomePage homePage = loginPage.login("user", "password");
+		homePage.logout();
+		HomePage backHomePage = HomePage.go(this.driver);
+		LoginPage backLoginPage = backHomePage.unauthenticated();
+		backLoginPage.assertAt();
+	}
+}

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

@@ -0,0 +1,40 @@
+/*
+ * 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 org.openqa.selenium.WebDriver;
+
+/**
+ * @author Pool Dolorier
+ */
+public abstract class BasePage {
+
+	private WebDriver driver;
+
+	public BasePage(WebDriver driver) {
+		this.driver = driver;
+	}
+
+	public WebDriver getDriver() {
+		return this.driver;
+	}
+
+	public static void get(WebDriver driver, String get) {
+		String baseUrl = "http://localhost";
+		driver.get(baseUrl + get);
+	}
+}

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

@@ -0,0 +1,55 @@
+/*
+ * 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 org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Pool Dolorier
+ */
+public class HomePage extends BasePage {
+
+	@FindBy(css = "input[type='submit']")
+	private WebElement submit;
+
+	public HomePage(WebDriver driver) {
+		super(driver);
+	}
+
+	public static HomePage go(WebDriver driver) {
+		get(driver, "/");
+		return PageFactory.initElements(driver, HomePage.class);
+	}
+
+	public LoginPage unauthenticated() {
+		return  LoginPage.go(getDriver());
+	}
+
+	public LoginPage logout() {
+		this.submit.click();
+		return LoginPage.go(getDriver());
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle()).isEqualTo("Spring Session Sample - Secured Content");
+	}
+}

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

@@ -0,0 +1,59 @@
+/*
+ * 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 org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+import org.openqa.selenium.support.PageFactory;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Pool Dolorier
+ */
+public class LoginPage extends BasePage {
+
+	@FindBy(name = "username")
+	private WebElement username;
+
+	@FindBy(name = "password")
+	private WebElement password;
+
+	@FindBy(css = "input[name='submit']")
+	private WebElement submit;
+
+	public LoginPage(WebDriver driver) {
+		super(driver);
+	}
+
+	public static LoginPage go(WebDriver driver) {
+		get(driver, "/login");
+		return PageFactory.initElements(driver, LoginPage.class);
+	}
+
+	public void assertAt() {
+		assertThat(getDriver().getTitle()).isEqualTo("Login Page");
+	}
+
+	public HomePage login(String user, String password) {
+		this.username.sendKeys(user);
+		this.password.sendKeys(password);
+		this.submit.click();
+		return  HomePage.go(getDriver());
+	}
+}