Release version 1.3.0.RC1

Fixes gh-381

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,3 @@
+<!--
+Thanks for raising a Spring Session issue. Please provide a brief description of your problem along with the version of Spring Session that you are using. If possible, please also consider putting together a sample application that reproduces the issue.
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+<!--
+Thanks for contributing to Spring Session. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
+-->

.travis.yml

@@ -2,7 +2,6 @@ language: java
 
 services:
   - redis-server
-  - mongodb
 
 jdk:
   - oraclejdk8
@@ -10,10 +9,6 @@ jdk:
 os:
   - linux
 
-branches:
-  only:
-    - master
-
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:
@@ -21,4 +16,4 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
-script: ./gradlew build
+script: ./gradlew build

CONTRIBUTING.adoc

@@ -21,12 +21,6 @@ reproduces the problem.
 
 
 == Sign the Contributor License Agreement
-Before we accept a non-trivial patch or pull request we will need you to sign the
-https://support.springsource.com/spring_committer_signup[contributor's agreement].
-If you have previously signed the CLA for any project, there is no need to sign up again.
-Signing the contributor's agreement does not grant anyone commit rights to the main
-repository, but it does mean that we can accept your contributions, and you will get an
-author credit if we do.  Active contributors might be asked to join the core team, and
-given the ability to merge pull requests. Use the project `Spring Security` (the parent project)
-and '`Rob Winch`' in the project lead field when you complete the form.
+If you have not previously done so, please fill out and
+submit the https://cla.pivotal.io/sign/spring[Contributor License Agreement].
 

build.gradle

@@ -3,7 +3,8 @@ buildscript {
 		maven { url "https://repo.spring.io/plugins-release" }
 	}
 	dependencies {
-		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
+		classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.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('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
@@ -13,16 +14,18 @@ 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.4.2.RELEASE'
 ext.IDE_GRADLE = "$rootDir/gradle/ide.gradle"
 ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
 ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"
 ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
+ext.BOM_GRADLE = "$rootDir/gradle/bom.gradle"
+ext.SAMPLE_GRADLE = "$rootDir/gradle/sample.gradle"
 ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle"
 ext.TOMCAT_6_GRADLE = "$rootDir/gradle/tomcat6.gradle"
 ext.TOMCAT_7_GRADLE = "$rootDir/gradle/tomcat7.gradle"
@@ -68,4 +71,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,17 +32,19 @@ 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"
 }
 
@@ -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/',

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

@@ -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 http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

docs/src/docs/asciidoc/guides/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

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

@@ -0,0 +1,129 @@
+= Spring Session - Grails
+Eric Helgeson
+:toc:
+
+This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Grails 3.1
+
+NOTE: Grails 3.1 is based off spring boot 1.3 so much of the advanced configuration and options can be found in the boot docs as well.
+
+NOTE: The completed guide can be found in the <<grails3-sample, Grails 3 sample application>>.
+
+== Updating Dependencies
+Before you use Spring Session, you must ensure to update your dependencies.
+We assume you are working with a working Grails 3.1 web profile.
+Add the following dependencies:
+
+.build.gradle
+[source,groovy]
+[subs="verbatim,attributes"]
+----
+dependencies {
+    compile 'org.springframework.boot:spring-boot-starter-redis'
+    compile 'org.springframework.session:spring-session:{spring-session-version}'
+}
+----
+
+ifeval::["{version-snapshot}" == "true"]
+Since We are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
+Ensure you have the following in your pom.xml:
+
+.build.gradle
+[source,groovy]
+----
+repositories {
+    maven {
+        url 'https://repo.spring.io/libs-snapshot'
+    }
+}
+----
+endif::[]
+
+ifeval::["{version-milestone}" == "true"]
+Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
+Ensure you have the following in your pom.xml:
+
+.build.gradle
+[source,groovy]
+----
+repositories {
+    maven {
+        url 'https://repo.spring.io/libs-milestone'
+    }
+}
+----
+endif::[]
+
+[[grails3-redis-configuration]]
+== Configuring the Redis Connection
+
+Spring Boot automatically creates a `RedisConnectionFactory` that connects Spring Session to a Redis Server on localhost on port 6379 (default port).
+In a production environment you need to ensure to update your configuration to point to your Redis server.
+For example, you can include the following in your *application.yml*
+
+.grails-app/conf/application.yml
+[source,yml]
+----
+spring:
+  redis:
+    host: localhost
+    password: secret
+    port: 6397
+----
+
+For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
+
+[[grails3-sample]]
+== Grails 3 Sample Application
+
+The Grails 3 Sample Application demonstrates how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Grails.
+
+[[grails3-running]]
+=== Running the Grails 3 Sample Application
+
+You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
+
+[NOTE]
+====
+For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
+Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+====
+
+----
+$ ./gradlew :samples:grails3:bootRun
+----
+
+You should now be able to access the application at http://localhost:8080/test/index
+
+[[grails3-explore]]
+=== Exploring the security Sample Application
+
+Try using the application. Enter the following to log in:
+
+* **Username** _user_
+* **Password** _password_
+
+Now click the **Login** button.
+You should now see a message indicating your are logged in with the user entered previously.
+The user's information is stored in Redis rather than Tomcat's `HttpSession` implementation.
+
+[[grails3-how]]
+=== How does it work?
+
+Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
+Spring Session replaces the `HttpSession` with an implementation that is backed by Redis.
+When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Redis.
+
+When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
+Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+
+If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
+
+	$ redis-cli keys '*' | xargs redis-cli del
+
+TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+
+Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
+
+	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+
+Now visit the application at http://localhost:8080/test/index and observe that we are no longer authenticated.

docs/src/docs/asciidoc/guides/hazelcast-spring.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 http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[reference documentation].
 
@@ -88,8 +92,8 @@ For more information on configuring Hazelcast, refer to the http://docs.hazelcas
 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]
@@ -113,7 +117,7 @@ NOTE: The name of our class (Initializer) does not matter. What is important is
 
 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/httpsession-gemfire-boot.adoc

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

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

@@ -83,23 +83,23 @@ Add the following Spring Configuration:
 include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
 ----
 
-<1> First, a `Properties` bean is created to reference GemFire configuration common to both the client and server,
-stored in the `META-INF/spring/application.properties` file.
-<2> The `application.properties` are used along with the `PropertySourcesPlaceholderConfigurer` bean to replace
-placeholders in the Spring XML configuration meta-data with property values.
-<3> Spring annotation configuration support is enabled with `<context:annotation-config/>` element so that any
+<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
-http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-In this case, we are just setting GemFire's `log-level` from a sample application-specific System property, defaulting
+<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
+http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System Properties].
+In this case, we are just setting GemFire's `log-level` from a 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,8 +110,8 @@ 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:
 
@@ -124,15 +124,16 @@ include::{samples-dir}httpsession-gemfire-clientserver-xml/src/main/resources/ME
 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:
 

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

@@ -84,33 +84,26 @@ include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/Clie
 ----
 
 <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 http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-<3> Then, we configure a `Pool` of client connections to talk to the GemFire Server in our Client/Server topology. In our
+<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
 http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/client/PoolFactory.html[PoolFactory API].
-<4> After configuring a `Pool`, we create an instance of the GemFire client cache using the GemFire `Properties`
-and `Pool` to communicate with the server and perform cache data access operations.
-<5> Finally, we include a Spring `BeanPostProcessor` to block the client until our GemFire Server is up and running,
+<56> 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 http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/management/membership/ClientMembershipListener.html[ClientMembershipListener]
+The `BeanPostProcessor` uses a GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/management/membership/ClientMembershipListener.html[ClientMembershipListener]
 that will be notified when the client has successfully connected to the server. Once a connection has been established,
 the listener releases the latch that the `BeanPostProcessor` will wait on (up to the specified timeout) in the
-`postProcessAfterInitialization` callback to block the client. Either one of these approaches are sufficient
-by themselves, but both are demonstrated here to illustrate how this might work and to give you ideas, or other options
-in practice.
+`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 http://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 http://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
 with a GemFire http://gemfire.docs.pivotal.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/client/ClientRegionShortcut.html[ClientRegionShortcut]
-(default is `PROXY`).
+(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 http://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/management_all_region_types/chapter_overview.html[data management policy]
+using a GemFire http://data-docs-samples.cfapps.io/docs-gemfire/latest/javadocs/japi/com/gemstone/gemfire/cache/RegionShortcut.html[RegionShortcut]
+(default is `PARTITION`).  This attribute is only used when configuring server Regions, or when a p2p topology is employed.
 
 NOTE: It is important to note that the GemFire client Region name must match a server Region by the same name if
 the client Region is a `PROXY` or `CACHING_PROXY`.  Names are not required to match if the client Region used to
@@ -134,13 +132,13 @@ 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:
 
@@ -149,15 +147,15 @@ In this sample, we will use the following GemFire Server Java Configuration:
 include::{samples-dir}httpsession-gemfire-clientserver/src/main/java/sample/ServerConfig.java[tags=class]
 ----
 
-<1> On the server, we also configure Spring Session using the `@EnableGemFireHttpSession` annotation. For one, this
-ensures that the Region names on both the client and server match (in this sample, we use the default "_ClusteredSpringSessions_").
+<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.
 

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

@@ -0,0 +1,152 @@
+= Spring Session - Spring Boot
+Rob Winch, Vedran Pavić
+:toc:
+
+This guide describes how to use Spring Session to transparently leverage a relational database to back a web application's `HttpSession` when using Spring Boot.
+
+NOTE: The completed guide can be found in the <<httpsession-jdbc-boot-sample, httpsession-jdbc-boot sample application>>.
+
+== Updating Dependencies
+Before you use Spring Session, you must ensure to update your dependencies.
+We assume you are working with a working Spring Boot web application.
+If you are using Maven, ensure to add the following dependencies:
+
+.pom.xml
+[source,xml]
+[subs="verbatim,attributes"]
+----
+<dependencies>
+	<!-- ... -->
+
+	<dependency>
+		<groupId>org.springframework.session</groupId>
+		<artifactId>spring-session-jdbc</artifactId>
+		<version>{spring-session-version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-jdbc</artifactId>
+	</dependency>
+</dependencies>
+----
+
+ifeval::["{version-snapshot}" == "true"]
+Since we are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
+Ensure you have the following in your pom.xml:
+
+.pom.xml
+[source,xml]
+----
+<repositories>
+
+	<!-- ... -->
+
+	<repository>
+		<id>spring-snapshot</id>
+		<url>https://repo.spring.io/libs-snapshot</url>
+	</repository>
+</repositories>
+----
+endif::[]
+
+ifeval::["{version-milestone}" == "true"]
+Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
+Ensure you have the following in your pom.xml:
+
+.pom.xml
+[source,xml]
+----
+<repository>
+	<id>spring-milestone</id>
+	<url>https://repo.spring.io/libs-milestone</url>
+</repository>
+----
+endif::[]
+
+// tag::config[]
+
+[[httpsession-jdbc-boot-spring-configuration]]
+== Spring Configuration
+
+After adding the required dependencies, we can create our Spring configuration.
+The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession` implementation with an implementation backed by Spring Session.
+Add the following Spring Configuration:
+
+[source,java]
+----
+include::{samples-dir}httpsession-jdbc-boot/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.
+The filter is what is in charge of replacing the `HttpSession` implementation to be backed by Spring Session.
+In this instance Spring Session is backed by a relational database.
+
+[[httpsession-jdbc-boot-configuration]]
+== Configuring the DataSource
+
+Spring Boot automatically creates a `DataSource` that connects Spring Session to an embedded instance of H2 database.
+In a production environment you need to ensure to update your configuration to point to your relational database.
+For example, you can include the following in your *application.properties*
+
+.src/main/resources/application.properties
+----
+spring.datasource.url=jdbc:postgresql://localhost:5432/myapp
+spring.datasource.username=myapp
+spring.datasource.password=secret
+----
+
+For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-configure-datasource[Configure a DataSource] portion of the Spring Boot documentation.
+
+[[httpsession-jdbc-boot-servlet-configuration]]
+== Servlet Container Initialization
+
+Our <<httpsession-jdbc-boot-spring-configuration,Spring Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
+The `springSessionRepositoryFilter` bean is responsible for replacing the `HttpSession` with a custom implementation that is backed by Spring Session.
+
+In order for our `Filter` to do its magic, Spring needs to load our `Config` class.
+Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
+Fortunately, Spring Boot takes care of both of these steps for us.
+
+// end::config[]
+
+[[httpsession-jdbc-boot-sample]]
+== httpsession-jdbc-boot Sample Application
+
+The httpsession-jdbc-boot Sample Application demonstrates how to use Spring Session to transparently leverage H2 database to back a web application's `HttpSession` when using Spring Boot.
+
+[[httpsession-jdbc-boot-running]]
+=== Running the httpsession-jdbc-boot Sample Application
+
+You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
+
+----
+$ ./gradlew :samples:httpsession-jdbc-boot:bootRun
+----
+
+You should now be able to access the application at http://localhost:8080/
+
+[[httpsession-jdbc-boot-explore]]
+=== Exploring the security Sample Application
+
+Try using the application. Enter the following to log in:
+
+* **Username** _user_
+* **Password** _password_
+
+Now click the **Login** button.
+You should now see a message indicating your are logged in with the user entered previously.
+The user's information is stored in H2 database rather than Tomcat's `HttpSession` implementation.
+
+[[httpsession-jdbc-boot-how]]
+=== How does it work?
+
+Instead of using Tomcat's `HttpSession`, we are actually persisting the values in H2 database.
+Spring Session replaces the `HttpSession` with an implementation that is backed by a relational database.
+When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into H2 database.
+
+When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
+Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+
+If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/h2-console/ (use `jdbc:h2:mem:testdb` for JDBC URL)
+
+Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

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

@@ -85,6 +85,9 @@ The filter is what is in charge of replacing the `HttpSession` implementation to
 In this instance Spring Session is backed by a relational database.
 <2> We create a `dataSource` that connects Spring Session to an embedded instance of H2 database.
 We configure the H2 database to create database tables using the SQL script which is included in Spring Session.
+<3> We create a `transactionManager` that manages transactions for previously configured `dataSource`.
+
+For additional information on how to configure data access related concerns, please refer to the http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
 
 == XML Servlet Container Initialization
 
@@ -154,6 +157,6 @@ Instead of using Tomcat's `HttpSession`, we are actually persisting the values i
 Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
 Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
 
-If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/console (use `jdbc:h2:mem:testdb` for JDBC URL)
+If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/h2-console/ (use `jdbc:h2:mem:testdb` for JDBC URL)
 
 Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

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

@@ -83,6 +83,9 @@ The filter is what is in charge of replacing the `HttpSession` implementation to
 In this instance Spring Session is backed by a relational database.
 <2> We create a `dataSource` that connects Spring Session to an embedded instance of H2 database.
 We configure the H2 database to create database tables using the SQL script which is included in Spring Session.
+<3> We create a `transactionManager` that manages transactions for previously configured `dataSource`.
+
+For additional information on how to configure data access related concerns, please refer to the http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
 
 == Java Servlet Container Initialization
 
@@ -144,6 +147,6 @@ Instead of using Tomcat's `HttpSession`, we are actually persisting the values i
 Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
 Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
 
-If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/console (use `jdbc:h2:mem:testdb` for JDBC URL)
+If you like, you can easily remove the session using H2 web console available at: http://localhost:8080/h2-console/ (use `jdbc:h2:mem:testdb` for JDBC URL)
 
 Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

docs/src/docs/asciidoc/guides/httpsession-xml.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>
@@ -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 http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

docs/src/docs/asciidoc/guides/httpsession.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>
@@ -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 http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

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

@@ -122,12 +122,6 @@ The Mongo Sample Application demonstrates how to use Spring Session to transpare
 
 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
 
-[NOTE]
-====
-For the sample to work, you must have MongoDB on localhost and run it with the default port (27017).
-Alternatively you can use docker to run local instance `docker run -p 27017:27017 mongo`
-====
-
 ----
 $ ./gradlew :samples:mongo:bootRun
 ----
@@ -156,9 +150,15 @@ When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityCon
 When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
 Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
 
-If you like, you can easily remove the session using mongo client. For example, on a Linux based system you can type:
+If you like, you can easily inspect the session using mongo client. For example, on a Linux based system you can type:
 
-	$ mongo
+[NOTE]
+====
+The sample application uses an embedded MongoDB instance that listens on a randomly allocated port.
+The port used by embedded MongoDB together with exact command to connect to it is logged during application startup.
+====
+
+	$ mongo --port ...
 	> use test
 	> db.sessions.find().pretty()
 

docs/src/docs/asciidoc/guides/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>
@@ -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 http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----
@@ -160,7 +165,7 @@ Specifically, we notice the following things about our response:
 * 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 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"
 

docs/src/docs/asciidoc/guides/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>
 ----
@@ -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 http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

docs/src/docs/asciidoc/guides/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 http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

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

@@ -85,7 +85,7 @@ include::{samples-dir}websocket/src/main/java/sample/config/WebSecurityConfig.ja
 [NOTE]
 ====
 For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
+Alternatively, you can update the `LettuceConnectionFactory` to point to a Redis server.
 ====
 
 ----

docs/src/docs/asciidoc/index.adoc

@@ -1,3 +1,4 @@
+
 = Spring Session
 Rob Winch, Vedran Pavić, Jakub Kubrynski
 :doctype: book
@@ -26,9 +27,11 @@ Additional features include:
 
 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.
 
+* Added https://github.com/maseev/spring-session-orientdb[OrientDB Community Extension]
 * 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])
 
 [[samples]]
@@ -48,6 +51,10 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store 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)]
 | 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]
@@ -72,6 +79,10 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session with Spring Boot.
 | link:guides/boot.html[Spring Boot Guide]
 
+| {gh-samples-url}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]
@@ -114,6 +125,10 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a 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]]
@@ -272,6 +287,7 @@ You can choose from enabling this using either:
 
 * <<httpsession-jdbc-jc,Java Based Configuration>>
 * <<httpsession-jdbc-xml,XML Based Configuration>>
+* <<httpsession-jdbc-boot,Spring Boot Based Configuration>>
 
 [[httpsession-jdbc-jc]]
 ==== JDBC Java Based Configuration
@@ -293,6 +309,16 @@ You can read the basic steps for integration below, but you are encouraged to fo
 
 include::guides/httpsession-jdbc-xml.adoc[tags=config,leveloffset=+3]
 
+[[httpsession-jdbc-boot]]
+==== JDBC Spring Boot Based Configuration
+
+This section describes how to use a relational database to back `HttpSession` when using Spring Boot.
+
+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]
+
 [[httpsession-mongo]]
 === HttpSession with Mongo
 
@@ -344,6 +370,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/hazelcast-spring.adoc[tags=config,leveloffset=+2]
+
 [[httpsession-how]]
 === How HttpSession Integration Works
 
@@ -481,6 +519,75 @@ Before using WebSocket integration, you should be sure that you have <<httpsessi
 
 include::guides/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 http://docs.spring.io/spring-security/site/docs/4.2.x/reference/htmlsingle/#remember-me[Spring Security's Remember-Me Authentication].
+The support will:
+
+* Change the session expiration length
+* 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
 
@@ -586,44 +693,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 http://hazelcast.org/[Hazelcast] as your backing source for the `SessionRepository`, then the `@EnableHazelcastHttpSession` annotation
-can be added to an `@Configuration` class. This extends the functionality provided by the `@EnableSpringHttpSession` annotation but makes the `SessionRepository` for you in Hazelcast.
-You must provide a single `HazelcastInstance` bean for the configuration to work.
-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 http://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
 
@@ -813,7 +882,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]
 ----
@@ -992,7 +1061,7 @@ A typical example of how to create a new instance can be seen below:
 include::{indexdoc-tests}[tags=new-jdbcoperationssessionrepository]
 ----
 
-For additional information on how to create and configure a `JdbcTemplate`, refer to the Spring Framework Reference Documentation.
+For additional information on how to create and configure `JdbcTemplate` and `PlatformTransactionManager`, refer to the http://docs.spring.io/spring/docs/current/spring-framework-reference/html/spring-data-tier.html[Spring Framework Reference Documentation].
 
 [[api-jdbcoperationssessionrepository-config]]
 ==== EnableJdbcHttpSession
@@ -1017,7 +1086,9 @@ However, you can override the default `ConversionService` by providing a Bean na
 [[api-jdbcoperationssessionrepository-storage]]
 ==== Storage Details
 
-By default, this implementation uses `SPRING_SESSION` table to store sessions. Note that the table name can be easily customized as already described.
+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.
@@ -1036,6 +1107,59 @@ And with MySQL database:
 include::{session-main-resources-dir}org/springframework/session/jdbc/schema-mysql.sql[]
 ----
 
+==== Transaction management
+
+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 http://docs.hazelcast.org/docs/latest/manual/html-single/index.html#hazelcast-configuration[Hazelcast documentation].
+
+[[api-enablehazelcasthttpsession]]
+==== EnableHazelcastHttpSession
+
+If you wish to use http://hazelcast.org/[Hazelcast] as your backing source for the `SessionRepository`, then the `@EnableHazelcastHttpSession` annotation
+can be added to an `@Configuration` class. This extends the functionality provided by the `@EnableSpringHttpSession` annotation but makes the `SessionRepository` for you in Hazelcast.
+You must provide a single `HazelcastInstance` bean for the configuration to work.
+Complete configuration example can be found in the <<samples>>
+
+[[api-enablehazelcasthttpsession-storage]]
+==== Storage Details
+
+Sessions will be stored in a distributed `IMap` in Hazelcast using a <<api-mapsessionrepository,MapSessionRepository>>.
+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.
+
+[[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`.
+
 [[community]]
 == Spring Session Community
 
@@ -1068,6 +1192,10 @@ We appreciate https://help.github.com/articles/using-pull-requests/[Pull Request
 
 Spring Session is Open Source software released under the http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
 
+[[community-extensions]]
+=== Community Extensions
+https://github.com/maseev/spring-session-orientdb[Spring Session OrientDB]
+
 [[minimum-requirements]]
 == Minimum Requirements
 

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

@@ -115,9 +115,7 @@ public class HttpSessionGemFireIndexingITests extends AbstractGemFireIntegration
 			CacheFactoryBean gemfireCache = new CacheFactoryBean();
 
 			gemfireCache.setClose(true);
-			gemfireCache.setLazyInitialize(false);
 			gemfireCache.setProperties(gemfireProperties());
-			gemfireCache.setUseBeanFactoryLocator(false);
 
 			return gemfireCache;
 		}

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

@@ -50,9 +50,7 @@ public class GemFireHttpSessionConfig {
 		CacheFactoryBean gemfireCache = new CacheFactoryBean();
 
 		gemfireCache.setClose(true);
-		gemfireCache.setLazyInitialize(false);
 		gemfireCache.setProperties(gemfireProperties());
-		gemfireCache.setUseBeanFactoryLocator(false);
 
 		return gemfireCache;
 	}

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

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

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

@@ -16,18 +16,26 @@
 
 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;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -102,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[]
@@ -124,11 +132,34 @@ public class IndexDocTests {
 
 		// ... configure JdbcTemplate ...
 
+		PlatformTransactionManager transactionManager = new DataSourceTransactionManager();
+
+		// ... configure transactionManager ...
+
 		SessionRepository<? extends ExpiringSession> repository =
-				new JdbcOperationsSessionRepository(jdbcTemplate);
+				new JdbcOperationsSessionRepository(jdbcTemplate, transactionManager);
 		// 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.security;
+
+import 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.security;
+
+import java.util.concurrent.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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.security;
+
+import java.util.concurrent.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,52 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package docs.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
+	FindByIndexNameSessionRepository<ExpiringSession> sessionRepository;
+
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			// other config goes here...
+			.sessionManagement()
+				.maximumSessions(2)
+				.sessionRegistry(sessionRegistry());
+	}
+
+	@Bean
+	SpringSessionBackedSessionRegistry sessionRegistry() {
+		return new SpringSessionBackedSessionRegistry(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 http://www.springframework.org/schema/security/spring-security.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+	<!-- tag::config[] -->
+	<security:http>
+		<!-- ... -->
+		<security:form-login />
+		<security:remember-me services-ref="rememberMeServices"/>
+	</security:http>
+
+	<bean id="rememberMeServices"
+		class="org.springframework.session.security.web.authentication.SpringSessionRememberMeServices"
+		p:alwaysRemember="true"/>
+	<!-- end::config[] -->
+
+
+	<security:user-service>
+		<security:user name="user" password="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 http://www.springframework.org/schema/beans/spring-beans.xsd
+						   http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
+
+	<!-- tag::config[] -->
+	<security:http>
+		<!-- 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,23 +1,30 @@
+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.0.RC1
-springDataRedisVersion=1.6.2.RELEASE
+version=1.3.0.RC1
+springDataRedisVersion=1.7.1.RELEASE
+html5ShivVersion=3.7.3
+commonsLoggingVersion=1.2
 junitVersion=4.12
+lettuceVersion=3.5.0.Final
 gebVersion=0.13.1
 mockitoVersion=1.10.19
-hazelcastVersion=3.5.4
+hazelcastVersion=3.6.5
 seleniumVersion=2.52.0
-springSecurityVersion=4.0.3.RELEASE
-springVersion=4.2.5.RELEASE
+springDataGeodeVersion=1.0.0.APACHE-GEODE-INCUBATING-M2
+springSecurityVersion=4.2.0.RELEASE
+springVersion=4.3.4.RELEASE
 httpClientVersion=4.5.1
-jedisVersion=2.7.3
-springDataMongoVersion=1.8.2.RELEASE
+jedisVersion=2.8.1
+h2Version=1.4.192
+springDataMongoVersion=1.9.4.RELEASE
 springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.7.4.RELEASE
-assertjVersion=2.3.0
+springDataGemFireVersion=1.8.5.RELEASE
+assertjVersion=2.5.0
 spockVersion=1.0-groovy-2.4
+webjarsTaglibVersion=0.3
 jstlVersion=1.2.1
 groovyVersion=2.4.4

gradle/bom.gradle

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

gradle/ide.gradle

@@ -45,6 +45,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-BUILD-SNAPSHOT'
 
 ext.spockDependencies = [
 		dependencies.create("org.spockframework:spock-core:$spockVersion") {

gradle/sample.gradle

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

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
@@ -61,4 +60,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
+#Fri Nov 11 19:46:57 CET 2016
 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.1-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/build.gradle

@@ -7,11 +7,10 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
+apply from: SAMPLE_GRADLE
 
 group = 'samples'
 
@@ -20,9 +19,12 @@ dependencies {
 			"org.springframework.boot:spring-boot-starter-redis",
 			"org.springframework.boot:spring-boot-starter-web",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
+			"org.springframework.boot:spring-boot-starter-security",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion"
+			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
+			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:html5shiv:$html5ShivVersion",
+			"org.webjars:webjars-locator"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 
@@ -50,4 +52,4 @@ def reservePort() {
 	def result = socket.localPort
 	socket.close()
 	result
-}
+}

samples/boot/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="@{/resources/css/bootstrap.css}" href="../static/css/bootstrap.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="@{resources/css/bootstrap-responsive.css}" href="/static/css/bootstrap-responsive.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 src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 

samples/custom-cookie/build.gradle

@@ -1,14 +1,15 @@
 apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarqube {
-	skipProject = true
-}
+apply from: SAMPLE_GRADLE
 
 dependencies {
-	compile project(':spring-session-data-redis'),
-			"org.springframework:spring-web:$springVersion",
+	compile(project(':spring-session-data-redis')) {
+		exclude module: 'jedis'
+	}
+	compile "org.springframework:spring-web:$springVersion",
+			"biz.paluch.redis:lettuce:$lettuceVersion",
+			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
@@ -16,4 +17,4 @@ dependencies {
 	testCompile "junit:junit:$junitVersion"
 
 	integrationTestCompile gebDependencies
-}
+}

samples/custom-cookie/src/main/java/sample/Config.java

@@ -17,7 +17,7 @@
 package sample;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.web.http.CookieSerializer;
 import org.springframework.session.web.http.DefaultCookieSerializer;
@@ -26,8 +26,8 @@ import org.springframework.session.web.http.DefaultCookieSerializer;
 public class Config {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory();
 	}
 
 	// tag::cookie-serializer[]

samples/custom-cookie/src/main/webapp/index.jsp

@@ -1,9 +1,11 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Session Attributes</title>
-	<link rel="stylesheet" href="assets/bootstrap.min.css">
+	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
+	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;

samples/findbyusername/build.gradle

@@ -7,11 +7,10 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
+apply from: SAMPLE_GRADLE
 
 group = 'samples'
 
@@ -19,10 +18,13 @@ dependencies {
 	compile project(':spring-session'),
 			"org.springframework.boot:spring-boot-starter-redis",
 			"org.springframework.boot:spring-boot-starter-web",
+			"org.springframework.boot:spring-boot-starter-security",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion",
+			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
+			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:html5shiv:$html5ShivVersion",
+			"org.webjars:webjars-locator",
 			"com.maxmind.geoip2:geoip2:2.3.1",
 			"org.apache.httpcomponents:httpclient"
 
@@ -53,4 +55,4 @@ def reservePort() {
 	def result = socket.localPort
 	socket.close()
 	result
-}
+}

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

@@ -32,7 +32,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
 	@Override
 	protected void configure(HttpSecurity http) throws Exception {
 		http.formLogin().loginPage("/login").permitAll().and().authorizeRequests()
-				.antMatchers("/resources/**").permitAll().anyRequest().authenticated()
+				.antMatchers("/resources/**", "/webjars/**").permitAll().anyRequest().authenticated()
 				.and().logout().permitAll();
 	}
 	// end::config[]

samples/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="@{/resources/css/bootstrap.css}" href="../static/css/bootstrap.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="@{resources/css/bootstrap-responsive.css}" href="/static/css/bootstrap-responsive.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 src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+			<script th:src="@{/webjars/html5shiv/html5shiv.min.js}" src="/webjars/html5shiv/html5shiv.min.js"></script>
 		<![endif]-->
 	</head>
 
@@ -119,4 +119,4 @@
 			</div>
 		</div>
 	</body>
-</html>
+</html>

samples/grails3/build.gradle

@@ -0,0 +1,70 @@
+buildscript {
+	ext {
+		grailsVersion = project.grailsVersion
+	}
+	repositories {
+		mavenLocal()
+		maven { url "https://repo.grails.org/grails/core" }
+	}
+	dependencies {
+		classpath "org.grails:grails-gradle-plugin:$grailsVersion"
+		classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.5.0"
+		classpath "org.grails.plugins:hibernate4:5.0.2"
+	}
+}
+
+apply plugin: "eclipse"
+apply plugin: "idea"
+apply plugin: "war"
+apply plugin: "org.grails.grails-web"
+apply plugin: "org.grails.grails-gsp"
+apply plugin: "asset-pipeline"
+apply from: SAMPLE_GRADLE
+
+ext {
+	grailsVersion = project.grailsVersion
+}
+
+repositories {
+	mavenLocal()
+	maven { url "https://repo.grails.org/grails/core" }
+}
+
+dependencyManagement {
+	imports {
+		mavenBom "org.grails:grails-bom:$grailsVersion"
+	}
+	applyMavenExclusions false
+}
+
+dependencies {
+	compile "org.springframework.boot:spring-boot-starter-logging"
+	compile "org.springframework.boot:spring-boot-autoconfigure"
+	compile "org.grails:grails-core"
+	compile "org.springframework.boot:spring-boot-starter-actuator"
+	compile "org.springframework.boot:spring-boot-starter-tomcat"
+	compile "org.grails:grails-dependencies"
+	compile "org.grails:grails-web-boot"
+	compile "org.grails.plugins:cache"
+	compile "org.grails.plugins:scaffolding"
+	compile "org.grails.plugins:hibernate4"
+	compile "org.hibernate:hibernate-ehcache"
+	console "org.grails:grails-console"
+	profile "org.grails.profiles:web:3.1.4"
+	runtime "org.grails.plugins:asset-pipeline"
+	runtime "com.h2database:h2"
+	testCompile "org.grails:grails-plugin-testing"
+	testCompile "org.grails.plugins:geb"
+	testRuntime "org.seleniumhq.selenium:selenium-htmlunit-driver:2.47.1"
+	testRuntime "net.sourceforge.htmlunit:htmlunit:2.18"
+
+	compile "org.springframework.boot:spring-boot-starter-redis"
+	compile 'org.springframework.session:spring-session:1.1.1.RELEASE'
+
+	compile 'org.grails.plugins:spring-security-core:3.0.4'
+}
+
+assets {
+	minifyJs = true
+	minifyCss = true
+}

samples/grails3/gradle.properties

@@ -0,0 +1 @@
+grailsVersion=3.1.4

samples/grails3/grails-app/conf/application.groovy

@@ -0,0 +1,28 @@
+
+
+// Added by the Spring Security Core plugin:
+grails.plugin.springsecurity.userLookup.userDomainClassName = 'grails3.redis.session.User'
+grails.plugin.springsecurity.userLookup.authorityJoinClassName = 'grails3.redis.session.UserRole'
+grails.plugin.springsecurity.authority.className = 'grails3.redis.session.Role'
+grails.plugin.springsecurity.controllerAnnotations.staticRules = [
+	[pattern: '/',               access: ['permitAll']],
+	[pattern: '/error',          access: ['permitAll']],
+	[pattern: '/index',          access: ['permitAll']],
+	[pattern: '/index.gsp',      access: ['permitAll']],
+	[pattern: '/shutdown',       access: ['permitAll']],
+	[pattern: '/assets/**',      access: ['permitAll']],
+	[pattern: '/**/js/**',       access: ['permitAll']],
+	[pattern: '/**/css/**',      access: ['permitAll']],
+	[pattern: '/**/images/**',   access: ['permitAll']],
+	[pattern: '/**/favicon.ico', access: ['permitAll']]
+]
+
+grails.plugin.springsecurity.filterChain.chainMap = [
+	[pattern: '/assets/**',      filters: 'none'],
+	[pattern: '/**/js/**',       filters: 'none'],
+	[pattern: '/**/css/**',      filters: 'none'],
+	[pattern: '/**/images/**',   filters: 'none'],
+	[pattern: '/**/favicon.ico', filters: 'none'],
+	[pattern: '/**',             filters: 'JOINED_FILTERS']
+]
+

samples/grails3/grails-app/conf/application.yml

@@ -0,0 +1,122 @@
+---
+hibernate:
+    cache:
+        queries: false
+        use_second_level_cache: true
+        use_query_cache: false
+        region.factory_class: 'org.hibernate.cache.ehcache.EhCacheRegionFactory'
+
+dataSource:
+    pooled: true
+    jmxExport: true
+    driverClassName: org.h2.Driver
+    username: sa
+    password:
+
+environments:
+    development:
+        dataSource:
+            dbCreate: create-drop
+            url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+    test:
+        dataSource:
+            dbCreate: update
+            url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+    production:
+        dataSource:
+            dbCreate: update
+            url: jdbc:h2:./prodDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
+            properties:
+                jmxEnabled: true
+                initialSize: 5
+                maxActive: 50
+                minIdle: 5
+                maxIdle: 25
+                maxWait: 10000
+                maxAge: 600000
+                timeBetweenEvictionRunsMillis: 5000
+                minEvictableIdleTimeMillis: 60000
+                validationQuery: SELECT 1
+                validationQueryTimeout: 3
+                validationInterval: 15000
+                testOnBorrow: true
+                testWhileIdle: true
+                testOnReturn: false
+                jdbcInterceptors: ConnectionState
+                defaultTransactionIsolation: 2 # TRANSACTION_READ_COMMITTED
+
+---
+---
+grails:
+    profile: web
+    codegen:
+        defaultPackage: grails3.redis.session
+    spring:
+        transactionManagement:
+            proxies: false
+info:
+    app:
+        name: '@info.app.name@'
+        version: '@info.app.version@'
+        grailsVersion: '@info.app.grailsVersion@'
+spring:
+
+    groovy:
+        template:
+            check-template-location: false
+
+---
+grails:
+    mime:
+        disable:
+            accept:
+                header:
+                    userAgents:
+                        - Gecko
+                        - WebKit
+                        - Presto
+                        - Trident
+        types:
+            all: '*/*'
+            atom: application/atom+xml
+            css: text/css
+            csv: text/csv
+            form: application/x-www-form-urlencoded
+            html:
+              - text/html
+              - application/xhtml+xml
+            js: text/javascript
+            json:
+              - application/json
+              - text/json
+            multipartForm: multipart/form-data
+            pdf: application/pdf
+            rss: application/rss+xml
+            text: text/plain
+            hal:
+              - application/hal+json
+              - application/hal+xml
+            xml:
+              - text/xml
+              - application/xml
+    urlmapping:
+        cache:
+            maxsize: 1000
+    controllers:
+        defaultScope: singleton
+    converters:
+        encoding: UTF-8
+    views:
+        default:
+            codec: html
+        gsp:
+            encoding: UTF-8
+            htmlcodec: xml
+            codecs:
+                expression: html
+                scriptlets: html
+                taglib: none
+                staticparts: none
+endpoints:
+    jmx:
+        unique-names: true

samples/grails3/grails-app/conf/logback.groovy

@@ -0,0 +1,23 @@
+import grails.util.BuildSettings
+import grails.util.Environment
+
+// See http://logback.qos.ch/manual/groovy.html for details on configuration
+appender('STDOUT', ConsoleAppender) {
+    encoder(PatternLayoutEncoder) {
+        pattern = "%level %logger - %msg%n"
+    }
+}
+
+root(ERROR, ['STDOUT'])
+
+def targetDir = BuildSettings.TARGET_DIR
+if (Environment.isDevelopmentMode() && targetDir) {
+    appender("FULL_STACKTRACE", FileAppender) {
+        file = "${targetDir}/stacktrace.log"
+        append = true
+        encoder(PatternLayoutEncoder) {
+            pattern = "%level %logger - %msg%n"
+        }
+    }
+    logger("StackTrace", ERROR, ['FULL_STACKTRACE'], false)
+}

samples/grails3/grails-app/conf/spring/resources.groovy

@@ -0,0 +1,3 @@
+// Place your Spring DSL code here
+beans = {
+}

samples/grails3/grails-app/controllers/grails3/redis/session/TestController.groovy

@@ -0,0 +1,8 @@
+package grails3.redis.session
+
+import grails.plugin.springsecurity.annotation.Secured
+
+class TestController {
+  @Secured('ROLE_ADMIN')
+  def index() { } // Renders `test/index.gsp`
+}

samples/grails3/grails-app/controllers/grails3/redis/session/UrlMappings.groovy

@@ -0,0 +1,16 @@
+package grails3.redis.session
+
+class UrlMappings {
+
+    static mappings = {
+        "/$controller/$action?/$id?(.$format)?"{
+            constraints {
+                // apply constraints here
+            }
+        }
+
+        "/"(view:"/index")
+        "500"(view:'/error')
+        "404"(view:'/notFound')
+    }
+}

samples/grails3/grails-app/domain/grails3/redis/session/Role.groovy

@@ -0,0 +1,26 @@
+package grails3.redis.session
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+@EqualsAndHashCode(includes='authority')
+@ToString(includes='authority', includeNames=true, includePackage=false)
+class Role implements Serializable {
+
+	private static final long serialVersionUID = 1
+
+	String authority
+
+	Role(String authority) {
+		this()
+		this.authority = authority
+	}
+
+	static constraints = {
+		authority blank: false, unique: true
+	}
+
+	static mapping = {
+		cache true
+	}
+}

samples/grails3/grails-app/domain/grails3/redis/session/User.groovy

@@ -0,0 +1,55 @@
+package grails3.redis.session
+
+import groovy.transform.EqualsAndHashCode
+import groovy.transform.ToString
+
+@EqualsAndHashCode(includes='username')
+@ToString(includes='username', includeNames=true, includePackage=false)
+class User implements Serializable {
+
+	private static final long serialVersionUID = 1
+
+	transient springSecurityService
+
+	String username
+	String password
+	boolean enabled = true
+	boolean accountExpired
+	boolean accountLocked
+	boolean passwordExpired
+
+	User(String username, String password) {
+		this()
+		this.username = username
+		this.password = password
+	}
+
+	Set<Role> getAuthorities() {
+		UserRole.findAllByUser(this)*.role
+	}
+
+	def beforeInsert() {
+		encodePassword()
+	}
+
+	def beforeUpdate() {
+		if (isDirty('password')) {
+			encodePassword()
+		}
+	}
+
+	protected void encodePassword() {
+		password = springSecurityService?.passwordEncoder ? springSecurityService.encodePassword(password) : password
+	}
+
+	static transients = ['springSecurityService']
+
+	static constraints = {
+		password blank: false, password: true
+		username blank: false, unique: true
+	}
+
+	static mapping = {
+		password column: '`password`'
+	}
+}

samples/grails3/grails-app/domain/grails3/redis/session/UserRole.groovy

@@ -0,0 +1,103 @@
+package grails3.redis.session
+
+import grails.gorm.DetachedCriteria
+import groovy.transform.ToString
+
+import org.apache.commons.lang.builder.HashCodeBuilder
+
+@ToString(cache=true, includeNames=true, includePackage=false)
+class UserRole implements Serializable {
+
+	private static final long serialVersionUID = 1
+
+	User user
+	Role role
+
+	UserRole(User u, Role r) {
+		this()
+		user = u
+		role = r
+	}
+
+	@Override
+	boolean equals(other) {
+		if (!(other instanceof UserRole)) {
+			return false
+		}
+
+		other.user?.id == user?.id && other.role?.id == role?.id
+	}
+
+	@Override
+	int hashCode() {
+		def builder = new HashCodeBuilder()
+		if (user) builder.append(user.id)
+		if (role) builder.append(role.id)
+		builder.toHashCode()
+	}
+
+	static UserRole get(long userId, long roleId) {
+		criteriaFor(userId, roleId).get()
+	}
+
+	static boolean exists(long userId, long roleId) {
+		criteriaFor(userId, roleId).count()
+	}
+
+	private static DetachedCriteria criteriaFor(long userId, long roleId) {
+		UserRole.where {
+			user == User.load(userId) &&
+			role == Role.load(roleId)
+		}
+	}
+
+	static UserRole create(User user, Role role, boolean flush = false) {
+		def instance = new UserRole(user: user, role: role)
+		instance.save(flush: flush, insert: true)
+		instance
+	}
+
+	static boolean remove(User u, Role r, boolean flush = false) {
+		if (u == null || r == null) return false
+
+		int rowCount = UserRole.where { user == u && role == r }.deleteAll()
+
+		if (flush) { UserRole.withSession { it.flush() } }
+
+		rowCount
+	}
+
+	static void removeAll(User u, boolean flush = false) {
+		if (u == null) return
+
+		UserRole.where { user == u }.deleteAll()
+
+		if (flush) { UserRole.withSession { it.flush() } }
+	}
+
+	static void removeAll(Role r, boolean flush = false) {
+		if (r == null) return
+
+		UserRole.where { role == r }.deleteAll()
+
+		if (flush) { UserRole.withSession { it.flush() } }
+	}
+
+	static constraints = {
+		role validator: { Role r, UserRole ur ->
+			if (ur.user == null || ur.user.id == null) return
+			boolean existing = false
+			UserRole.withNewSession {
+				existing = UserRole.exists(ur.user.id, r.id)
+			}
+			if (existing) {
+				return 'userRole.exists'
+			}
+		}
+	}
+
+	static mapping = {
+		id composite: ['user', 'role']
+		version false
+	}
+}

samples/grails3/grails-app/i18n/messages.properties

@@ -0,0 +1,56 @@
+default.doesnt.match.message=Property [{0}] of class [{1}] with value [{2}] does not match the required pattern [{3}]
+default.invalid.url.message=Property [{0}] of class [{1}] with value [{2}] is not a valid URL
+default.invalid.creditCard.message=Property [{0}] of class [{1}] with value [{2}] is not a valid credit card number
+default.invalid.email.message=Property [{0}] of class [{1}] with value [{2}] is not a valid e-mail address
+default.invalid.range.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid range from [{3}] to [{4}]
+default.invalid.size.message=Property [{0}] of class [{1}] with value [{2}] does not fall within the valid size range from [{3}] to [{4}]
+default.invalid.max.message=Property [{0}] of class [{1}] with value [{2}] exceeds maximum value [{3}]
+default.invalid.min.message=Property [{0}] of class [{1}] with value [{2}] is less than minimum value [{3}]
+default.invalid.max.size.message=Property [{0}] of class [{1}] with value [{2}] exceeds the maximum size of [{3}]
+default.invalid.min.size.message=Property [{0}] of class [{1}] with value [{2}] is less than the minimum size of [{3}]
+default.invalid.validator.message=Property [{0}] of class [{1}] with value [{2}] does not pass custom validation
+default.not.inlist.message=Property [{0}] of class [{1}] with value [{2}] is not contained within the list [{3}]
+default.blank.message=Property [{0}] of class [{1}] cannot be blank
+default.not.equal.message=Property [{0}] of class [{1}] with value [{2}] cannot equal [{3}]
+default.null.message=Property [{0}] of class [{1}] cannot be null
+default.not.unique.message=Property [{0}] of class [{1}] with value [{2}] must be unique
+
+default.paginate.prev=Previous
+default.paginate.next=Next
+default.boolean.true=True
+default.boolean.false=False
+default.date.format=yyyy-MM-dd HH:mm:ss z
+default.number.format=0
+
+default.created.message={0} {1} created
+default.updated.message={0} {1} updated
+default.deleted.message={0} {1} deleted
+default.not.deleted.message={0} {1} could not be deleted
+default.not.found.message={0} not found with id {1}
+default.optimistic.locking.failure=Another user has updated this {0} while you were editing
+
+default.home.label=Home
+default.list.label={0} List
+default.add.label=Add {0}
+default.new.label=New {0}
+default.create.label=Create {0}
+default.show.label=Show {0}
+default.edit.label=Edit {0}
+
+default.button.create.label=Create
+default.button.edit.label=Edit
+default.button.update.label=Update
+default.button.delete.label=Delete
+default.button.delete.confirm.message=Are you sure?
+
+# Data binding errors. Use "typeMismatch.$className.$propertyName to customize (eg typeMismatch.Book.author)
+typeMismatch.java.net.URL=Property {0} must be a valid URL
+typeMismatch.java.net.URI=Property {0} must be a valid URI
+typeMismatch.java.util.Date=Property {0} must be a valid Date
+typeMismatch.java.lang.Double=Property {0} must be a valid number
+typeMismatch.java.lang.Integer=Property {0} must be a valid number
+typeMismatch.java.lang.Long=Property {0} must be a valid number
+typeMismatch.java.lang.Short=Property {0} must be a valid number
+typeMismatch.java.math.BigDecimal=Property {0} must be a valid number
+typeMismatch.java.math.BigInteger=Property {0} must be a valid number
+typeMismatch=Property {0} is type-mismatched

samples/grails3/grails-app/init/BootStrap.groovy

@@ -0,0 +1,24 @@
+import grails3.redis.session.*
+
+class BootStrap {
+
+    def init = { servletContext ->
+      def adminRole = new Role('ROLE_ADMIN').save()
+      def userRole = new Role('ROLE_USER').save()
+
+      def testUser = new User('user', 'password').save()
+
+      UserRole.create testUser, adminRole
+
+      UserRole.withSession {
+         it.flush()
+         it.clear()
+      }
+
+      assert User.count() == 1
+      assert Role.count() == 2
+      assert UserRole.count() == 1
+    }
+    def destroy = {
+    }
+}

samples/grails3/grails-app/init/grails3/redis/session/Application.groovy

@@ -0,0 +1,10 @@
+package grails3.redis.session
+
+import grails.boot.GrailsApp
+import grails.boot.config.GrailsAutoConfiguration
+
+class Application extends GrailsAutoConfiguration {
+    static void main(String[] args) {
+        GrailsApp.run(Application, args)
+    }
+}

samples/grails3/grails-app/views/error.gsp

@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+    <head>
+        <title><g:if env="development">Grails Runtime Exception</g:if><g:else>Error</g:else></title>
+        <meta name="layout" content="main">
+        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
+    </head>
+    <body>
+        <g:if env="development">
+            <g:if test="${Throwable.isInstance(exception)}">
+                <g:renderException exception="${exception}" />
+            </g:if>
+            <g:elseif test="${request.getAttribute('javax.servlet.error.exception')}">
+                <g:renderException exception="${request.getAttribute('javax.servlet.error.exception')}" />
+            </g:elseif>
+            <g:else>
+                <ul class="errors">
+                    <li>An error has occurred</li>
+                    <li>Exception: ${exception}</li>
+                    <li>Message: ${message}</li>
+                    <li>Path: ${path}</li>
+                </ul>
+            </g:else>
+        </g:if>
+        <g:else>
+            <ul class="errors">
+                <li>An error has occurred</li>
+            </ul>
+        </g:else>
+    </body>
+</html>

samples/grails3/grails-app/views/index.gsp

@@ -0,0 +1,8 @@
+<html>
+<head>
+  <title>Index</title>
+</head>
+<body>
+  Left blank, goto <a href="/test">test</a>
+</body>
+</html>

samples/grails3/grails-app/views/notFound.gsp

@@ -0,0 +1,14 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Page Not Found</title>
+        <meta name="layout" content="main">
+        <g:if env="development"><asset:stylesheet src="errors.css"/></g:if>
+    </head>
+    <body>
+        <ul class="errors">
+            <li>Error: Page Not Found (404)</li>
+            <li>Path: ${request.forwardURI}</li>
+        </ul>
+    </body>
+</html>

samples/grails3/grails-app/views/test/index.gsp

@@ -0,0 +1,16 @@
+<html>
+<head>
+  <title>Home Page</title>
+</head>
+<body>
+  <div id="un">
+    <sec:loggedInUserInfo field='username'/>
+  </div>
+  <div id="session">
+    ${session.id}
+  </div>
+  <form action="/logout" method="post">
+    <input type="submit" value="Log Out"/>
+  </form>
+</body>
+</html>

samples/grails3/src/integration-test/groovy/sample/HomeSpec.groovy

@@ -0,0 +1,98 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample
+
+import grails.test.mixin.integration.Integration
+import grails.transaction.Transactional
+import org.springframework.boot.test.IntegrationTest
+
+import spock.lang.*
+import geb.spock.*
+
+import sample.pages.HomePage
+import sample.pages.LoginPage
+import sample.pages.IndexPage
+import spock.lang.Stepwise
+import pages.*
+
+/**
+ * Functional tests for grails 3 and spring-session
+ *
+ * @author Eric Helgeson
+ */
+
+@Stepwise
+@IntegrationTest("server.port:0")
+@Integration(applicationClass=grails3.redis.session.Application)
+class HomeSpec extends GebSpec {
+
+    def setup() {
+    }
+
+    def cleanup() {
+    }
+
+    void 'Anonymous page not redirected to login'() {
+        when: 'The index page is visited'
+        go '/'
+
+        then: 'Not redirected'
+        at IndexPage
+    }
+
+    void 'Unauthenticated user sent to log in page'() {
+        when: 'The test page is visited'
+        go '/test/index'
+        if(title != 'Login') {
+          println driver.pageSource
+        }
+
+        then: 'The password form is correct'
+        title == 'Login'
+        $('#password')
+        $('#username')
+    }
+
+    void 'Log in views home page'() {
+      when: 'log in successfully'
+      to LoginPage
+      login()
+
+      then: 'sent to original page'
+      at HomePage
+
+      and: 'the username is displayed'
+      username == 'user'
+
+      and: 'session id is not blank'
+      session != ''
+
+      and: 'Spring Session Management is being used'
+      driver.manage().cookies.find { it.name == 'SESSION' }
+
+      and: 'Standard Session is NOT being used'
+      !driver.manage().cookies.find { it.name == 'JSESSIONID' }
+    }
+
+    def 'Log out success'() {
+      when:
+      logout()
+
+      then:
+      at IndexPage
+    }
+}

samples/grails3/src/integration-test/groovy/sample/pages/HomePage.groovy

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages
+
+import geb.*
+
+/**
+ * The home page
+ *
+ * @author Rob Winch
+ */
+class HomePage extends Page {
+  static url = '/test'
+  static at = { assert driver.title == 'Home Page'; true}
+  static content = {
+    username { $('#un').text() }
+    session { $('#session').text() }
+    logout(to:LoginPage) { $('input[type=submit]').click() }
+  }
+}

samples/grails3/src/integration-test/groovy/sample/pages/IndexPage.groovy

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages
+
+import geb.*
+
+/**
+ * The Index page
+ *
+ * @author Eric Helgeson
+ */
+class IndexPage extends Page {
+  static url = '/'
+  static at = { assert driver.title == 'Index'; true}
+  static content = { }
+}

samples/grails3/src/integration-test/groovy/sample/pages/LoginPage.groovy

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages
+
+import geb.*
+
+/**
+ * The Login Page
+ *
+ * @author Rob Winch
+ */
+class LoginPage extends Page {
+  static url = '/login'
+  static at = { assert driver.title == 'Login'; true}
+  static content = {
+    form { $('form') }
+    submit { $('input[type=submit]') }
+    login(required:false) { user='user', pass='password' ->
+      form.username = user
+      form.password = pass
+      submit.click()
+    }
+  }
+}

samples/hazelcast-spring/build.gradle

@@ -1,16 +1,14 @@
 apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarqube {
-	skipProject = true
-}
+apply from: SAMPLE_GRADLE
 
 dependencies {
 	compile project(':spring-session'),
 			"org.springframework:spring-web:$springVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
+			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			"com.hazelcast:hazelcast-client:$hazelcastVersion",
 			jstlDependencies
 
@@ -20,4 +18,4 @@ dependencies {
 	testCompile "junit:junit:$junitVersion"
 
 	integrationTestCompile gebDependencies
-}
+}

samples/hazelcast-spring/src/main/java/sample/SecurityInitializer.java

@@ -22,7 +22,7 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
 public class SecurityInitializer extends AbstractSecurityWebApplicationInitializer {
 
 	public SecurityInitializer() {
-		super(SecurityConfig.class, Config.class);
+		super(SecurityConfig.class, SessionConfig.class);
 	}
 }
 // end::class[]

samples/hazelcast-spring/src/main/java/sample/SessionConfig.java

@@ -16,33 +16,53 @@
 
 package sample;
 
-import com.hazelcast.config.NetworkConfig;
+import com.hazelcast.config.Config;
+import com.hazelcast.config.MapAttributeConfig;
+import com.hazelcast.config.MapIndexConfig;
 import com.hazelcast.config.SerializerConfig;
 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;
 import org.springframework.util.SocketUtils;
 
 // tag::class[]
 @EnableHazelcastHttpSession(maxInactiveIntervalInSeconds = 300)
 @Configuration
-public class Config {
+public class SessionConfig {
 
 	@Bean(destroyMethod = "shutdown")
 	public HazelcastInstance hazelcastInstance() {
-		com.hazelcast.config.Config cfg = new com.hazelcast.config.Config();
-		NetworkConfig netConfig = new NetworkConfig();
-		netConfig.setPort(SocketUtils.findAvailableTcpPort());
-		System.out.println("Hazelcast port #: " + netConfig.getPort());
-		cfg.setNetworkConfig(netConfig);
-		SerializerConfig serializer = new SerializerConfig().setTypeClass(Object.class)
-				.setImplementation(new ObjectStreamSerializer());
-		cfg.getSerializationConfig().addSerializerConfig(serializer);
+		Config config = new Config();
 
-		return Hazelcast.newHazelcastInstance(cfg);
+		int port = SocketUtils.findAvailableTcpPort();
+
+		config.getNetworkConfig()
+				.setPort(port);
+
+		System.out.println("Hazelcast port #: " + port);
+
+		SerializerConfig serializer = new SerializerConfig()
+				.setImplementation(new ObjectStreamSerializer())
+				.setTypeClass(Object.class);
+
+		config.getSerializationConfig()
+				.addSerializerConfig(serializer);
+
+		MapAttributeConfig attributeConfig = new MapAttributeConfig()
+				.setName(HazelcastSessionRepository.PRINCIPAL_NAME_ATTRIBUTE)
+				.setExtractor(PrincipalNameExtractor.class.getName());
+
+		config.getMapConfig("spring:session:sessions")
+				.addMapAttributeConfig(attributeConfig)
+				.addMapIndexConfig(new MapIndexConfig(
+						HazelcastSessionRepository.PRINCIPAL_NAME_ATTRIBUTE, false));
+
+		return Hazelcast.newHazelcastInstance(config);
 	}
 
 }

samples/hazelcast-spring/src/main/webapp/index.jsp

@@ -1,9 +1,11 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<title>Secured Content</title>
-	<link rel="stylesheet" href="assets/bootstrap.min.css">
+	<wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
+	<link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
 	<style type="text/css">
 		body {
 			padding: 1em;

samples/hazelcast/build.gradle

@@ -1,13 +1,11 @@
 apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarqube {
-	skipProject = true
-}
+apply from: SAMPLE_GRADLE
 
 dependencies {
 	compile project(':spring-session'),
+			"org.webjars:bootstrap:$bootstrapVersion",
+			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			"com.hazelcast:hazelcast-client:$hazelcastVersion",
 			jstlDependencies
 
@@ -16,4 +14,4 @@ dependencies {
 	testCompile "junit:junit:$junitVersion"
 
 	integrationTestCompile gebDependencies
-}
+}

samples/hazelcast/src/main/webapp/index.jsp

@@ -1,9 +1,11 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="wj" uri="http://www.webjars.org/tags" %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <title>Session Attributes</title>
-    <link rel="stylesheet" href="assets/bootstrap.min.css">
+    <wj:locate path="bootstrap.min.css" relativeTo="META-INF/resources" var="bootstrapCssLocation"/>
+    <link rel="stylesheet" href="<c:url value="${bootstrapCssLocation}"/>">
     <style type="text/css">
         body {
             padding: 1em;

samples/httpsession-gemfire-boot/build.gradle

@@ -0,0 +1,91 @@
+buildscript {
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
+	}
+}
+
+apply from: JAVA_GRADLE
+apply plugin: "application"
+apply plugin: 'org.springframework.boot'
+
+tasks.findByPath("artifactoryPublish")?.enabled = false
+
+sonarqube {
+	skipProject = true
+}
+
+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 gebDependencies,
+		"org.spockframework:spock-spring:$spockVersion"
+
+	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+}
+
+run {
+	doFirst {
+		mainClassName = 'sample.server.GemFireServer'
+	}
+}
+
+springBoot {
+	mainClass = 'sample.client.Application'
+}
+
+task runGemFireServer() << {
+	println 'STARTING GEMFIRE SERVER...'
+
+	ext.port = reservePort()
+
+	String classpath = sourceSets.main.runtimeClasspath.collect { it }.join(File.pathSeparator)
+
+	String[] commandLine = ['java', '-server', '-ea', '-classpath', classpath,
+							"-Dgemfire.cache.server.port=$port",
+							"-Dgemfire.log-level=" + System.getProperty('gemfire.log.level', 'warning'),
+							'sample.server.GemFireServer']
+
+	//println commandLine
+
+	ext.process = commandLine.execute()
+	process.in.close()
+	process.out.close()
+	process.err.close()
+}
+
+
+integrationTest {
+	dependsOn runGemFireServer
+	doFirst {
+		def port = reservePort()
+		def host = 'localhost:' + port
+		systemProperties['server.port'] = port
+		systemProperties['management.port'] = 0
+		systemProperties['geb.build.baseUrl'] = 'http://'+host+'/'
+		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
+		systemProperties['gemfire.cache.server.port'] = runGemFireServer.port
+	}
+	doLast {
+		println 'STOPPING GEMFIRE SERVER...'
+		runGemFireServer.process?.destroyForcibly()
+	}
+}
+
+
+def reservePort() {
+	def socket = new ServerSocket(0)
+	def result = socket.localPort
+	socket.close()
+	result
+}

samples/httpsession-gemfire-boot/src/integration-test/groovy/sample/AttributeTests.groovy

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample
+
+import geb.spock.GebReportingSpec
+import org.springframework.boot.test.IntegrationTest
+import org.springframework.boot.test.SpringApplicationContextLoader
+import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.web.WebAppConfiguration
+import sample.client.Application
+import sample.pages.HomePage
+import spock.lang.Stepwise
+import pages.*
+
+/**
+ * Tests the CAS sample application using service tickets.
+ *
+ * @author Rob Winch
+ * @author John Blum
+ */
+@Stepwise
+@IntegrationTest
+@WebAppConfiguration
+@ContextConfiguration(classes = Application, loader = SpringApplicationContextLoader)
+class AttributeTests extends GebReportingSpec {
+	def 'first visit no attributes'() {
+		when:
+		to HomePage
+		then:
+		attributes.empty
+	}
+
+	def 'create attribute'() {
+		when:
+		createAttribute('a','b')
+		then:
+		attributes.size() == 2
+		attributes[0..1]*.name == ['requestCount', 'a']
+		attributes.find { it.name == 'requestCount' }?.value == '1'
+		attributes.find { it.name == 'a' }?.value == 'b'
+	}
+}

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.pages
+
+import geb.*
+
+/**
+ * The home page
+ *
+ * @author Rob Winch
+ * @author John Blum
+ */
+class HomePage extends Page {
+	static url = ''
+	static at = { assert driver.title == 'Session Attributes'; true }
+	static content = {
+		form { $('form') }
+		submit { $('input[type=submit]') }
+		createAttribute(required:false) { name, value ->
+			form.attributeName = name
+			form.attributeValue = value
+			submit.click(HomePage)
+		}
+		attributes { moduleList AttributeRow, $("table tr").tail() }
+		// attributes { $("table tr").tail().moduleList(AttributeRow) }
+	}
+}
+class AttributeRow extends Module {
+	static content = {
+		cell { $("td", it) }
+		name { cell(0).text() }
+		value { cell(1).text() }
+	}
+}

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

@@ -0,0 +1,269 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.client;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.servlet.http.HttpSession;
+
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.management.membership.ClientMembership;
+import com.gemstone.gemfire.management.membership.ClientMembershipEvent;
+import com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapter;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.data.gemfire.client.ClientCacheFactoryBean;
+import org.springframework.data.gemfire.client.PoolFactoryBean;
+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.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * A Spring Boot, GemFire cache client, web application that reveals the current state of the HTTP Session.
+ *
+ * @author John Blum
+ * @see javax.servlet.http.HttpSession
+ * @see org.springframework.boot.SpringApplication
+ * @see org.springframework.boot.autoconfigure.SpringBootApplication
+ * @see org.springframework.context.annotation.Bean
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
+ * @see org.springframework.stereotype.Controller
+ * @see com.gemstone.gemfire.cache.client.ClientCache
+ * @since 1.2.1
+ */
+// tag::class[]
+@SpringBootApplication
+@EnableGemFireHttpSession // <1>
+@Controller
+public class Application {
+
+	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
+
+	static final CountDownLatch latch = new CountDownLatch(1);
+
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
+	static final String INDEX_TEMPLATE_VIEW_NAME = "index";
+	static final String PING_RESPONSE = "PONG";
+	static final String REQUEST_COUNT_ATTRIBUTE_NAME = "requestCount";
+
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}
+
+	@Bean
+	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
+	}
+
+	Properties gemfireProperties() { // <2>
+		Properties gemfireProperties = new Properties();
+
+		gemfireProperties.setProperty("name", applicationName());
+		gemfireProperties.setProperty("log-level", logLevel());
+
+		return gemfireProperties;
+	}
+
+	String applicationName() {
+		return "samples:httpsession-gemfire-boot:"
+			.concat(getClass().getSimpleName());
+	}
+
+	String logLevel() {
+		return System.getProperty("gemfire.log-level", DEFAULT_GEMFIRE_LOG_LEVEL);
+	}
+
+	@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.setKeepAlive(false);
+		gemfirePool.setPingInterval(TimeUnit.SECONDS.toMillis(5));
+		gemfirePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(2)).intValue());
+		gemfirePool.setRetryAttempts(1);
+		gemfirePool.setSubscriptionEnabled(true);
+		gemfirePool.setThreadLocalConnections(false);
+		gemfirePool.setServers(Collections.singleton(newConnectionEndpoint(host, port)));
+
+		return gemfirePool;
+	}
+
+	ConnectionEndpoint newConnectionEndpoint(String host, int port) {
+		return new ConnectionEndpoint(host, port);
+	}
+
+	@Bean
+	BeanPostProcessor gemfireCacheServerReadyBeanPostProcessor(
+			@Value("${gemfire.cache.server.host:localhost}") final String host,
+			@Value("${gemfire.cache.server.port:12480}") final int port) { // <5>
+
+		return new BeanPostProcessor() {
+
+			public Object postProcessBeforeInitialization(Object bean, String beanName)
+					throws BeansException {
+
+				if ("gemfirePool".equals(beanName)) {
+					ClientMembership.registerClientMembershipListener(
+						new ClientMembershipListenerAdapter() {
+							@Override
+							public void memberJoined(ClientMembershipEvent event) {
+								latch.countDown();
+							}
+						});
+				}
+
+				return bean;
+			}
+
+			public Object postProcessAfterInitialization(Object bean, String beanName)
+					throws BeansException {
+
+				if (bean instanceof Pool && "gemfirePool".equals(beanName)) {
+					try {
+						Assert.state(latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS),
+							String.format("GemFire Cache Server failed to start on host [%1$s] and port [%2$d]",
+								host, port));
+					}
+					catch (InterruptedException e) {
+						Thread.currentThread().interrupt();
+					}
+				}
+
+				return bean;
+			}
+		};
+	}
+
+	@RequestMapping("/")
+	public String index() { // <6>
+		return INDEX_TEMPLATE_VIEW_NAME;
+	}
+
+	@RequestMapping(method = RequestMethod.GET, path = "/ping")
+	@ResponseBody
+	public String ping() { // <7>
+		return PING_RESPONSE;
+	}
+
+	@RequestMapping(method = RequestMethod.POST, path = "/session")
+	public String session(HttpSession session, ModelMap modelMap,
+			@RequestParam(name = "attributeName", required = false) String name,
+			@RequestParam(name = "attributeValue", required = false) String value) { // <8>
+
+		modelMap.addAttribute("sessionAttributes",
+			attributes(setAttribute(updateRequestCount(session), name, value)));
+
+		return INDEX_TEMPLATE_VIEW_NAME;
+	}
+	// end::class[]
+
+	/* (non-Javadoc) */
+	@SuppressWarnings("all")
+	HttpSession updateRequestCount(HttpSession session) {
+		synchronized (session) {
+			Integer currentRequestCount = (Integer) session.getAttribute(REQUEST_COUNT_ATTRIBUTE_NAME);
+			session.setAttribute(REQUEST_COUNT_ATTRIBUTE_NAME, nullSafeIncrement(currentRequestCount));
+			return session;
+		}
+	}
+
+	/* (non-Javadoc) */
+	Integer nullSafeIncrement(Integer value) {
+		return (nullSafeIntValue(value) + 1);
+	}
+
+	/* (non-Javadoc) */
+	int nullSafeIntValue(Number value) {
+		return (value != null ? value.intValue() : 0);
+	}
+
+	/* (non-Javadoc) */
+	HttpSession setAttribute(HttpSession session, String attributeName, String attributeValue) {
+		if (isSet(attributeName, attributeValue)) {
+			session.setAttribute(attributeName, attributeValue);
+		}
+
+		return session;
+	}
+
+	/* (non-Javadoc) */
+	boolean isSet(String... values) {
+		boolean set = true;
+
+		for (String value : values) {
+			set &= StringUtils.hasText(value);
+		}
+
+		return set;
+	}
+
+	/* (non-Javadoc) */
+	Map<String, String> attributes(HttpSession session) {
+		Map<String, String> sessionAttributes = new HashMap<String, String>();
+
+		for (String attributeName : toIterable(session.getAttributeNames())) {
+			sessionAttributes.put(attributeName,
+				String.valueOf(session.getAttribute(attributeName)));
+		}
+
+		return sessionAttributes;
+	}
+
+	/* (non-Javadoc) */
+	<T> Iterable<T> toIterable(final Enumeration<T> enumeration) {
+		return new Iterable<T>() {
+			public Iterator<T> iterator() {
+				return (enumeration == null ? Collections.<T>emptyIterator()
+					: CollectionUtils.toIterator(enumeration));
+			}
+		};
+	}
+}

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

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package sample.server;
+
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import com.gemstone.gemfire.cache.Cache;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.data.gemfire.CacheFactoryBean;
+import org.springframework.data.gemfire.server.CacheServerFactoryBean;
+import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
+
+/**
+ * A Spring Boot application bootstrapping a GemFire Cache Server JVM process.
+ *
+ * @author John Blum
+ * @see org.springframework.boot.SpringApplication
+ * @see org.springframework.boot.autoconfigure.SpringBootApplication
+ * @see org.springframework.context.annotation.Bean
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.
+ * EnableGemFireHttpSession
+ * @see com.gemstone.gemfire.cache.Cache
+ * @since 1.2.1
+ */
+// tag::class[]
+@SpringBootApplication
+@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 20) // <1>
+public class GemFireServer {
+
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
+
+	public static void main(String[] args) {
+		SpringApplication springApplication = new SpringApplication(GemFireServer.class);
+		springApplication.setWebEnvironment(false);
+		springApplication.run(args);
+	}
+
+	@Bean
+	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
+	}
+
+	Properties gemfireProperties() { // <2>
+		Properties gemfireProperties = new Properties();
+
+		gemfireProperties.setProperty("name", applicationName());
+		gemfireProperties.setProperty("mcast-port", "0");
+		gemfireProperties.setProperty("log-level", logLevel());
+		gemfireProperties.setProperty("jmx-manager", "true");
+		gemfireProperties.setProperty("jmx-manager-start", "true");
+
+		return gemfireProperties;
+	}
+
+	String applicationName() {
+		return "samples:httpsession-gemfire-boot:"
+			.concat(getClass().getSimpleName());
+	}
+
+	String logLevel() {
+		return System.getProperty("gemfire.log-level", DEFAULT_GEMFIRE_LOG_LEVEL);
+	}
+
+	@Bean
+	CacheFactoryBean gemfireCache() { // <3>
+		CacheFactoryBean gemfireCache = new CacheFactoryBean();
+
+		gemfireCache.setClose(true);
+		gemfireCache.setProperties(gemfireProperties());
+
+		return gemfireCache;
+	}
+
+	@Bean
+	CacheServerFactoryBean gemfireCacheServer(Cache gemfireCache,
+			@Value("${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>
+
+		CacheServerFactoryBean gemfireCacheServer = new CacheServerFactoryBean();
+
+		gemfireCacheServer.setAutoStartup(true);
+		gemfireCacheServer.setBindAddress(bindAddress);
+		gemfireCacheServer.setCache(gemfireCache);
+		gemfireCacheServer.setHostNameForClients(hostnameForClients);
+		gemfireCacheServer.setMaxTimeBetweenPings(
+			Long.valueOf(TimeUnit.SECONDS.toMillis(60)).intValue());
+		gemfireCacheServer.setPort(port);
+
+		return gemfireCacheServer;
+	}
+}
+// end::class[]

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

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

samples/httpsession-gemfire-clientserver-xml/build.gradle

@@ -11,10 +11,14 @@ sonarqube {
 dependencies {
 	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
+		"org.webjars:bootstrap:$bootstrapVersion",
+		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 		jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
+	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+
 	testCompile "junit:junit:$junitVersion"
 
 	integrationTestCompile gebDependencies

samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/Application.java

@@ -27,9 +27,8 @@ import org.springframework.context.annotation.ImportResource;
 public class Application {
 
 	public static void main(final String[] args) {
-		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
-				Application.class);
-		context.registerShutdownHook();
+		new AnnotationConfigApplicationContext(Application.class)
+			.registerShutdownHook();
 	}
 }
 // tag::end[]

samples/httpsession-gemfire-clientserver-xml/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java

@@ -16,14 +16,8 @@
 
 package sample;
 
-import java.io.IOException;
-import java.net.Socket;
-import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.Resource;
 
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.management.membership.ClientMembership;
@@ -33,56 +27,42 @@ import com.gemstone.gemfire.management.membership.ClientMembershipListenerAdapte
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.data.gemfire.client.PoolFactoryBean;
-import org.springframework.session.data.gemfire.support.GemFireUtils;
 import org.springframework.util.Assert;
 
 public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcessor {
 
 	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 String DEFAULT_SERVER_HOST = "localhost";
-
 	@Value("${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}")
 	int port;
 
-	// tag::class[]
-	static {
-		ClientMembership
-				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-					public void memberJoined(final ClientMembershipEvent event) {
-						if (!event.isClient()) {
-							latch.countDown();
-						}
+	@Value("${application.gemfire.client-server.host:localhost}")
+	String host;
+
+	public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+		if ("gemfirePool".equals(beanName)) {
+			ClientMembership.registerClientMembershipListener(
+				new ClientMembershipListenerAdapter() {
+					@Override
+					public void memberJoined(ClientMembershipEvent event) {
+						latch.countDown();
 					}
 				});
-	}
-
-	@SuppressWarnings("all")
-	@Resource(name = "applicationProperties")
-	private Properties applicationProperties;
-
-	public Object postProcessBeforeInitialization(Object bean, String beanName)
-			throws BeansException {
-		if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
-			String host = getServerHost(DEFAULT_SERVER_HOST);
-			Assert.isTrue(waitForCacheServerToStart(host, this.port),
-					String.format(
-							"GemFire Server failed to start [host: '%1$s', port: %2$d]%n",
-							host, this.port));
 		}
 
 		return bean;
 	}
 
 	public Object postProcessAfterInitialization(Object bean, String beanName)
-			throws BeansException {
-		if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
+		throws BeansException {
+
+		if (bean instanceof Pool && "gemfirePool".equals(beanName)) {
 			try {
-				latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS);
+				Assert.state(latch.await(DEFAULT_WAIT_DURATION, TimeUnit.MILLISECONDS),
+					String.format("GemFire Cache Server failed to start on host [%1$s] and port [%2$d]",
+						this.host, this.port));
 			}
 			catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
@@ -92,69 +72,4 @@ public class GemFireCacheServerReadyBeanPostProcessor implements BeanPostProcess
 		return bean;
 	}
 	// tag::end[]
-
-	interface Condition {
-		boolean evaluate();
-	}
-
-	String getServerHost(String defaultServerHost) {
-		return this.applicationProperties
-				.getProperty("application.gemfire.client-server.host", defaultServerHost);
-	}
-
-	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 (!connected.get()) {
-						socket = new Socket(host, port);
-						connected.set(true);
-					}
-				}
-				catch (IOException ignore) {
-				}
-				finally {
-					GemFireUtils.close(socket);
-				}
-
-				return 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();
-	}
 }

samples/httpsession-gemfire-clientserver-xml/src/main/resources/META-INF/spring/application.properties

@@ -1,3 +1,2 @@
 application.gemfire.client-server.host=localhost
-application.gemfire.client-server.port=11235
-application.gemfire.client-server.max-connections=50
+application.gemfire.client-server.port=12480

samples/httpsession-gemfire-clientserver-xml/src/main/resources/META-INF/spring/session-server.xml

@@ -20,10 +20,6 @@
 	<context:property-placeholder location="classpath:META-INF/spring/application.properties"/>
 
 	<!--3-->
-	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"
-          p:maxInactiveIntervalInSeconds="30"/>
-
-	<!--4-->
 	<util:properties id="gemfireProperties">
 		<prop key="name">GemFireClientServerHttpSessionXmlSample</prop>
 		<prop key="mcast-port">0</prop>
@@ -32,15 +28,18 @@
 		<prop key="jmx-manager-start">true</prop>
 	</util:properties>
 
-	<!--5-->
-	<gfe:cache properties-ref="gemfireProperties"
-               use-bean-factory-locator="false"/>
+	<!--4-->
+	<gfe:cache properties-ref="gemfireProperties"/>
 
-	<!--6-->
+	<!--5-->
 	<gfe:cache-server auto-startup="true"
                       bind-address="${application.gemfire.client-server.host}"
-                      port="${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}"
-                      max-connections="${application.gemfire.client-server.max-connections}"/>
+                      host-name-for-clients="${application.gemfire.client-server.host}"
+                      port="${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}"/>
+
+	<!--6-->
+	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"
+		  p:maxInactiveIntervalInSeconds="30"/>
 	<!-- end::beans[] -->
 
 </beans>

samples/httpsession-gemfire-clientserver-xml/src/main/webapp/WEB-INF/spring/session-client.xml

@@ -14,42 +14,36 @@
 
 	<!-- tag::beans[] -->
 	<!--1-->
-	<util:properties id="applicationProperties"
-                     location="classpath:META-INF/spring/application.properties"/>
-
-	<!--2-->
-	<context:property-placeholder properties-ref="applicationProperties"/>
-
-	<!--3-->
 	<context:annotation-config/>
 
-	<!--4-->
-	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"
-          p:maxInactiveIntervalInSeconds="30"/>
+	<!--2-->
+	<context:property-placeholder location="classpath:META-INF/spring/application.properties"/>
 
-	<!--5-->
+	<!--3-->
 	<bean class="sample.GemFireCacheServerReadyBeanPostProcessor"/>
 
-	<!--6-->
+	<!--4-->
 	<util:properties id="gemfireProperties">
 		<prop key="log-level">${sample.httpsession.gemfire.log-level:warning}</prop>
 	</util:properties>
 
-	<!--7-->
-	<gfe:pool free-connection-timeout="5000"
-              keep-alive="false"
+	<!--5-->
+	<gfe:client-cache properties-ref="gemfireProperties" pool-name="gemfirePool"/>
+
+	<!--6-->
+	<gfe:pool keep-alive="false"
               ping-interval="5000"
               read-timeout="5000"
-              retry-attempts="2"
+              retry-attempts="1"
               subscription-enabled="true"
-              thread-local-connections="false"
-              max-connections="${application.gemfire.client-server.max-connections}">
+              thread-local-connections="false">
 		<gfe:server host="${application.gemfire.client-server.host}"
                     port="${spring.session.data.gemfire.port:${application.gemfire.client-server.port}}"/>
 	</gfe:pool>
 
-	<gfe:client-cache properties-ref="gemfireProperties"
-                      use-bean-factory-locator="false"/>
+	<!--7-->
+	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"
+		  p:maxInactiveIntervalInSeconds="30" p:poolName="DEFAULT"/>
 	<!-- end::beans[] -->
 
 </beans>