Release version 1.3.0.RELEASE

Fixes gh-627

build.gradle

@@ -3,6 +3,7 @@ buildscript {
 		maven { url "https://repo.spring.io/plugins-release" }
 	}
 	dependencies {
+		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")
@@ -13,16 +14,17 @@ 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"

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

@@ -16,6 +16,10 @@ liveReload {
 	docRoot asciidoctor.sourceDir.canonicalPath
 }
 
+repositories {
+	maven { url 'http://dist.gemstone.com/maven/release' }
+}
+
 asciidoctorj {
 
 }
@@ -27,18 +31,20 @@ dependencies {
 				project(':spring-session-data-mongo'),
 				"org.springframework.data:spring-data-gemfire:$springDataGemFireVersion",
 				"org.springframework.data:spring-data-redis:$springDataRedisVersion",
+				"org.springframework.data:spring-data-gemfire:$springDataGemFireVersion",
+				"org.springframework:spring-webmvc:${springVersion}",
 				"org.springframework:spring-websocket:${springVersion}",
 				"org.springframework:spring-messaging:${springVersion}",
 				"org.springframework:spring-jdbc:${springVersion}",
 				"org.springframework.security:spring-security-config:${springSecurityVersion}",
 				"org.springframework.security:spring-security-web:${springSecurityVersion}",
 				"org.springframework.security:spring-security-test:${springSecurityVersion}",
-				'junit:junit: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"
 }
 
@@ -53,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/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

@@ -89,16 +89,17 @@ We start with the _Spring Boot_ application for configuring and bootstrapping a
 include::{samples-dir}httpsession-gemfire-boot/src/main/java/sample/server/GemFireServer.java[tags=class]
 ----
 
-<1> The `@EnableGemFireHttpSession` annotation is used on the GemFire Server mainly to define the corresponding
+<1> The `@EnableGemFireHttpSession` annotation is used on the GemFire Server to mainly define the corresponding
 Region (e.g. `ClusteredSpringSessions`, the default) in which Session state information will be stored
 and managed by GemFire.  As well, we have specified an arbitrary expiration attribute (i.e. `maxInactiveIntervalInSeconds`)
 for when the Session will timeout, which is triggered by a GemFire Region entry expiration event that also invalidates
 the Session object in the Region.
-<2> Next, we define a few `Properties` allowing us to configure certain aspects of the GemFire Server using
+<2> Next, we define a few `Properties` that allow us to configure certain aspects of the GemFire Server using
 http://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html[GemFire's System properties].
-<3> Then, we create an instance of the GemFire Cache using our defined `Properties`.
-<4> Finally, we setup a Cache Server instance running in the GemFire Server to listen for connections from cache clients.
-The Cache Server `Socket` will be used to connect our GemFire client cache, _Spring Boot_ web application to the server.
+<3> Then, we create an instance of the GemFire `Cache` using our defined `Properties`.
+<4> Finally, we configure and start a `CacheServer` running in the GemFire Server to listen for connections
+from cache clients.  The `CacheServer's` `Socket` will be used to connect our GemFire cache client,
+_Spring Boot_ web application to the server.
 
 The sample also makes use of a `PropertySourcesPlaceholderConfigurer` bean in order to externalize the sample application
 configuration to affect GemFire and application configuration/behavior from the command-line (e.g. such as GemFire's
@@ -106,9 +107,9 @@ configuration to affect GemFire and application configuration/behavior from the
 
 === Spring Boot-based GemFire cache client Web application
 
-Now, we create the _Spring Boot_ web application (a GemFire cache client), exposing our Web service
-using Spring MVC along with _Spring Session_ backed by GemFire, connected to our _Spring Boot_-based GemFire Server,
-in order to manage Session state in a cluster/replicated-enabled fashion.
+Now, we create our _Spring Boot_ Web application exposing our Web service with Spring MVC, running as a
+GemFire cache client connected to our _Spring Boot_-based GemFire Server, using Spring Session backed by GemFire
+to manage Session state in a clustered, replicated fashion.
 
 [source,java]
 ----
@@ -116,28 +117,29 @@ include::{samples-dir}httpsession-gemfire-boot/src/main/java/sample/client/Appli
 ----
 
 <1> Here, again, we use the `@EnableGemFireHttpSession` annotation to not only configure the GemFire cache client,
-but also to override the (HTTP) Web application container's `HttpSession` and replace it with a Session implementation
-backed by _Spring Session_ in conjunction with GemFire.  Also notice, we did not define any Session expiration timeout
-with the `maxInactiveIntervalInSeconds` attribute this time.  That is because the Session expiration is managed
-by GemFire, which will appropriately notify the cache client when the Session times out.  Again, we have just resorted
-to using the default Region, `ClusteredSpringSessions`.  Of course, we can change the Region name, but we must do so
-on both the client and the server.  That is a GemFire requirement, not a _Spring Session Data GemFire_ requirement.
-<2> Similary to the server configuration, we set a few basic GemFire System `Properties` on the client.
-<3> Although, this time, an instance of `ClientCache` is created with the `ClientCacheFactoryBean` from _Spring Data GemFire_.
-<4> However, in order to connect to the GemFire Server we must define a GemFire `Pool` bean containing pre-populated
-connections to the server.  Whenever a client Region entry operation corresponding to a Session update occurs,
+but to also override the (HTTP) Web application container's `HttpSession` and replace it with a Session implementation
+backed by _Spring Session_ and GemFire.  Also notice, we did not define any Session expiration timeout with the
+`maxInactiveIntervalInSeconds` attribute this time.  That is because the Session expiration is managed by GemFire,
+on the server, which will appropriately notify the cache client when the Session times out.  Again, we have just
+resorted to using the default named Region, `ClusteredSpringSessions`.  Of course, we can change the Region name,
+but we must do so on both the client and the server.  That is a GemFire requirement, not a
+_Spring Session Data GemFire_ requirement.
+<2> Similarly to the server configuration, we set a few basic GemFire System `Properties` on the client.
+<3> Although, this time, an instance of `ClientCache` is created with the `ClientCacheFactoryBean`
+from _Spring Data GemFire_.
+<4> However, in order to connect to the GemFire Server we must define a GemFire `Pool` bean containing a
+pool of connections to the server.  Whenever a client Region entry operation corresponding to a Session update occurs,
 the client-side Region will use an existing, pooled connection to route the operation to the server.
 <5> The following _Spring_ `BeanPostProcessor` (along with some utility methods) are only needed for testing purposes
-and is not required by any production code.  Specifically, the `BeanPostProcessor` along with the code referenced in *6*
+and are not required by any production code.  Specifically, the `BeanPostProcessor` along with the code referenced in *6*
 is useful in integration test cases where the client and server processes are forked by the test framework.  It is pretty
 easy to figure out that a race condition is imminent without proper coordination between the client and the server,
 therefore, the BPP and `ClientMembershipListener` help sync the interaction between the client and the server
 on startup during automated testing.
-<6> See <5> above.
-<7> Navigates the Web application to the home page (`index.html`), which uses **Thymeleaf** templates for server-side
+<6> Navigates the Web application to the home page (`index.html`), which uses **Thymeleaf** templates for server-side
 pages.
-<8> Heartbeat web service endpoint (useful for manual testing purposes).
-<9> Web service endpoint for adding a Session attributes defined by the user using the Web application UI.  In addition,
+<7> Heartbeat Web service endpoint (useful for manual testing purposes).
+<8> Web service endpoint allowing the user to add a Session attribute using the Web application UI.  In addition,
 the webapp stores an additional Session attribute (`requestCount`) to keep track of how many HTTP requests the user
 has sent during the current "session".
 
@@ -159,11 +161,13 @@ and GemFire out-of-the-box using the following attributes:
 * `clientRegionShort` - specifies GemFire's 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 note that the GemFire client Region name must match a server Region by the same name if
+NOTE: It is important to remember that the GemFire client Region name must match a server Region by the same name if
 the client Region is a `PROXY` or `CACHING_PROXY`.  Client and server Region names are not required to match if
 the client Region used to store Spring Sessions is `LOCAL`.  However, keep in mind that your session state will not
 be propagated to the server and you lose all the benefits of using GemFire to store and manage distributed, replicated
@@ -228,6 +232,9 @@ or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
 NOTE: The following instructions assume you have a local GemFire installation.  For more information on installation,
 see http://gemfire.docs.pivotal.io/docs-gemfire/latest/getting_started/installation/install_intro.html[Installing Pivotal GemFire].
 
+NOTE: In order to run the following, you must uncomment the lines in the `GemFireServer` class, `gemfireProperties` bean
+for the following GemFire System properties: `jmx-manager` and `jmx-manager-start`.
+
 If you like, you can easily remove the session using `gfsh`. For example, on a Linux-based system type the following
 at the command-line:
 

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

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
@@ -22,15 +23,21 @@ Additional features include:
 
 * <<websocket,WebSocket>> - provides the ability to keep the `HttpSession` alive when receiving WebSocket messages
 
-== What's New in 1.2
+== What's New in 1.3
 
-Below are the highlights of what is new in Spring Session 1.2. You can find a complete list of what's new in https://github.com/spring-projects/spring-session/issues?utf8=%E2%9C%93&q=milestone%3A%221.2.0+RC1%22[1.2.0 RC1] by referring to the changelog.
+Below are the highlights of what is new in Spring Session 1.3. You can find a complete list of what's new by referring to the changelogs of
+https://github.com/spring-projects/spring-session/milestone/6?closed=1[1.3.0.M1],
+https://github.com/spring-projects/spring-session/milestone/18?closed=1[1.3.0.M2],
+https://github.com/spring-projects/spring-session/milestone/16?closed=1[1.3.0.RC1], and
+https://github.com/spring-projects/spring-session/milestone/19?closed=1[1.3.0.RELEASE].
 
-* Added <<httpsession-jdbc,JdbcOperationsSessionRepository>> (See https://github.com/spring-projects/spring-session/issues/364[#364]).
-* Added <<httpsession-mongo,MongoOperationsSessionRepository>> (See https://github.com/spring-projects/spring-session/pull/371[#371]).
-* SessionRepositoryFilter caches null session lookup (See https://github.com/spring-projects/spring-session/issues/423[#423])
-* link:guides/grails3.html[Grails 3 Sample & Guide]
-* Improved Workspace Setup (See https://github.com/spring-projects/spring-session/pull/417[#417])
+* First class support for http://docs.spring.io/spring-session/docs/1.3.0.RELEASE/reference/html5/#httpsession-hazelcast[Hazelcast]
+* First class support for http://docs.spring.io/spring-session/docs/1.3.0.RELEASE/reference/html5/#spring-security-concurrent-sessions-how[Spring Security's concurrent session management]
+* Added https://github.com/maseev/spring-session-orientdb[OrientDB Community Extension]
+* https://github.com/spring-projects/spring-session/tree/1.3.0.RELEASE/samples/httpsession-redis-json[GenericJackson2JsonRedisSerializer sample] with Spring Security's new Jackson Support
+* Guides now https://github.com/spring-projects/spring-session/pull/652[use Lettuce]
+* `spring.session.cleanup.cron.expression` can be used to override the cleanup task’s cron expression
+* Lots of performance improvemetns and bug fixes
 
 [[samples]]
 == Samples and Guides (Start Here)
@@ -368,6 +375,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
 
@@ -505,17 +524,49 @@ Before using WebSocket integration, you should be sure that you have <<httpsessi
 
 include::guides/websocket.adoc[tags=config,leveloffset=+2]
 
-[[spring-security-concurrent-sessions]]
+[[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.
 
-[[spring-security-concurrent-sessions-how]]
-=== Configuring Spring Security's concurrent session management
-
 When using Spring Security's Java config DSL, you can configure the custom `SessionRegistry` through the
 `SessionManagementConfigurer` like this:
 [source,java,indent=0]
@@ -647,44 +698,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
 
@@ -1104,6 +1117,54 @@ include::{session-main-resources-dir}org/springframework/session/jdbc/schema-mys
 All JDBC operations in `JdbcOperationsSessionRepository` are executed in a transactional manner.
 Transactions are executed with propagation set to `REQUIRES_NEW` in order to avoid unexpected behavior due to interference with existing transactions (for example, executing `save` operation in a thread that already participates in a read-only transaction).
 
+[[api-hazelcastsessionrepository]]
+=== HazelcastSessionRepository
+
+`HazelcastSessionRepository` is a `SessionRepository` implementation that stores sessions in Hazelcast's distributed `IMap`.
+In a web environment, this is typically used in combination with `SessionRepositoryFilter`.
+
+[[api-hazelcastsessionrepository-new]]
+==== Instantiating a HazelcastSessionRepository
+
+A typical example of how to create a new instance can be seen below:
+
+[source,java,indent=0]
+----
+include::{indexdoc-tests}[tags=new-hazelcastsessionrepository]
+----
+
+For additional information on how to create and configure Hazelcast instance, refer to the 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
 
@@ -1136,6 +1197,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/main/java/docs/Docs.java

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-/**
- * Mix-in classes to provide Jackson serialization support.
- *
- * @author Jitendra Singh
- * @since 4.2
- */
-package org.springframework.security.web.jackson2;
+package docs;
+
+public class Docs {
+}

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

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

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

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

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

@@ -0,0 +1,79 @@
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      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/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

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

gradle.properties

@@ -4,24 +4,25 @@ jacksonVersion=2.6.5
 jspApiVersion=2.0
 servletApiVersion=3.0.1
 jstlelVersion=1.2.5
-version=1.3.0.M1
+version=1.3.0.RELEASE
 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
-springDataGeodeVersion=1.0.0.APACHE-GEODE-INCUBATING-M2
+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.8.1
 h2Version=1.4.192
-springDataMongoVersion=1.9.1.RELEASE
+springDataMongoVersion=1.9.4.RELEASE
 springShellVersion=1.1.0.RELEASE
-springDataGemFireVersion=1.8.1.RELEASE
+springDataGemFireVersion=1.8.5.RELEASE
 assertjVersion=2.5.0
 spockVersion=1.0-groovy-2.4
 webjarsTaglibVersion=0.3

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/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,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -19,13 +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.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
-			"org.webjars:webjars-locator",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion"
+			"org.webjars:webjars-locator"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 

samples/custom-cookie/build.gradle

@@ -3,8 +3,11 @@ apply from: TOMCAT_7_GRADLE
 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

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/findbyusername/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -18,14 +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.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"com.maxmind.geoip2:geoip2:2.3.1",
 			"org.apache.httpcomponents:httpclient"
 

samples/grails3/build.gradle

@@ -1,75 +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"
-    }
+	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 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
-    gradleWrapperVersion = project.gradleWrapperVersion
+	grailsVersion = project.grailsVersion
 }
 
 repositories {
-    mavenLocal()
-    maven { url "https://repo.grails.org/grails/core" }
+	mavenLocal()
+	maven { url "https://repo.grails.org/grails/core" }
 }
 
 dependencyManagement {
-    imports {
-        mavenBom "org.grails:grails-bom:$grailsVersion"
-    }
-    applyMavenExclusions false
+	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-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.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'
-}
-
-task wrapper(type: Wrapper) {
-    gradleVersion = gradleWrapperVersion
+	compile 'org.grails.plugins:spring-security-core:3.0.4'
 }
 
 assets {
-    minifyJs = true
-    minifyCss = true
+	minifyJs = true
+	minifyCss = true
 }

samples/grails3/gradle.properties

@@ -1,2 +1 @@
 grailsVersion=3.1.4
-gradleWrapperVersion=2.9

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/httpsession-gemfire-boot/build.gradle

@@ -9,7 +9,7 @@ buildscript {
 
 apply from: JAVA_GRADLE
 apply plugin: "application"
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 

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

@@ -16,8 +16,6 @@
 
 package sample.client;
 
-import java.io.IOException;
-import java.net.Socket;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -26,7 +24,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.servlet.http.HttpSession;
 
@@ -34,8 +31,6 @@ 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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,8 +42,8 @@ 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.session.data.gemfire.support.GemFireUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.util.Assert;
@@ -59,16 +54,14 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
- * A Spring Boot-based GemFire cache client web application that reveals the current state
- * of the HTTP Session.
+ * A Spring Boot, GemFire cache client, web application that reveals the current state of the HTTP Session.
  *
  * @author John Blum
  * @see javax.servlet.http.HttpSession
  * @see org.springframework.boot.SpringApplication
  * @see org.springframework.boot.autoconfigure.SpringBootApplication
  * @see org.springframework.context.annotation.Bean
- * @see org.springframework.session.data.gemfire.config.annotation.web.http.
- * EnableGemFireHttpSession
+ * @see org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession
  * @see org.springframework.stereotype.Controller
  * @see com.gemstone.gemfire.cache.client.ClientCache
  * @since 1.2.1
@@ -79,63 +72,42 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Controller
 public class Application {
 
-	static final int MAX_CONNECTIONS = 50;
-
-	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(20);
-	static final long DEFAULT_WAIT_INTERVAL = 500L;
+	static final long DEFAULT_WAIT_DURATION = TimeUnit.SECONDS.toMillis(60);
 
 	static final CountDownLatch latch = new CountDownLatch(1);
 
-	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "config";
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
 	static final String INDEX_TEMPLATE_VIEW_NAME = "index";
 	static final String PING_RESPONSE = "PONG";
 	static final String REQUEST_COUNT_ATTRIBUTE_NAME = "requestCount";
 
-	static { // <6>
-		ClientMembership
-				.registerClientMembershipListener(new ClientMembershipListenerAdapter() {
-					@Override
-					public void memberJoined(ClientMembershipEvent event) {
-						if (!event.isClient()) {
-							latch.countDown();
-						}
-					}
-				});
-	}
-
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
 
-	protected final Logger logger = LoggerFactory.getLogger(getClass());
-
 	@Bean
 	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
 		return new PropertySourcesPlaceholderConfigurer();
 	}
 
-	String applicationName() {
-		return "samples:httpsession-gemfire-boot-"
-				.concat(Application.class.getSimpleName());
-	}
-
-	String gemfireLogLevel() {
-		return System.getProperty("gemfire.log-level", DEFAULT_GEMFIRE_LOG_LEVEL);
-	}
-
-	ConnectionEndpoint newConnectionEndpoint(String host, int port) {
-		return new ConnectionEndpoint(host, port);
-	}
-
 	Properties gemfireProperties() { // <2>
 		Properties gemfireProperties = new Properties();
 
 		gemfireProperties.setProperty("name", applicationName());
-		gemfireProperties.setProperty("log-level", gemfireLogLevel());
+		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();
@@ -153,18 +125,23 @@ public class Application {
 
 		PoolFactoryBean gemfirePool = new PoolFactoryBean();
 
-		gemfirePool.setMaxConnections(MAX_CONNECTIONS);
-		gemfirePool.setPingInterval(TimeUnit.SECONDS.toMillis(15));
+		gemfirePool.setKeepAlive(false);
+		gemfirePool.setPingInterval(TimeUnit.SECONDS.toMillis(5));
+		gemfirePool.setReadTimeout(Long.valueOf(TimeUnit.SECONDS.toMillis(15)).intValue());
 		gemfirePool.setRetryAttempts(1);
 		gemfirePool.setSubscriptionEnabled(true);
-		gemfirePool.setServerEndpoints(
-				Collections.singleton(newConnectionEndpoint(host, port)));
+		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 gemfireCacheServerAvailabilityBeanPostProcessor(
+	BeanPostProcessor gemfireCacheServerReadyBeanPostProcessor(
 			@Value("${gemfire.cache.server.host:localhost}") final String host,
 			@Value("${gemfire.cache.server.port:12480}") final int port) { // <5>
 
@@ -172,12 +149,15 @@ public class Application {
 
 			public Object postProcessBeforeInitialization(Object bean, String beanName)
 					throws BeansException {
-				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
-					if (!waitForCacheServerToStart(host, port)) {
-						Application.this.logger.warn(
-								"No GemFire Cache Server found on [host: {}, port: {}]",
-								host, port);
-					}
+
+				if ("gemfirePool".equals(beanName)) {
+					ClientMembership.registerClientMembershipListener(
+						new ClientMembershipListenerAdapter() {
+							@Override
+							public void memberJoined(ClientMembershipEvent event) {
+								latch.countDown();
+							}
+						});
 				}
 
 				return bean;
@@ -185,13 +165,12 @@ public class Application {
 
 			public Object postProcessAfterInitialization(Object bean, String beanName)
 					throws BeansException {
-				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
+
+				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, port: %2$d]",
-										host, port));
+						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();
@@ -204,23 +183,23 @@ public class Application {
 	}
 
 	@RequestMapping("/")
-	public String index() { // <7>
+	public String index() { // <6>
 		return INDEX_TEMPLATE_VIEW_NAME;
 	}
 
 	@RequestMapping(method = RequestMethod.GET, path = "/ping")
 	@ResponseBody
-	public String ping() { // <8>
+	public String ping() { // <7>
 		return PING_RESPONSE;
 	}
 
 	@RequestMapping(method = RequestMethod.POST, path = "/session")
 	public String session(HttpSession session, ModelMap modelMap,
 			@RequestParam(name = "attributeName", required = false) String name,
-			@RequestParam(name = "attributeValue", required = false) String value) { // <9>
+			@RequestParam(name = "attributeValue", required = false) String value) { // <8>
 
 		modelMap.addAttribute("sessionAttributes",
-				attributes(setAttribute(updateRequestCount(session), name, value)));
+			attributes(setAttribute(updateRequestCount(session), name, value)));
 
 		return INDEX_TEMPLATE_VIEW_NAME;
 	}
@@ -230,27 +209,24 @@ public class Application {
 	@SuppressWarnings("all")
 	HttpSession updateRequestCount(HttpSession session) {
 		synchronized (session) {
-			Integer currentRequestCount = (Integer) session
-					.getAttribute(REQUEST_COUNT_ATTRIBUTE_NAME);
-			session.setAttribute(REQUEST_COUNT_ATTRIBUTE_NAME,
-					nullSafeIncrement(currentRequestCount));
+			Integer currentRequestCount = (Integer) session.getAttribute(REQUEST_COUNT_ATTRIBUTE_NAME);
+			session.setAttribute(REQUEST_COUNT_ATTRIBUTE_NAME, nullSafeIncrement(currentRequestCount));
 			return session;
 		}
 	}
 
 	/* (non-Javadoc) */
 	Integer nullSafeIncrement(Integer value) {
-		return (nullSafeInt(value) + 1);
+		return (nullSafeIntValue(value) + 1);
 	}
 
 	/* (non-Javadoc) */
-	int nullSafeInt(Number value) {
+	int nullSafeIntValue(Number value) {
 		return (value != null ? value.intValue() : 0);
 	}
 
 	/* (non-Javadoc) */
-	HttpSession setAttribute(HttpSession session, String attributeName,
-			String attributeValue) {
+	HttpSession setAttribute(HttpSession session, String attributeName, String attributeValue) {
 		if (isSet(attributeName, attributeValue)) {
 			session.setAttribute(attributeName, attributeValue);
 		}
@@ -269,97 +245,25 @@ public class Application {
 		return set;
 	}
 
+	/* (non-Javadoc) */
 	Map<String, String> attributes(HttpSession session) {
 		Map<String, String> sessionAttributes = new HashMap<String, String>();
 
 		for (String attributeName : toIterable(session.getAttributeNames())) {
 			sessionAttributes.put(attributeName,
-					String.valueOf(session.getAttribute(attributeName)));
+				String.valueOf(session.getAttribute(attributeName)));
 		}
 
 		return sessionAttributes;
 	}
 
+	/* (non-Javadoc) */
 	<T> Iterable<T> toIterable(final Enumeration<T> enumeration) {
 		return new Iterable<T>() {
 			public Iterator<T> iterator() {
 				return (enumeration == null ? Collections.<T>emptyIterator()
-						: new Iterator<T>() {
-					public boolean hasNext() {
-						return enumeration.hasMoreElements();
-					}
-
-					public T next() {
-						return enumeration.nextElement();
-					}
-
-					public void remove() {
-						throw new UnsupportedOperationException(
-								"Auto-generated method stub");
-					}
-				});
+					: CollectionUtils.toIterator(enumeration));
 			}
 		};
 	}
-
-	/* (non-Javadoc) */
-	boolean waitForCacheServerToStart(String host, int port) {
-		return waitForCacheServerToStart(host, port, DEFAULT_WAIT_DURATION);
-	}
-
-	/* (non-Javadoc) */
-	boolean waitForCacheServerToStart(final String host, final int port, long duration) {
-		return waitOnCondition(new Condition() {
-			AtomicBoolean connected = new AtomicBoolean(false);
-
-			public boolean evaluate() {
-				Socket socket = null;
-
-				try {
-					// NOTE: this code is not intended to be an atomic, compound action (a
-					// possible race condition);
-					// opening another connection (at the expense of using system
-					// resources) after connectivity
-					// has already been established is not detrimental in this use case
-					if (!this.connected.get()) {
-						socket = new Socket(host, port);
-						this.connected.set(true);
-					}
-				}
-				catch (IOException ignore) {
-				}
-				finally {
-					GemFireUtils.close(socket);
-				}
-
-				return this.connected.get();
-			}
-		}, duration);
-	}
-
-	boolean waitOnCondition(Condition condition) {
-		return waitOnCondition(condition, DEFAULT_WAIT_DURATION);
-	}
-
-	@SuppressWarnings("all")
-	boolean waitOnCondition(Condition condition, long duration) {
-		final long timeout = (System.currentTimeMillis() + duration);
-
-		try {
-			while (!condition.evaluate() && System.currentTimeMillis() < timeout) {
-				synchronized (condition) {
-					TimeUnit.MILLISECONDS.timedWait(condition, DEFAULT_WAIT_INTERVAL);
-				}
-			}
-		}
-		catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-		}
-
-		return condition.evaluate();
-	}
-
-	interface Condition {
-		boolean evaluate();
-	}
 }

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

@@ -47,7 +47,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl
 @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 20) // <1>
 public class GemFireServer {
 
-	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "config";
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
 
 	public static void main(String[] args) {
 		SpringApplication springApplication = new SpringApplication(GemFireServer.class);
@@ -60,25 +60,26 @@ public class GemFireServer {
 		return new PropertySourcesPlaceholderConfigurer();
 	}
 
-	String applicationName() {
-		return "samples:httpsession-gemfire-boot-"
-				.concat(GemFireServer.class.getSimpleName());
-	}
-
-	String gemfireLogLevel() {
-		return System.getProperty("gemfire.log-level", DEFAULT_GEMFIRE_LOG_LEVEL);
-	}
-
 	Properties gemfireProperties() { // <2>
 		Properties gemfireProperties = new Properties();
 
 		gemfireProperties.setProperty("name", applicationName());
 		gemfireProperties.setProperty("mcast-port", "0");
-		gemfireProperties.setProperty("log-level", gemfireLogLevel());
+		gemfireProperties.setProperty("log-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();
@@ -98,12 +99,11 @@ public class GemFireServer {
 		CacheServerFactoryBean gemfireCacheServer = new CacheServerFactoryBean();
 
 		gemfireCacheServer.setAutoStartup(true);
-		gemfireCacheServer.setCache(gemfireCache);
 		gemfireCacheServer.setBindAddress(bindAddress);
+		gemfireCacheServer.setCache(gemfireCache);
 		gemfireCacheServer.setHostNameForClients(hostnameForClients);
 		gemfireCacheServer.setMaxTimeBetweenPings(
-				Long.valueOf(TimeUnit.MINUTES.toMillis(1)).intValue());
-		gemfireCacheServer.setNotifyBySubscription(true);
+			Long.valueOf(TimeUnit.SECONDS.toMillis(60)).intValue());
 		gemfireCacheServer.setPort(port);
 
 		return gemfireCacheServer;

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

@@ -9,7 +9,7 @@ sonarqube {
 }
 
 dependencies {
-	compile project(':spring-session-data-geode'),
+	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
 		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
@@ -17,6 +17,8 @@ dependencies {
 
 	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,53 +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();
-					}
-				}
-			});
-	}
-
-	@SuppressWarnings("all")
-	@Resource(name = "applicationProperties")
-	private Properties applicationProperties;
+	@Value("${application.gemfire.client-server.host:localhost}")
+	String host;
 
 	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));
+		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 PoolFactoryBean || bean instanceof Pool) {
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+		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();
@@ -89,70 +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,41 +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>
 
-	<gfe:client-cache properties-ref="gemfireProperties"/>
+	<!--5-->
+	<gfe:client-cache properties-ref="gemfireProperties" pool-name="gemfirePool"/>
 
-	<!--7-->
-	<gfe:pool free-connection-timeout="5000"
-              keep-alive="false"
+	<!--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>
+
+	<!--7-->
+	<bean class="org.springframework.session.data.gemfire.config.annotation.web.http.GemFireHttpSessionConfiguration"
+		  p:maxInactiveIntervalInSeconds="30" p:poolName="DEFAULT"/>
 	<!-- end::beans[] -->
 
 </beans>

samples/httpsession-gemfire-clientserver/build.gradle

@@ -12,19 +12,21 @@ dependencies {
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
+	runtime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+
 	testCompile "junit:junit:$junitVersion"
 
 	integrationTestCompile gebDependencies
 
-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE",
-		"xml-apis:xml-apis:1.4.01"
+	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
 }
 
-mainClassName = "sample.ServerConfig"
 
 def port
 def process
 
+mainClassName = "sample.ServerConfig"
+
 task availablePort() << {
 	def serverSocket = new ServerSocket(0)
 	port = serverSocket.localPort

samples/httpsession-gemfire-clientserver/src/main/java/sample/ClassLocator.java

@@ -1,38 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample;
-
-/**
- * The ClassLocator class...
- *
- * @author John Blum
- * @since 1.0.0
- */
-public final class ClassLocator {
-
-	private ClassLocator() {
-	}
-
-	public static void main(final String[] args) throws ClassNotFoundException {
-		String className = "org.w3c.dom.ElementTraversal";
-		//String className = (args.length > 0 ? args[0] : "com.gemstone.gemfire.cache.Cache");
-		Class<?> type = Class.forName(className);
-		String resourceName = type.getName().replaceAll("\\.", "/").concat(".class");
-		System.out.printf("class [%1$s] with resource name [%2$s] is found in [%3$s]%n",
-			className, resourceName, type.getClassLoader().getResource(resourceName));
-	}
-}

samples/httpsession-gemfire-clientserver/src/main/java/sample/ClientConfig.java

@@ -16,13 +16,10 @@
 
 package sample;
 
-import java.io.IOException;
-import java.net.Socket;
 import java.util.Collections;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.management.membership.ClientMembership;
@@ -35,99 +32,97 @@ import org.springframework.beans.factory.config.BeanPostProcessor;
 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.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession;
-import org.springframework.session.data.gemfire.support.GemFireUtils;
 import org.springframework.util.Assert;
 
 // tag::class[]
-@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30) // <1>
+@EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30, poolName = "DEFAULT") // <1>
 public class ClientConfig {
 
 	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 {
-		System.setProperty("gemfire.log-level", logLevel());
-
-		ClientMembership.registerClientMembershipListener(
-			new ClientMembershipListenerAdapter() {
-				public void memberJoined(ClientMembershipEvent event) {
-					if (!event.isClient()) {
-						latch.countDown();
-					}
-				}
-			});
-	}
-
-	private static String logLevel() {
-		return System.getProperty("sample.httpsession.gemfire.log-level", "warning");
-	}
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
 
 	@Bean
 	static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
 		return new PropertySourcesPlaceholderConfigurer();
 	}
 
-	@Bean
 	Properties gemfireProperties() { // <2>
-		return new Properties();
+		Properties gemfireProperties = new Properties();
+		gemfireProperties.setProperty("name", applicationName());
+		gemfireProperties.setProperty("log-level", logLevel());
+		return gemfireProperties;
+	}
+
+	String applicationName() {
+		return "samples:httpsession-gemfire-clientserver:"
+			.concat(getClass().getSimpleName());
+	}
+
+	String logLevel() {
+		return System.getProperty("sample.httpsession.gemfire.log-level",
+			DEFAULT_GEMFIRE_LOG_LEVEL);
 	}
 
 	@Bean
-	ClientCacheFactoryBean gemfireCache() { // <4>
+	ClientCacheFactoryBean gemfireCache(
+			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") int port) { // <3>
+
 		ClientCacheFactoryBean clientCacheFactory = new ClientCacheFactoryBean();
 
 		clientCacheFactory.setClose(true);
 		clientCacheFactory.setProperties(gemfireProperties());
 
+		// GemFire Pool settings <4>
+		clientCacheFactory.setKeepAlive(false);
+		clientCacheFactory.setPingInterval(TimeUnit.SECONDS.toMillis(5));
+		clientCacheFactory.setReadTimeout(2000); // 2 seconds
+		clientCacheFactory.setRetryAttempts(1);
+		clientCacheFactory.setSubscriptionEnabled(true);
+		clientCacheFactory.setThreadLocalConnections(false);
+
+		clientCacheFactory.setServers(Collections.singletonList(
+			newConnectionEndpoint(ServerConfig.SERVER_HOST, port)));
+
 		return clientCacheFactory;
 	}
 
-	@Bean
-	PoolFactoryBean gemfirePool(// <3>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") int port) {
-
-		PoolFactoryBean poolFactory = new PoolFactoryBean();
-
-		poolFactory.setFreeConnectionTimeout(5000); // 5 seconds
-		poolFactory.setKeepAlive(false);
-		poolFactory.setMaxConnections(ServerConfig.MAX_CONNECTIONS);
-		poolFactory.setPingInterval(TimeUnit.SECONDS.toMillis(5));
-		poolFactory.setReadTimeout(2000); // 2 seconds
-		poolFactory.setRetryAttempts(2);
-		poolFactory.setSubscriptionEnabled(true);
-		poolFactory.setThreadLocalConnections(false);
-
-		poolFactory.setServers(Collections.singletonList(
-			new ConnectionEndpoint(ServerConfig.SERVER_HOSTNAME, port)));
-
-		return poolFactory;
+	ConnectionEndpoint newConnectionEndpoint(String host, int port) {
+		return new ConnectionEndpoint(host, port);
 	}
 
 	@Bean
-	BeanPostProcessor gemfireCacheServerReadyBeanPostProcessor(// <5>
-			@Value("${spring.session.data.gemfire.port:" + ServerConfig.SERVER_PORT + "}") final int port) {
-
+	BeanPostProcessor gemfireCacheServerReadyBeanPostProcessor() { // <5>
 		return new BeanPostProcessor() {
 
-			public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-				if (bean instanceof PoolFactoryBean || bean instanceof Pool) {
-					Assert.isTrue(waitForCacheServerToStart(ServerConfig.SERVER_HOSTNAME, port),
-						String.format("GemFire Server failed to start [hostname: %1$s, port: %2$d]",
-							ServerConfig.SERVER_HOSTNAME, port));
+			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 PoolFactoryBean || bean instanceof Pool) {
+			public Object postProcessAfterInitialization(Object bean, String beanName)
+				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]",
+								ServerConfig.SERVER_HOST, ServerConfig.SERVER_PORT));
 					}
 					catch (InterruptedException e) {
 						Thread.currentThread().interrupt();
@@ -139,65 +134,4 @@ public class ClientConfig {
 		};
 	}
 	// end::class[]
-
-	interface Condition {
-		boolean evaluate();
-	}
-
-	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/src/main/java/sample/ServerConfig.java

@@ -18,6 +18,7 @@ package sample;
 
 import java.io.IOException;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 import com.gemstone.gemfire.cache.Cache;
 
@@ -33,21 +34,26 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.Enabl
 @EnableGemFireHttpSession(maxInactiveIntervalInSeconds = 30) // <1>
 public class ServerConfig {
 
-	static final int MAX_CONNECTIONS = 50;
 	static final int SERVER_PORT = 12480;
 
-	static final String SERVER_HOSTNAME = "localhost";
+	static final String DEFAULT_GEMFIRE_LOG_LEVEL = "warning";
+	static final String SERVER_HOST = "localhost";
 
-	@Bean
-	PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
-		return new PropertySourcesPlaceholderConfigurer();
+	@SuppressWarnings("resource")
+	public static void main(String[] args) throws IOException { // <5>
+		new AnnotationConfigApplicationContext(ServerConfig.class)
+			.registerShutdownHook();
 	}
 
 	@Bean
+	static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
+	}
+
 	Properties gemfireProperties() { // <2>
 		Properties gemfireProperties = new Properties();
 
-		gemfireProperties.setProperty("name", "GemFireClientServerHttpSessionSample");
+		gemfireProperties.setProperty("name", applicationName());
 		gemfireProperties.setProperty("mcast-port", "0");
 		gemfireProperties.setProperty("log-level", logLevel());
 		gemfireProperties.setProperty("jmx-manager", "true");
@@ -56,8 +62,14 @@ public class ServerConfig {
 		return gemfireProperties;
 	}
 
-	private String logLevel() {
-		return System.getProperty("sample.httpsession.gemfire.log-level", "warning");
+	String applicationName() {
+		return "samples:httpsession-gemfire-clientserver:"
+			.concat(getClass().getSimpleName());
+	}
+
+	String logLevel() {
+		return System.getProperty("sample.httpsession.gemfire.log-level",
+			DEFAULT_GEMFIRE_LOG_LEVEL);
 	}
 
 	@Bean
@@ -71,25 +83,19 @@ public class ServerConfig {
 	}
 
 	@Bean
-	CacheServerFactoryBean gemfireCacheServer(Cache gemfireCache, // <4>
-			@Value("${spring.session.data.gemfire.port:" + SERVER_PORT + "}") int port) {
+	CacheServerFactoryBean gemfireCacheServer(Cache gemfireCache,
+			@Value("${spring.session.data.gemfire.port:" + SERVER_PORT + "}") int port) { // <4>
 
-		CacheServerFactoryBean cacheServerFactory = new CacheServerFactoryBean();
+		CacheServerFactoryBean gemfireCacheServer = new CacheServerFactoryBean();
 
-		cacheServerFactory.setAutoStartup(true);
-		cacheServerFactory.setBindAddress(SERVER_HOSTNAME);
-		cacheServerFactory.setCache(gemfireCache);
-		cacheServerFactory.setHostNameForClients(SERVER_HOSTNAME);
-		cacheServerFactory.setMaxConnections(MAX_CONNECTIONS);
-		cacheServerFactory.setPort(port);
+		gemfireCacheServer.setAutoStartup(true);
+		gemfireCacheServer.setBindAddress(SERVER_HOST);
+		gemfireCacheServer.setCache(gemfireCache);
+		gemfireCacheServer.setHostNameForClients(SERVER_HOST);
+		gemfireCacheServer.setMaxTimeBetweenPings(Long.valueOf(TimeUnit.SECONDS.toMillis(60)).intValue());
+		gemfireCacheServer.setPort(port);
 
-		return cacheServerFactory;
+		return gemfireCacheServer;
 	}
-
-	@SuppressWarnings("resource")
-	public static void main(final String[] args) throws IOException { // <5>
-		new AnnotationConfigApplicationContext(ServerConfig.class).registerShutdownHook();
-	}
-
 }
 // end::class[]

samples/httpsession-gemfire-p2p/build.gradle

@@ -3,7 +3,7 @@ apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
 dependencies {
-	compile project(':spring-session-data-geode'),
+	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
 		"org.webjars:webjars-taglib:$webjarsTaglibVersion",

samples/httpsession-jdbc-boot/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -18,15 +18,14 @@ dependencies {
 	compile project(':spring-session-jdbc'),
 			"org.springframework.boot:spring-boot-starter-jdbc",
 			"org.springframework.boot:spring-boot-starter-web",
+			"org.springframework.boot:spring-boot-starter-security",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator",
-			"com.h2database:h2",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion"
+			"com.h2database:h2"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 

samples/httpsession-redis-json/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 
@@ -19,15 +19,16 @@ ext {
     assertjVersion = "2.4.0"
 }
 
+ext['spring-security.version'] = springSecurityVersion
+
 dependencies {
     compile project(':spring-session'),
             "org.springframework.boot:spring-boot-starter-redis",
             "org.springframework.boot:spring-boot-starter-web",
             "org.springframework.boot:spring-boot-starter-thymeleaf",
+            "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-core:$springSecurityVersion",
-            "org.springframework.security:spring-security-config:$springSecurityVersion",
+            "biz.paluch.redis:lettuce:$lettuceVersion",
             "org.apache.httpcomponents:httpclient"
 
     testCompile "org.springframework.boot:spring-boot-starter-test",

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java

@@ -1,66 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.util.Collection;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-import org.springframework.security.core.GrantedAuthority;
-
-/**
- * This is a Jackson mixin class helps in serialize/deserialize
- * {@link org.springframework.security.authentication.AnonymousAuthenticationToken} class.
- * To use this class you need to register it with
- * {@link com.fasterxml.jackson.databind.ObjectMapper} and
- * {@link SimpleGrantedAuthorityMixin} because AnonymousAuthenticationToken contains
- * SimpleGrantedAuthority. <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre>
- *
- * <i>Note: This class will save full class name into a property called @class</i>
- *
- * @author Jitendra Singh
- * @see CoreJackson2Module
- * @see SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
-@JsonIgnoreProperties(ignoreUnknown = true)
-class AnonymousAuthenticationTokenMixin {
-
-	/**
-	 * Constructor used by Jackson to create object of
-	 * {@link org.springframework.security.authentication.AnonymousAuthenticationToken}.
-	 *
-	 * @param keyHash hashCode of key provided at the time of token creation by using
-	 * {@link org.springframework.security.authentication.AnonymousAuthenticationToken#AnonymousAuthenticationToken(String, Object, Collection)}
-	 * @param principal the principal (typically a <code>UserDetails</code>)
-	 * @param authorities the authorities granted to the principal
-	 */
-	@JsonCreator
-	AnonymousAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash,
-			@JsonProperty("principal") Object principal,
-			@JsonProperty("authorities") Collection<? extends GrantedAuthority> authorities) {
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/CoreJackson2Module.java

@@ -1,71 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.util.Collections;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-import org.springframework.security.authentication.AnonymousAuthenticationToken;
-import org.springframework.security.authentication.RememberMeAuthenticationToken;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-
-/**
- * Jackson module for spring-security-core. This module register
- * {@link AnonymousAuthenticationTokenMixin}, {@link RememberMeAuthenticationTokenMixin},
- * {@link SimpleGrantedAuthorityMixin}, {@link UnmodifiableSetMixin}, {@link UserMixin}
- * and {@link UsernamePasswordAuthenticationTokenMixin}. If no default typing enabled by
- * default then it'll enable it because typing info is needed to properly
- * serialize/deserialize objects. In order to use this module just add this module into
- * your ObjectMapper configuration.
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre> <b>Note: use {@link SecurityJacksonModules#getModules(ClassLoader)} to get list
- * of all security modules.</b>
- *
- * @author Jitendra Singh.
- * @see SecurityJacksonModules
- */
-public class CoreJackson2Module extends SimpleModule {
-
-	public CoreJackson2Module() {
-		super(CoreJackson2Module.class.getName(), new Version(1, 0, 0, null, null, null));
-	}
-
-	@Override
-	public void setupModule(SetupContext context) {
-		SecurityJacksonModules.enableDefaultTyping((ObjectMapper) context.getOwner());
-		context.setMixInAnnotations(AnonymousAuthenticationToken.class,
-				AnonymousAuthenticationTokenMixin.class);
-		context.setMixInAnnotations(RememberMeAuthenticationToken.class,
-				RememberMeAuthenticationTokenMixin.class);
-		context.setMixInAnnotations(SimpleGrantedAuthority.class,
-				SimpleGrantedAuthorityMixin.class);
-		context.setMixInAnnotations(
-				Collections.<Object>unmodifiableSet(Collections.emptySet()).getClass(),
-				UnmodifiableSetMixin.class);
-		context.setMixInAnnotations(User.class, UserMixin.class);
-		context.setMixInAnnotations(UsernamePasswordAuthenticationToken.class,
-				UsernamePasswordAuthenticationTokenMixin.class);
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.util.Collection;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-import org.springframework.security.core.GrantedAuthority;
-
-/**
- * This mixin class helps in serialize/deserialize
- * {@link org.springframework.security.authentication.RememberMeAuthenticationToken}
- * class. To use this class you need to register it with
- * {@link com.fasterxml.jackson.databind.ObjectMapper} and 2 more mixin classes.
- *
- * <ol>
- * <li>{@link SimpleGrantedAuthorityMixin}</li>
- * <li>{@link UserMixin}</li>
- * <li>{@link UnmodifiableSetMixin}</li>
- * </ol>
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre>
- *
- * <i>Note: This class will save TypeInfo (full class name) into a property
- * called @class</i>
- *
- * @author Jitendra Singh
- * @see CoreJackson2Module
- * @see SecurityJacksonModules
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
-@JsonIgnoreProperties(ignoreUnknown = true)
-class RememberMeAuthenticationTokenMixin {
-
-	/**
-	 * Constructor used by Jackson to create
-	 * {@link org.springframework.security.authentication.RememberMeAuthenticationToken}
-	 * object.
-	 *
-	 * @param keyHash hashCode of above given key.
-	 * @param principal the principal (typically a <code>UserDetails</code>)
-	 * @param authorities the authorities granted to the principal
-	 */
-	@JsonCreator
-	RememberMeAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash,
-			@JsonProperty("principal") Object principal,
-			@JsonProperty("authorities") Collection<? extends GrantedAuthority> authorities) {
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/SecurityJacksonModules.java

@@ -1,109 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.util.ClassUtils;
-
-/**
- * This utility class will find all the SecurityModules in classpath.
- *
- * <p>
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModules(SecurityJacksonModules.getModules());
- * </pre> Above code is equivalent to
- * <p>
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.PROPERTY);
- *     mapper.registerModule(new CoreJackson2Module());
- *     mapper.registerModule(new CasJackson2Module());
- *     mapper.registerModule(new WebJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh.
- * @since 4.2
- */
-public final class SecurityJacksonModules {
-
-	private static final Log logger = LogFactory.getLog(SecurityJacksonModules.class);
-	private static final List<String> securityJackson2ModuleClasses = Arrays.asList(
-			"org.springframework.security.jackson2.CoreJackson2Module",
-			"org.springframework.security.cas.jackson2.CasJackson2Module",
-			"org.springframework.security.web.jackson2.WebJackson2Module");
-
-	private SecurityJacksonModules() {
-	}
-
-	public static void enableDefaultTyping(ObjectMapper mapper) {
-		if (mapper != null) {
-			TypeResolverBuilder<?> typeBuilder = mapper.getDeserializationConfig()
-					.getDefaultTyper(null);
-			if (typeBuilder == null) {
-				mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL,
-						JsonTypeInfo.As.PROPERTY);
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private static Module loadAndGetInstance(String className, ClassLoader loader) {
-		Module instance = null;
-		try {
-			Class<? extends Module> securityModule = (Class<? extends Module>) ClassUtils
-					.forName(className, loader);
-			if (securityModule != null) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Loaded module " + className + ", now registering");
-				}
-				instance = securityModule.newInstance();
-			}
-		}
-		catch (Exception e) {
-			if (logger.isDebugEnabled()) {
-				logger.debug("Cannot load module " + className, e);
-			}
-		}
-		return instance;
-	}
-
-	/**
-	 * @param loader the ClassLoader to use
-	 * @return List of available security modules in classpath.
-	 */
-	public static List<Module> getModules(ClassLoader loader) {
-		List<Module> modules = new ArrayList<Module>();
-		for (String className : securityJackson2ModuleClasses) {
-			Module module = loadAndGetInstance(className, loader);
-			if (module != null) {
-				modules.add(module);
-			}
-		}
-		return modules;
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/SimpleGrantedAuthorityMixin.java

@@ -1,50 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-/**
- * Jackson Mixin class helps in serialize/deserialize
- * {@link org.springframework.security.core.authority.SimpleGrantedAuthority}.
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre>
- * @author Jitendra Singh
- * @see CoreJackson2Module
- * @see SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.PUBLIC_ONLY, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public abstract class SimpleGrantedAuthorityMixin {
-
-	/**
-	 * Mixin Constructor.
-	 * @param role the role
-	 */
-	@JsonCreator
-	public SimpleGrantedAuthorityMixin(@JsonProperty("authority") String role) {
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/UnmodifiableSetMixin.java

@@ -1,48 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.util.Set;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-/**
- * This mixin class used to deserialize java.util.Collections$UnmodifiableSet and used
- * with various AuthenticationToken implementation's mixin classes.
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh
- * @see CoreJackson2Module
- * @see SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-class UnmodifiableSetMixin {
-
-	/**
-	 * Mixin Constructor
-	 * @param s the Set
-	 */
-	@JsonCreator
-	UnmodifiableSetMixin(Set<?> s) {
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/UserDeserializer.java

@@ -1,81 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.io.IOException;
-import java.util.Set;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.MissingNode;
-
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-
-/**
- * Custom Deserializer for {@link User} class. This is already registered with
- * {@link UserMixin}. You can also use it directly with your mixin class.
- *
- * @author Jitendra Singh
- * @see UserMixin
- */
-class UserDeserializer extends JsonDeserializer<User> {
-
-	/**
-	 * This method will create {@link User} object. It will ensure successful object
-	 * creation even if password key is null in serialized json, because credentials may
-	 * be removed from the {@link User} by invoking {@link User#eraseCredentials()}. In
-	 * that case there won't be any password key in serialized json.
-	 *
-	 * @param jp the JsonParser
-	 * @param ctxt the DeserializationContext
-	 * @return the user
-	 * @throws IOException if a exception during IO occurs
-	 * @throws JsonProcessingException if an error during JSON processing occurs
-	 */
-	@Override
-	public User deserialize(JsonParser jp, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException {
-		ObjectMapper mapper = (ObjectMapper) jp.getCodec();
-		JsonNode jsonNode = mapper.readTree(jp);
-		Set<GrantedAuthority> authorities = mapper.convertValue(
-				jsonNode.get("authorities"),
-				new TypeReference<Set<SimpleGrantedAuthority>>() {
-				});
-		JsonNode password = readJsonNode(jsonNode, "password");
-		User result = new User(readJsonNode(jsonNode, "username").asText(),
-				password.asText(""), readJsonNode(jsonNode, "enabled").asBoolean(),
-				readJsonNode(jsonNode, "accountNonExpired").asBoolean(),
-				readJsonNode(jsonNode, "credentialsNonExpired").asBoolean(),
-				readJsonNode(jsonNode, "accountNonLocked").asBoolean(), authorities);
-
-		if (password.asText(null) == null) {
-			result.eraseCredentials();
-		}
-		return result;
-	}
-
-	private JsonNode readJsonNode(JsonNode jsonNode, String field) {
-		return jsonNode.has(field) ? jsonNode.get(field) : MissingNode.getInstance();
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/UserMixin.java

@@ -1,50 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-/**
- * This mixin class helps in serialize/deserialize
- * {@link org.springframework.security.core.userdetails.User}. This class also register a
- * custom deserializer {@link UserDeserializer} to deserialize User object successfully.
- * In order to use this mixin you need to register two more mixin classes in your
- * ObjectMapper configuration.
- * <ol>
- * <li>{@link SimpleGrantedAuthorityMixin}</li>
- * <li>{@link UnmodifiableSetMixin}</li>
- * </ol>
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh
- * @see UserDeserializer
- * @see CoreJackson2Module
- * @see SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonDeserialize(using = UserDeserializer.class)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
-@JsonIgnoreProperties(ignoreUnknown = true)
-abstract class UserMixin {
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenDeserializer.java

@@ -1,95 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import java.io.IOException;
-import java.util.List;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.MissingNode;
-
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.User;
-
-/**
- * Custom deserializer for {@link UsernamePasswordAuthenticationToken}. At the time of
- * deserialization it will invoke suitable constructor depending on the value of
- * <b>authenticated</b> property. It will ensure that the token's state must not change.
- * <p>
- * This deserializer is already registered with
- * {@link UsernamePasswordAuthenticationTokenMixin} but you can also registered it with
- * your own mixin class.
- *
- * @author Jitendra Singh
- * @see UsernamePasswordAuthenticationTokenMixin
- */
-class UsernamePasswordAuthenticationTokenDeserializer
-		extends JsonDeserializer<UsernamePasswordAuthenticationToken> {
-
-	/**
-	 * This method construct {@link UsernamePasswordAuthenticationToken} object from
-	 * serialized json.
-	 * @param jp the JsonParser
-	 * @param ctxt the DeserializationContext
-	 * @return the user
-	 * @throws IOException if a exception during IO occurs
-	 * @throws JsonProcessingException if an error during JSON processing occurs
-	 */
-	@Override
-	public UsernamePasswordAuthenticationToken deserialize(JsonParser jp,
-			DeserializationContext ctxt) throws IOException, JsonProcessingException {
-		UsernamePasswordAuthenticationToken token = null;
-		ObjectMapper mapper = (ObjectMapper) jp.getCodec();
-		JsonNode jsonNode = mapper.readTree(jp);
-		Boolean authenticated = readJsonNode(jsonNode, "authenticated").asBoolean();
-		JsonNode principalNode = readJsonNode(jsonNode, "principal");
-		Object principal = null;
-		if (principalNode.isObject()) {
-			principal = mapper.readValue(principalNode.toString(),
-					new TypeReference<User>() {
-					});
-		}
-		else {
-			principal = principalNode.asText();
-		}
-		Object credentials = readJsonNode(jsonNode, "credentials").asText();
-		List<GrantedAuthority> authorities = mapper.readValue(
-				readJsonNode(jsonNode, "authorities").toString(),
-				new TypeReference<List<GrantedAuthority>>() {
-				});
-		if (authenticated) {
-			token = new UsernamePasswordAuthenticationToken(principal, credentials,
-					authorities);
-		}
-		else {
-			token = new UsernamePasswordAuthenticationToken(principal, credentials);
-		}
-		token.setDetails(readJsonNode(jsonNode, "details"));
-		return token;
-	}
-
-	private JsonNode readJsonNode(JsonNode jsonNode, String field) {
-		return jsonNode.has(field) ? jsonNode.get(field) : MissingNode.getInstance();
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixin.java

@@ -1,49 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-/**
- * This mixin class is used to serialize / deserialize
- * {@link org.springframework.security.authentication.UsernamePasswordAuthenticationToken}
- * . This class register a custom deserializer
- * {@link UsernamePasswordAuthenticationTokenDeserializer}.
- *
- * In order to use this mixin you'll need to add 3 more mixin classes.
- * <ol>
- * <li>{@link UnmodifiableSetMixin}</li>
- * <li>{@link SimpleGrantedAuthorityMixin}</li>
- * <li>{@link UserMixin}</li>
- * </ol>
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new CoreJackson2Module());
- * </pre>
- * @author Jitendra Singh
- * @see CoreJackson2Module
- * @see SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
-@JsonDeserialize(using = UsernamePasswordAuthenticationTokenDeserializer.class)
-abstract class UsernamePasswordAuthenticationTokenMixin {
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/jackson2/package-info.java

@@ -1,27 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Mix-in classes to add Jackson serialization support.
- *
- * @author Jitendra Singh
- * @since 4.2
- */
-package org.springframework.security.jackson2;
-
-/**
- * Package contains Jackson mixin classes.
- */

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java

@@ -1,64 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import java.io.IOException;
-
-import javax.servlet.http.Cookie;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.MissingNode;
-import com.fasterxml.jackson.databind.node.NullNode;
-
-/**
- * Jackson deserializer for {@link Cookie}. This is needed because in most cases we don't
- * set {@link Cookie#getDomain()} property. So when jackson deserialize that json
- * {@link Cookie#setDomain(String)} throws {@link NullPointerException}. This is
- * registered with {@link CookieMixin} but you can also use it with your own mixin.
- *
- * @author Jitendra Singh
- * @see CookieMixin
- */
-class CookieDeserializer extends JsonDeserializer<Cookie> {
-
-	@Override
-	public Cookie deserialize(JsonParser jp, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException {
-		ObjectMapper mapper = (ObjectMapper) jp.getCodec();
-		JsonNode jsonNode = mapper.readTree(jp);
-		Cookie cookie = new Cookie(readJsonNode(jsonNode, "name").asText(),
-				readJsonNode(jsonNode, "value").asText());
-		cookie.setComment(readJsonNode(jsonNode, "comment").asText());
-		cookie.setDomain(readJsonNode(jsonNode, "domain").asText());
-		cookie.setMaxAge(readJsonNode(jsonNode, "maxAge").asInt(-1));
-		cookie.setSecure(readJsonNode(jsonNode, "secure").asBoolean());
-		cookie.setVersion(readJsonNode(jsonNode, "version").asInt());
-		cookie.setPath(readJsonNode(jsonNode, "path").asText());
-		cookie.setHttpOnly(readJsonNode(jsonNode, "httpOnly").asBoolean());
-		return cookie;
-	}
-
-	private JsonNode readJsonNode(JsonNode jsonNode, String field) {
-		return jsonNode.has(field) && !(jsonNode.get(field) instanceof NullNode)
-				? jsonNode.get(field) : MissingNode.getInstance();
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/CookieMixin.java

@@ -1,40 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-/**
- * Mixin class to serialize/deserialize {@link javax.servlet.http.Cookie}
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new WebJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh
- * @see WebJackson2Module
- * @see org.springframework.security.jackson2.SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonDeserialize(using = CookieDeserializer.class)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, isGetterVisibility = JsonAutoDetect.Visibility.NONE)
-abstract class CookieMixin {
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java

@@ -1,55 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-/**
- * Jackson mixin class to serialize/deserialize
- * {@link org.springframework.security.web.csrf.DefaultCsrfToken} serialization support.
- *
- * <pre>
- * 		ObjectMapper mapper = new ObjectMapper();
- *		mapper.registerModule(new WebJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh
- * @see WebJackson2Module
- * @see org.springframework.security.jackson2.SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@class")
-@JsonIgnoreProperties(ignoreUnknown = true)
-class DefaultCsrfTokenMixin {
-
-	/**
-	 * JsonCreator constructor needed by Jackson to create
-	 * {@link org.springframework.security.web.csrf.DefaultCsrfToken} object.
-	 *
-	 * @param headerName the name of the header
-	 * @param parameterName the parameter name
-	 * @param token the CSRF token value
-	 */
-	@JsonCreator
-	DefaultCsrfTokenMixin(@JsonProperty("headerName") String headerName,
-			@JsonProperty("parameterName") String parameterName,
-			@JsonProperty("token") String token) {
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixin.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import org.springframework.security.web.savedrequest.DefaultSavedRequest;
-
-/**
- * Jackson mixin class to serialize/deserialize {@link DefaultSavedRequest}. This mixin
- * use {@link org.springframework.security.web.savedrequest.DefaultSavedRequest.Builder}
- * to deserialized json.In order to use this mixin class you also need to register
- * {@link CookieMixin}.
- * <p>
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new WebJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh
- * @see WebJackson2Module
- * @see org.springframework.security.jackson2.SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonDeserialize(builder = DefaultSavedRequestBuilder.class)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
-abstract class DefaultSavedRequestMixin {
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-/**
- * Jackson mixin class to serialize/deserialize
- * {@link org.springframework.security.web.savedrequest.SavedCookie} serialization
- * support.
- *
- * <pre>
- * 		ObjectMapper mapper = new ObjectMapper();
- *		mapper.registerModule(new WebJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh.
- * @see WebJackson2Module
- * @see org.springframework.security.jackson2.SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
-@JsonIgnoreProperties(ignoreUnknown = true)
-abstract class SavedCookieMixin {
-
-	@JsonCreator
-	SavedCookieMixin(@JsonProperty("name") String name,
-			@JsonProperty("value") String value, @JsonProperty("comment") String comment,
-			@JsonProperty("domain") String domain, @JsonProperty("maxAge") int maxAge,
-			@JsonProperty("path") String path, @JsonProperty("secure") boolean secure,
-			@JsonProperty("version") int version) {
-
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/WebAuthenticationDetailsMixin.java

@@ -1,48 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
-/**
- * Jackson mixin class to serialize/deserialize
- * {@link org.springframework.security.web.authentication.WebAuthenticationDetails}.
- *
- * <pre>
- * 	ObjectMapper mapper = new ObjectMapper();
- *	mapper.registerModule(new WebJackson2Module());
- * </pre>
- *
- * @author Jitendra Singh
- * @see WebJackson2Module
- * @see org.springframework.security.jackson2.SecurityJacksonModules
- * @since 4.2
- */
-@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
-@JsonIgnoreProperties(ignoreUnknown = true)
-@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.ANY)
-class WebAuthenticationDetailsMixin {
-
-	@JsonCreator
-	WebAuthenticationDetailsMixin(@JsonProperty("remoteAddress") String remoteAddress,
-			@JsonProperty("sessionId") String sessionId) {
-	}
-}

samples/httpsession-redis-json/src/main/java/org/springframework/security/web/jackson2/WebJackson2Module.java

@@ -1,65 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.security.web.jackson2;
-
-import javax.servlet.http.Cookie;
-
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-
-import org.springframework.security.jackson2.SecurityJacksonModules;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
-import org.springframework.security.web.csrf.DefaultCsrfToken;
-import org.springframework.security.web.savedrequest.DefaultSavedRequest;
-import org.springframework.security.web.savedrequest.SavedCookie;
-
-/**
- * Jackson module for spring-security-web. This module register {@link CookieMixin},
- * {@link DefaultCsrfTokenMixin}, {@link DefaultSavedRequestMixin} and
- * {@link WebAuthenticationDetailsMixin}. If no default typing enabled by default then
- * it'll enable it because typing info is needed to properly serialize/deserialize
- * objects. In order to use this module just add this module into your ObjectMapper
- * configuration.
- *
- * <pre>
- *     ObjectMapper mapper = new ObjectMapper();
- *     mapper.registerModule(new WebJackson2Module());
- * </pre> <b>Note: use {@link SecurityJacksonModules#getModules(ClassLoader)} to get list
- * of all security modules.</b>
- *
- * @author Jitendra Singh
- * @see SecurityJacksonModules
- */
-public class WebJackson2Module extends SimpleModule {
-
-	public WebJackson2Module() {
-		super(WebJackson2Module.class.getName(), new Version(1, 0, 0, null, null, null));
-	}
-
-	@Override
-	public void setupModule(SetupContext context) {
-		SecurityJacksonModules.enableDefaultTyping((ObjectMapper) context.getOwner());
-		context.setMixInAnnotations(Cookie.class, CookieMixin.class);
-		context.setMixInAnnotations(SavedCookie.class, SavedCookieMixin.class);
-		context.setMixInAnnotations(DefaultCsrfToken.class, DefaultCsrfTokenMixin.class);
-		context.setMixInAnnotations(DefaultSavedRequest.class,
-				DefaultSavedRequestMixin.class);
-		context.setMixInAnnotations(WebAuthenticationDetails.class,
-				WebAuthenticationDetailsMixin.class);
-	}
-}

samples/httpsession-redis-json/src/main/java/sample/config/SessionConfig.java

@@ -19,10 +19,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 import org.springframework.beans.factory.BeanClassLoaderAware;
 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.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.security.jackson2.SecurityJacksonModules;
+import org.springframework.security.jackson2.SecurityJackson2Modules;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 
 /**
@@ -39,8 +39,8 @@ public class SessionConfig implements BeanClassLoaderAware {
 	}
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory();
 	}
 
 	/**
@@ -51,7 +51,7 @@ public class SessionConfig implements BeanClassLoaderAware {
 	 */
 	ObjectMapper objectMapper() {
 		ObjectMapper mapper = new ObjectMapper();
-		mapper.registerModules(SecurityJacksonModules.getModules(this.loader));
+		mapper.registerModules(SecurityJackson2Modules.getModules(this.loader));
 		return mapper;
 	}
 

samples/httpsession-xml/build.gradle

@@ -3,8 +3,11 @@ apply from: TOMCAT_7_GRADLE
 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

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

@@ -13,6 +13,6 @@
 	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
 
 	<!--2-->
-	<bean class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"/>
+	<bean class="org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory"/>
 	<!-- end::beans[] -->
 </beans>

samples/httpsession/build.gradle

@@ -3,8 +3,11 @@ apply from: TOMCAT_7_GRADLE
 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

samples/httpsession/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;
 
 // tag::class[]
@@ -25,8 +25,8 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 public class Config {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <2>
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory(); // <2>
 	}
 }
 // end::class[]

samples/mongo/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: SAMPLE_GRADLE
@@ -18,15 +18,14 @@ dependencies {
 	compile project(':spring-session'),
 			"org.springframework.boot:spring-boot-starter-data-mongodb",
 			"org.springframework.boot:spring-boot-starter-web",
+			"org.springframework.boot:spring-boot-starter-security",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator",
-			"de.flapdoodle.embed:de.flapdoodle.embed.mongo",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion"
+			"de.flapdoodle.embed:de.flapdoodle.embed.mongo"
 
 	testCompile "org.springframework.boot:spring-boot-starter-test"
 

samples/rest/build.gradle

@@ -3,7 +3,10 @@ apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
 dependencies {
-	compile project(':spring-session-data-redis'),
+	compile(project(':spring-session-data-redis')) {
+		exclude module: 'jedis'
+	}
+	compile "biz.paluch.redis:lettuce:$lettuceVersion",
 			"org.springframework:spring-webmvc:$springVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",

samples/rest/src/main/java/sample/HttpSessionConfig.java

@@ -18,7 +18,7 @@ package sample;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-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.HeaderHttpSessionStrategy;
 import org.springframework.session.web.http.HttpSessionStrategy;
@@ -29,8 +29,8 @@ import org.springframework.session.web.http.HttpSessionStrategy;
 public class HttpSessionConfig {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <2>
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory(); // <2>
 	}
 
 	@Bean

samples/security/build.gradle

@@ -3,10 +3,13 @@ apply from: TOMCAT_7_GRADLE
 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",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
+			"biz.paluch.redis:lettuce:$lettuceVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:webjars-taglib:$webjarsTaglibVersion",
 			jstlDependencies

samples/security/src/main/java/sample/Config.java

@@ -18,7 +18,7 @@ package sample;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-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;
 
 // tag::class[]
@@ -27,8 +27,8 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 public class Config {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <2>
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory(); // <2>
 	}
 }
 // end::class[]

samples/users/build.gradle

@@ -3,9 +3,12 @@ apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
 dependencies {
-	compile project(':spring-session-data-redis'),
-			"org.springframework:spring-web:$springVersion",
-			"org.webjars:bootstrap:3.3.6",
+	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
 

samples/users/src/main/java/sample/Config.java

@@ -18,7 +18,7 @@ package sample;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-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;
 
 /**
@@ -31,8 +31,8 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR
 public class Config {
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory();
 	}
 }
 // end::class[]

samples/websocket/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 	}
 }
 
-apply plugin: 'spring-boot'
+apply plugin: 'org.springframework.boot'
 
 apply from: JAVA_GRADLE
 apply from: TOMCAT_7_GRADLE
@@ -16,8 +16,10 @@ apply from: SAMPLE_GRADLE
 group = 'samples'
 
 dependencies {
-	compile project(':spring-session-data-redis'),
-			"org.springframework.boot:spring-boot-starter-web",
+	compile(project(':spring-session-data-redis')) {
+		exclude module: 'jedis'
+	}
+	compile "org.springframework.boot:spring-boot-starter-web",
 			"org.springframework.boot:spring-boot-starter-data-jpa",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"org.springframework.boot:spring-boot-starter-websocket",
@@ -25,6 +27,7 @@ dependencies {
 			"org.springframework.data:spring-data-jpa",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
 			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
+			"biz.paluch.redis:lettuce:$lettuceVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:knockout:2.3.0",

samples/websocket/src/main/java/sample/config/DataSourceConfig.java

@@ -20,7 +20,7 @@ import javax.sql.DataSource;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 
@@ -34,7 +34,7 @@ public class DataSourceConfig {
 	}
 
 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
+	public LettuceConnectionFactory connectionFactory() {
+		return new LettuceConnectionFactory();
 	}
 }

settings.gradle

@@ -27,7 +27,7 @@ include 'samples:grails3'
 
 include 'spring-session'
 include 'spring-session-data-gemfire'
-include 'spring-session-data-geode'
-include 'spring-session-data-redis'
-include 'spring-session-jdbc'
 include 'spring-session-data-mongo'
+include 'spring-session-data-redis'
+include 'spring-session-hazelcast'
+include 'spring-session-jdbc'

spring-session-data-gemfire/build.gradle

@@ -1,5 +1,6 @@
 apply from: JAVA_GRADLE
 apply from: MAVEN_GRADLE
+apply from: BOM_GRADLE
 apply plugin: 'spring-io'
 
 description = "Aggregator for Spring Session and Spring Data GemFire"

spring-session-data-geode/build.gradle

@@ -1,21 +0,0 @@
-apply from: JAVA_GRADLE
-apply from: MAVEN_GRADLE
-apply plugin: 'spring-io'
-
-description = "Aggregator for Spring Session and Spring Data GemFire with Apache Geode support"
-
-dependencies {
-	compile project(':spring-session')
-	compile("org.springframework.data:spring-data-geode:$springDataGeodeVersion") {
-		exclude group: "org.slf4j", module: 'slf4j-api'
-		exclude group: "org.slf4j", module: 'jcl-over-slf4j'
-	}
-}
-
-dependencyManagement {
-	springIoTestRuntime {
-		imports {
-			mavenBom "io.spring.platform:platform-bom:${springIoVersion}"
-		}
-	}
-}

spring-session-data-mongo/build.gradle

@@ -1,5 +1,6 @@
 apply from: JAVA_GRADLE
 apply from: MAVEN_GRADLE
+apply from: BOM_GRADLE
 
 apply plugin: 'spring-io'
 
@@ -16,4 +17,4 @@ dependencyManagement {
 			mavenBom "io.spring.platform:platform-bom:${springIoVersion}"
 		}
 	}
-}
+}

spring-session-data-redis/build.gradle

@@ -1,5 +1,6 @@
 apply from: JAVA_GRADLE
 apply from: MAVEN_GRADLE
+apply from: BOM_GRADLE
 
 apply plugin: 'spring-io'
 

spring-session-hazelcast/build.gradle

@@ -0,0 +1,20 @@
+apply from: JAVA_GRADLE
+apply from: MAVEN_GRADLE
+apply from: BOM_GRADLE
+
+apply plugin: 'spring-io'
+
+description = "Aggregator for Spring Session and Hazelcast"
+
+dependencies {
+	compile project(':spring-session'),
+			"com.hazelcast:hazelcast:$hazelcastVersion"
+}
+
+dependencyManagement {
+	springIoTestRuntime {
+		imports {
+			mavenBom "io.spring.platform:platform-bom:${springIoVersion}"
+		}
+	}
+}

spring-session-jdbc/build.gradle

@@ -1,5 +1,6 @@
 apply from: JAVA_GRADLE
 apply from: MAVEN_GRADLE
+apply from: BOM_GRADLE
 
 apply plugin: 'spring-io'
 

spring-session/build.gradle

@@ -25,7 +25,8 @@ dependencies {
 			"org.springframework:spring-web:$springVersion",
 			"org.springframework:spring-messaging:$springVersion",
 			"org.springframework:spring-websocket:$springVersion",
-			"org.springframework.security:spring-security-core:$springSecurityVersion"
+			"org.springframework.security:spring-security-core:$springSecurityVersion",
+			"org.springframework.security:spring-security-web:$springSecurityVersion"
 	provided "javax.servlet:javax.servlet-api:$servletApiVersion"
 	integrationTestCompile "redis.clients:jedis:$jedisVersion",
 			"org.apache.commons:commons-pool2:2.2",
@@ -38,13 +39,14 @@ dependencies {
 	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
 
 	testCompile "junit:junit:$junitVersion",
-			'org.mockito:mockito-core:1.10.19',
+			"org.mockito:mockito-core:$mockitoVersion",
 			"edu.umd.cs.mtc:multithreadedtc:1.01",
 			"org.springframework:spring-test:$springVersion",
 			"org.assertj:assertj-core:$assertjVersion",
 			"org.springframework.security:spring-security-core:$springSecurityVersion"
 
 	jacoco "org.jacoco:org.jacoco.agent:0.7.2.201409121644:runtime"
+
 }
 
 dependencyManagement {

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionJavaConfigurationTests.java

@@ -42,9 +42,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The GemFireHttpSessionJavaConfigurationTests class is a test suite of test cases
- * testing the configuration of Spring Session backed by GemFire using Java-based
- * configuration meta-data.
+ * Test suite of test cases testing the configuration of Spring Session backed by GemFire
+ * using Java-based configuration meta-data.
  *
  * @author John Blum
  * @since 1.1.0
@@ -62,14 +61,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration
 @DirtiesContext
 @WebAppConfiguration
-public class GemFireHttpSessionJavaConfigurationTests
-		extends AbstractGemFireIntegrationTests {
+public class GemFireHttpSessionJavaConfigurationTests extends AbstractGemFireIntegrationTests {
 
 	@Autowired
 	private Cache gemfireCache;
 
 	protected <K, V> Region<K, V> assertCacheAndRegion(Cache gemfireCache,
 			String regionName, DataPolicy dataPolicy) {
+
 		assertThat(GemFireUtils.isPeer(gemfireCache)).isTrue();
 
 		Region<K, V> region = gemfireCache.getRegion(regionName);
@@ -81,16 +80,16 @@ public class GemFireHttpSessionJavaConfigurationTests
 
 	@Test
 	public void gemfireCacheConfigurationIsValid() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
-				"JavaExample", DataPolicy.REPLICATE);
+		Region<Object, ExpiringSession> example =
+			assertCacheAndRegion(this.gemfireCache, "JavaExample", DataPolicy.REPLICATE);
 
 		assertEntryIdleTimeout(example, ExpirationAction.INVALIDATE, 900);
 	}
 
 	@Test
 	public void verifyGemFireExampleCacheRegionPrincipalNameIndexWasCreatedSuccessfully() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
-				"JavaExample", DataPolicy.REPLICATE);
+		Region<Object, ExpiringSession> example =
+			assertCacheAndRegion(this.gemfireCache, "JavaExample", DataPolicy.REPLICATE);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
@@ -103,32 +102,38 @@ public class GemFireHttpSessionJavaConfigurationTests
 
 	@Test
 	public void verifyGemFireExampleCacheRegionSessionAttributesIndexWasNotCreated() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
-				"JavaExample", DataPolicy.REPLICATE);
+		Region<Object, ExpiringSession> example =
+			assertCacheAndRegion(this.gemfireCache, "JavaExample", DataPolicy.REPLICATE);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
 		assertThat(queryService).isNotNull();
 
-		Index sessionAttributesIndex = queryService.getIndex(example,
-				"sessionAttributesIndex");
+		Index sessionAttributesIndex = queryService.getIndex(example, "sessionAttributesIndex");
 
 		assertThat(sessionAttributesIndex).isNull();
 	}
 
-	@EnableGemFireHttpSession(indexableSessionAttributes = {}, maxInactiveIntervalInSeconds = 900, regionName = "JavaExample", serverRegionShortcut = RegionShortcut.REPLICATE)
+	@EnableGemFireHttpSession(indexableSessionAttributes = {}, maxInactiveIntervalInSeconds = 900,
+		regionName = "JavaExample", serverRegionShortcut = RegionShortcut.REPLICATE)
 	public static class GemFireConfiguration {
 
-		@Bean
 		Properties gemfireProperties() {
 			Properties gemfireProperties = new Properties();
-			gemfireProperties.setProperty("name",
-					GemFireHttpSessionJavaConfigurationTests.class.getName());
+			gemfireProperties.setProperty("name", applicationName());
 			gemfireProperties.setProperty("mcast-port", "0");
-			gemfireProperties.setProperty("log-level", "warning");
+			gemfireProperties.setProperty("log-level", logLevel());
 			return gemfireProperties;
 		}
 
+		String applicationName() {
+			return GemFireHttpSessionJavaConfigurationTests.class.getName();
+		}
+
+		String logLevel() {
+			return "warning";
+		}
+
 		@Bean
 		CacheFactoryBean gemfireCache() {
 			CacheFactoryBean cacheFactory = new CacheFactoryBean();
@@ -139,5 +144,4 @@ public class GemFireHttpSessionJavaConfigurationTests
 			return cacheFactory;
 		}
 	}
-
 }

spring-session/src/integration-test/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionXmlConfigurationTests.java

@@ -37,9 +37,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * The GemFireHttpSessionXmlConfigurationTests class is a test suite of test cases testing
- * the configuration of Spring Session backed by GemFire using XML configuration
- * meta-data.
+ * Test suite of test cases testing the configuration of Spring Session backed by GemFire
+ * using XML configuration meta-data.
  *
  * @author John Blum
  * @since 1.1.0
@@ -57,14 +56,14 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ContextConfiguration
 @DirtiesContext
 @WebAppConfiguration
-public class GemFireHttpSessionXmlConfigurationTests
-		extends AbstractGemFireIntegrationTests {
+public class GemFireHttpSessionXmlConfigurationTests extends AbstractGemFireIntegrationTests {
 
 	@Autowired
 	private Cache gemfireCache;
 
 	protected <K, V> Region<K, V> assertCacheAndRegion(Cache gemfireCache,
 			String regionName, DataPolicy dataPolicy) {
+
 		assertThat(GemFireUtils.isPeer(gemfireCache)).isTrue();
 
 		Region<K, V> region = gemfireCache.getRegion(regionName);
@@ -76,16 +75,16 @@ public class GemFireHttpSessionXmlConfigurationTests
 
 	@Test
 	public void gemfireCacheConfigurationIsValid() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
-				"XmlExample", DataPolicy.NORMAL);
+		Region<Object, ExpiringSession> example =
+			assertCacheAndRegion(this.gemfireCache, "XmlExample", DataPolicy.NORMAL);
 
 		assertEntryIdleTimeout(example, ExpirationAction.INVALIDATE, 3600);
 	}
 
 	@Test
 	public void verifyGemFireExampleCacheRegionPrincipalNameIndexWasCreatedSuccessfully() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
-				"XmlExample", DataPolicy.NORMAL);
+		Region<Object, ExpiringSession> example =
+			assertCacheAndRegion(this.gemfireCache, "XmlExample", DataPolicy.NORMAL);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
@@ -98,18 +97,16 @@ public class GemFireHttpSessionXmlConfigurationTests
 
 	@Test
 	public void verifyGemFireExampleCacheRegionSessionAttributesIndexWasCreatedSuccessfully() {
-		Region<Object, ExpiringSession> example = assertCacheAndRegion(this.gemfireCache,
-				"XmlExample", DataPolicy.NORMAL);
+		Region<Object, ExpiringSession> example =
+			assertCacheAndRegion(this.gemfireCache, "XmlExample", DataPolicy.NORMAL);
 
 		QueryService queryService = example.getRegionService().getQueryService();
 
 		assertThat(queryService).isNotNull();
 
-		Index sessionAttributesIndex = queryService.getIndex(example,
-				"sessionAttributesIndex");
+		Index sessionAttributesIndex = queryService.getIndex(example, "sessionAttributesIndex");
 
 		assertIndex(sessionAttributesIndex, "s.attributes['one', 'two', 'three']",
-				String.format("%1$s s", example.getFullPath()));
+			String.format("%1$s s", example.getFullPath()));
 	}
-
 }

spring-session/src/integration-test/java/org/springframework/session/hazelcast/AbstractHazelcastRepositoryITests.java

@@ -21,8 +21,8 @@ import com.hazelcast.core.IMap;
 import org.junit.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.session.ExpiringSession;
-import org.springframework.session.SessionRepository;
+import org.springframework.session.MapSession;
+import org.springframework.session.hazelcast.HazelcastSessionRepository.HazelcastSession;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -32,20 +32,21 @@ import static org.assertj.core.api.Assertions.assertThat;
  * @author Tommy Ludwig
  * @author Vedran Pavic
  */
-public abstract class AbstractHazelcastRepositoryITests<S extends ExpiringSession> {
+public abstract class AbstractHazelcastRepositoryITests {
 
 	@Autowired
 	private HazelcastInstance hazelcast;
 
 	@Autowired
-	private SessionRepository<S> repository;
+	private HazelcastSessionRepository repository;
 
 	@Test
 	public void createAndDestroySession() {
-		S sessionToSave = this.repository.createSession();
+		HazelcastSession sessionToSave = this.repository.createSession();
 		String sessionId = sessionToSave.getId();
 
-		IMap<String, S> hazelcastMap = this.hazelcast.getMap("spring:session:sessions");
+		IMap<String, MapSession> hazelcastMap = this.hazelcast.getMap(
+				"spring:session:sessions");
 
 		assertThat(hazelcastMap.size()).isEqualTo(0);
 

spring-session/src/integration-test/java/org/springframework/session/hazelcast/HazelcastClientRepositoryITests.java

@@ -25,7 +25,6 @@ import org.junit.runner.RunWith;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.session.ExpiringSession;
 import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -43,8 +42,7 @@ import org.springframework.util.SocketUtils;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
 @WebAppConfiguration
-public class HazelcastClientRepositoryITests<S extends ExpiringSession>
-		extends AbstractHazelcastRepositoryITests<S> {
+public class HazelcastClientRepositoryITests extends AbstractHazelcastRepositoryITests {
 
 	private static final int PORT = SocketUtils.findAvailableTcpPort();