Release version 1.0.1.RELEASE

2015-04-15 13:43:14 -07:00
154 changed files with 873 additions and 14350 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ bin
 .project
 target
 out
-.springBeans
-*.rdb
+.springBeans
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1,30 +0,0 @@
-= Contributing to Spring Session
-
-Spring Session is released under the Apache 2.0 license. If you would like to contribute
-something, or simply want to hack on the code this document should help you get started.
-
-
-
-== Using GitHub issues
-
-We use GitHub issues to track bugs and enhancements. If you have a general usage question
-please ask on http://stackoverflow.com[Stack Overflow]. The Spring Session team and the
-broader community monitor the http://stackoverflow.com/tags/spring-session[`spring-session`]
-tag.
-
-If you are reporting a bug, please help to speed up problem diagnosis by providing as much
-information as possible. Ideally, that would include a small sample project that
-reproduces the problem.
-
-
-
-== Sign the Contributor License Agreement
-Before we accept a non-trivial patch or pull request we will need you to sign the
-https://support.springsource.com/spring_committer_signup[contributor's agreement].
-If you have previously signed the CLA for any project, there is no need to sign up again.
-Signing the contributor's agreement does not grant anyone commit rights to the main
-repository, but it does mean that we can accept your contributions, and you will get an
-author credit if we do.  Active contributors might be asked to join the core team, and
-given the ability to merge pull requests. Use the project `Spring Security` (the parent project)
-and '`Rob Winch`' in the project lead field when you complete the form.
-
--- a/README.adoc
+++ b/README.adoc
@@ -11,7 +11,7 @@ Spring Session aims to provide a common infrastructure for managing sessions. Th

 = Spring Session Project Site

-You can find the documentation, issue management, support, samples, and guides for using Spring Session at http://projects.spring.io/spring-session/
+You can find the documentation, issue management, support, samples, and guides for using Spring Session at http://spring.io/spring-session/

 = License

--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 	dependencies {
 		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-		classpath("io.spring.gradle:spring-io-plugin:0.0.4.RELEASE")
+		classpath("org.springframework.build.gradle:spring-io-plugin:0.0.3.RELEASE")
 		classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
 		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2'
 	}
@@ -15,7 +15,6 @@ group = 'org.springframework.session'

 ext.springBootVersion = '1.2.3.RELEASE'
 ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
-ext.SPRING3_GRADLE = "$rootDir/gradle/spring3.gradle"
 ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
 ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle"
 ext.TOMCAT_6_GRADLE = "$rootDir/gradle/tomcat6.gradle"
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -1,21 +1,6 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'org.kordamp.gradle:livereload-gradle-plugin:0.2.1'
-    }
-}
-
-apply plugin: 'org.kordamp.gradle.livereload'
 apply plugin: 'java'
 apply plugin: 'org.asciidoctor.convert'

-liveReload {
-	docRoot asciidoctor.sourceDir.canonicalPath
-}
-
 asciidoctorj {

 }
@@ -27,12 +12,10 @@ dependencies {
 				"org.springframework.data:spring-data-redis:$springDataRedisVersion",
 				"org.springframework:spring-websocket:${springVersion}",
 				"org.springframework:spring-messaging:${springVersion}",
-				"org.springframework.security:spring-security-web:${springSecurityVersion}",
 				'junit:junit:4.11',
 				'org.mockito:mockito-core:1.9.5',
 				"org.springframework:spring-test:$springVersion",
 				'org.easytesting:fest-assert:1.4',
-				"com.hazelcast:hazelcast:$hazelcastVersion",
 				"redis.clients:jedis:2.4.1",
 				"javax.servlet:javax.servlet-api:$servletApiVersion"
 }
@@ -48,7 +31,6 @@ asciidoctor {
 			'download-url' : "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
 			'spring-session-version' : version,
 			'spring-version' : springVersion,
-			'hazelcast-version' : hazelcastVersion,
 			'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
 			'docs-test-resources-dir' : rootProject.projectDir.path + '/docs/src/test/resources/',
 			'samples-dir' : rootProject.projectDir.path + '/samples/',
--- a/docs/src/docs/asciidoc/guides/boot.adoc
+++ b/docs/src/docs/asciidoc/guides/boot.adoc
@@ -82,9 +82,8 @@ In this instance Spring Session is backed by Redis.
 [[boot-redis-configuration]]
 == Configuring the Redis Connection

-Spring Boot automatically creates a `RedisConnectionFactory` that connects Spring Session to a Redis Server on localhost on port 6379 (default port).
-In a production environment you need to ensure to update your configuration to point to your Redis server.
-For example, you can include the following in your *application.properties*
+Spring Boot automatically creates a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
+In a production environment you need to ensure to update your configuration to point to your Redis server. For example, you can include the following in your *application.properties*

 .src/main/resources/application.properties
 ----
@@ -115,12 +114,6 @@ The boot Sample Application demonstrates how to use Spring Session to transparen

 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:

-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
 ----
 $ ./gradlew :samples:boot:bootRun
 ----
--- a/docs/src/docs/asciidoc/guides/custom-cookie.adoc
+++ b/docs/src/docs/asciidoc/guides/custom-cookie.adoc
@@ -1,101 +0,0 @@
-= Spring Session - Custom Cookie
-Rob Winch
-:toc:
-
-This guide describes how to configure Spring Session to use custom cookies with Java Configuration.
-The guide assumes you have already link:./httpsession.html[setup Spring Session in your project].
-
-NOTE: The completed guide can be found in the <<custom-cookie-sample, Custom Cookie sample application>>.
-
-[[custom-cookie-spring-configuration]]
-== Spring Java Configuration
-
-Once you have setup Spring Session you can easily customize how the session cookie is written by exposing a `CookieSerializer` as a Spring Bean.
-Out of the box, Spring Session comes with `DefaultCookieSerializer`.
-Simply exposing the `DefaultCookieSerializer` as a Spring Bean will augment the existing configuration when using configurations like `@EnableRedisHttpSession`.
-You can find an example of customizing Spring Session's cookie below:
-
-[source,java]
----
-include::{samples-dir}custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
----
-
-<1> We customize the name of the cookie to be JSESSIONID
-<2> We customize the path of the cookie to be "/" (rather than the default of the context root)
-<3> We customize the domain name pattern (a regular expression) to be `^.+?\\.(\\w+\\.[a-z]+)$`
-This allows sharing a session across domains and applications.
-If the regular expression does not match, no domain is set and the existing domain will be used.
-If the regular expression matches, the first https://docs.oracle.com/javase/tutorial/essential/regex/groups.html[grouping] will be used as the domain.
-This means that a request to https://child.example.com will set the domain to example.com.
-However, a request to http://localhost:8080/ or http://192.168.1.100:8080/ will leave the cookie unset and thus still work in development without any changes necessary for production.
-
-[WARNING]
-====
-It is important to note that users should only match on valid domain characters since the domain name is reflected in the response.
-This is prevent a malicious user from performing attacks like https://en.wikipedia.org/wiki/HTTP_response_splitting[HTTP Response Splitting].
-====
-
-[[custom-cookie-options]]
-== Configuration Options
-
-The configuration options available are:
-
-* `cookieName` - the name of the cookie to use
-Default "SESSION"
-* `useSecureCookie` - specify if a secure cookie be used
-Default use value of `HttpServletRequest.isSecure()` at the time of creation.
-* `cookiePath` - the path of the cookie
-Default is context root
-* `cookieMaxAge` - specifies the max age of the cookie to be set at the time the session is created.
-Default is -1 which indicates the cookie will be removed when the browser is closed.
-* `jvmRoute` - specifies a suffix to be appended to the session id and included in the cookie.
-Used to identify which JVM to route to for session affinity.
-With some implementations (i.e. Redis) this provides no performance benefit.
-However, this can help with tracing logs of a particular user.
-* `domainName` - allows specifying a specific domain name to be used for the cookie.
-This option is simple to understand, but will likely require a different configuration between development and production environments.
-See domainNamePattern as an alternative.
-* `domainNamePattern` - a case insensitive pattern used to extract the domain name from the `HttpServletRequest#getServerName()`.
-The pattern should provide a single grouping used to extract the value of the cookie domain.
-If the regular expression does not match, no domain is set and the existing domain will be used.
-If the regular expression matches, the first https://docs.oracle.com/javase/tutorial/essential/regex/groups.html[grouping] will be used as the domain.
-
-[WARNING]
-====
-It is important to note that users should only match on valid domain characters since the domain name is reflected in the response.
-This is prevent a malicious user from performing attacks like https://en.wikipedia.org/wiki/HTTP_response_splitting[HTTP Response Splitting].
-====
-
-
-[[custom-cookie-sample]]
-== custom-cookie Sample Application
-
-
-
-=== Running the custom-cookie Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
----
-$ ./gradlew :samples:custom-cookie:tomcatRun
----
-
-You should now be able to access the application at http://localhost:8080/
-
-=== Exploring the custom-cookie Sample Application
-
-Try using the application. Fill out the form with the following information:
-
-* **Attribute Name:** _username_
-* **Attribute Value:** _rob_
-
-Now click the **Set Attribute** button.
-You should now see the values displayed in the table.
-
-If you look at the cookies for the application, you can see the cookie is saved to the custom name of JSESSIONID
--- a/docs/src/docs/asciidoc/guides/findbyusername.adoc
+++ b/docs/src/docs/asciidoc/guides/findbyusername.adoc
@@ -1,175 +0,0 @@
-= Spring Session - find by username
-Rob Winch
-:toc:
-
-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
-
-The guide assumes you have already added Spring Session using the built in Redis configuration support to your application.
-The guide also assumes you have already applied Spring Security to your application.
-However, we the guide will be somewhat general purpose and can be applied to any technology with minimal changes we will discuss.
-
-[NOTE]
-====
-If you need to learn how to add Spring Session to your project, please refer to the listing of link:../#samples[samples and guides]
-====
-
-== About the Sample
-
-Our sample is using this feature to invalidate the users session that might have been compromised.
-Consider the following scenario:
-
-* User goes to library and authenticates to the application
-* User goes home and realizes they forgot to log out
-* User can log in and terminate the session from the library using clues like the location, created time, last accessed time, etc.
-
-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.
-
-[[findbyusernamesessionrepository]]
-== FindByUsernameSessionRepository
-
-In order to look up a user by their username, you must first choose a `SessionRepository` that implements <<index.doc#ap-findbyusernamesessionrepository,FindByUsernameSessionRepository>>.
-Our sample application assumes that the Redis support is already setup, so we are ready to go.
-
-== Mapping the username
-
-`FindByUsernameSessionRepository` can only find a session by the username, if the developer instructs Spring Session what user is associated with the `Session`.
-This is done by ensuring that the session attribute with the name `Session.FindByUsernameSessionRepository` is populated with the username.
-
-Generally, speaking this can be done with the following code immediately after the user authenticates:
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SpringSessionPrincipalNameSuccessHandler.java[tags=set-username]
----
-
-== Mapping the username with Spring Security
-
-Since we are using Spring Security, it makes perfect sense to provide a custom `AuthenticationSuccessHandler` that populates the username.
-For example:
-
-[NOTE]
-====
-We plan to provide first class integration with Spring Security to make this process easier in the future.
-For details track https://github.com/spring-projects/spring-session/issues/266[gh-266].
-====
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SpringSessionPrincipalNameSuccessHandler.java[tags=class]
----
-
-In order to support multiple handlers, we need to also create a custom `AuthenticationSuccessHandler` that delegates to multiple `AuthenticationSuccessHandler` instances.
-For example:
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/session/CompositeAuthenticationSuccessHandler.java[tags=class]
----
-
-Next we need to provide a custom `AuthenticationSuccessHandler` with Spring Security.
-In Java configuration, we can do this using the following:
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/config/SecurityConfig.java[tags=handler]
----
-
-We can then configure authentication success with the following:
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/config/SecurityConfig.java[tags=config]
----
-
-== Adding Additional Data to Session
-
-It may be nice to associate additional information (i.e. IP Address, the browser, location, etc) to the session.
-This makes it easier for the user to know which session they are looking at.
-
-To do this simply determine which session attribute you want to use and what information you wish to provide.
-Then create a Java bean that is added as a session attribute.
-For example, our sample application includes the location and access type of the session
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
----
-
-We then inject that information into the session on each HTTP request using a `SessionDetailsFilter`.
-For example:
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
----
-
-We obtain the information we want and then set the `SessionDetails` as an attribute in the `Session`.
-When we retrieve the `Session` by username, we can then use the session to access our `SessionDetails` just like any other session attribute.
-
-[NOTE]
-====
-You might be wondering at this point why Spring Session does not provide `SessionDetails` functionality out of the box.
-The reason, is twofold.
-The first is that it is very trivial for applications to implement this themselves.
-The second reason is that the information that is populated in the session (and how frequently that information is updated) is highly application dependent.
-====
-
-== Finding sessions for a specific user
-
-We can now find all the sessions for a specific user.
-
-[source,java,indent=0]
----
-include::{samples-dir}findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
----
-
-In our instance, we find all sessions for the currently logged in user.
-However, this could easily be modified for an administrator to use a form to specify which user to look up.
-
-[[findbyusername-sample]]
-== findbyusername Sample Application
-
-=== Running the findbyusername Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
----
-$ ./gradlew :samples:findbyusername:tomcatRun
----
-
-You should now be able to access the application at http://localhost:8080/
-
-=== Exploring the security Sample Application
-
-Try using the application. Enter the following to log in:
-
-* **Username** _user_
-* **Password** _password_
-
-Now click the **Login** button.
-You should now see a message indicating your are logged in with the user entered previously.
-You should also see a listing of active sessions for the currently logged in user.
-
-Let's emulate the flow we discussed in the <<About the Sample>> section
-
-* Open a new incognito window and navigate to  http://localhost:8080/
-* Enter the following to log in:
-** **Username** _user_
-** **Password** _password_
-* Terminate your original session
-* Refresh the original window and see you are logged out
--- a/docs/src/docs/asciidoc/guides/hazelcast-spring.adoc
+++ b/docs/src/docs/asciidoc/guides/hazelcast-spring.adoc
@@ -1,191 +0,0 @@
-= Spring Session and Spring Security with Hazelcast
-Tommy Ludwig; Rob Winch
-:toc:
-
-This guide describes how to use Spring Session along with Spring Security using Hazelcast as your data store.
-It assumes you have already applied Spring Security to your application.
-
-NOTE: The completed guide can be found in the <<hazelcast-spring-security-sample, Hazelcast Spring Security sample application>>.
-
-== Updating Dependencies
-Before you use Spring Session, you must ensure to update your dependencies.
-If you are using Maven, ensure to add the following dependencies:
-
-.pom.xml
-[source,xml]
-[subs="verbatim,attributes"]
----
-<dependencies>
-	<!-- ... -->
-
-	<dependency>
-		<groupId>com.hazelcast</groupId>
-		<artifactId>hazelcast</artifactId>
-		<version>{hazelcast-version}</version>
-	</dependency>
-	<dependency>
-		<groupId>org.springframework</groupId>
-		<artifactId>spring-web</artifactId>
-		<version>{spring-version}</version>
-	</dependency>
-</dependencies>
----
-
-ifeval::["{version-snapshot}" == "true"]
-Since We are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
----
-<repositories>
-
-	<!-- ... -->
-
-	<repository>
-	<id>spring-snapshot</id>
-	<url>https://repo.spring.io/libs-snapshot</url>
-	</repository>
-</repositories>
----
-endif::[]
-
-ifeval::["{version-milestone}" == "true"]
-Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
-Ensure you have the following in your pom.xml:
-
-.pom.xml
-[source,xml]
----
-<repository>
-<id>spring-milestone</id>
-<url>https://repo.spring.io/libs-milestone</url>
-</repository>
----
-endif::[]
-
-[[security-spring-configuration]]
-== Spring Configuration
-
-After adding the required dependencies, we can create our Spring configuration.
-The Spring configuration is responsible for creating a Servlet Filter that replaces the `HttpSession` implementation with an implementation backed by Spring Session.
-Add the following Spring Configuration:
-
-[source,java]
----
-include::{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.
-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/hazelcast-documentation.html#hazelcast-configuration[reference documentation].
-
-== Servlet Container Initialization
-
-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.
-
-.src/main/java/sample/SecurityInitializer.java
-[source,java]
----
-include::{samples-dir}hazelcast-spring/src/main/java/sample/SecurityInitializer.java[tags=class]
----
-
-Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
-It is extremely important that Spring Session's `springSessionRepositoryFilter` is invoked before Spring Security's `springSecurityFilterChain`.
-This ensures that the `HttpSession` that Spring Security uses is backed by Spring Session.
-Fortunately, Spring Session provides a utility class named `AbstractHttpSessionApplicationInitializer` that makes this extremely easy.
-You can find an example below:
-
-.src/main/java/sample/Initializer.java
-[source,java]
----
-include::{samples-dir}hazelcast-spring/src/main/java/sample/Initializer.java[tags=class]
----
-
-NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
-
-By extending `AbstractHttpSessionApplicationInitializer` we ensure that the Spring Bean by the name `springSessionRepositoryFilter` is registered with our Servlet Container for every request before Spring Security's `springSecurityFilterChain`.
-
-
-
-[[hazelcast-spring-security-sample]]
-== Hazelcast Spring Security Sample Application
-
-=== Running the Sample Application
-
-You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
-
-[NOTE]
-====
-Hazelcast will run in embedded mode with your application by default, but if you want to connect
-to a stand alone instance instead, you can configure it by following the instructions in the
-http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#hazelcast-configuration[reference documentation].
-====
-
----
-$ ./gradlew :samples:hazelcast-spring:tomcatRun
----
-
-You should now be able to access the application at http://localhost:8080/
-
-=== Exploring the security Sample Application
-
-Try using the application. Enter the following to log in:
-
-* **Username** _user_
-* **Password** _password_
-
-Now click the **Login** button.
-You should now see a message indicating your are logged in with the user entered previously.
-The user's information is stored in Hazelcast rather than Tomcat's `HttpSession` implementation.
-
-=== How does it work?
-
-Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Hazelcast.
-Spring Session replaces the `HttpSession` with an implementation that is backed by a `Map` in Hazelcast.
-When Spring Security's `SecurityContextPersistenceFilter` saves the `SecurityContext` to the `HttpSession` it is then persisted into Hazelcast.
-
-When a new `HttpSession` is created, Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
-Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
-
-=== Interact with the data store
-
-If you like, you can remove the session using http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#hazelcast-java-client[a Java client],
-http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#other-client-implementations[one of the other clients], or the
-http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#management-center[management center].
-
-==== Using the console
-
-For example, using the management center console after connecting to your Hazelcast node:
-
-	default> ns spring:session:sessions
-	spring:session:sessions> m.clear
-
-TIP: The Hazelcast documentation has instructions for http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#console[the console].
-
-Alternatively, you can also delete the explicit key. Enter the following into the console ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
-
-	spring:session:sessions> m.remove 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
-
-Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.
-
-==== Using the REST API
-
-As described in the other clients section of the documentation, there is a 
-http://docs.hazelcast.org/docs/latest/manual/html-single/hazelcast-documentation.html#rest-client[REST API]
-provided by the Hazelcast node(s).
-
-For example, you could delete an individual key as follows (replacing `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie):
-
-	$ curl -v -X DELETE http://localhost:xxxxx/hazelcast/rest/maps/spring:session:sessions/7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
-
-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.
--- a/docs/src/docs/asciidoc/guides/httpsession-xml.adoc
+++ b/docs/src/docs/asciidoc/guides/httpsession-xml.adoc
@@ -21,7 +21,7 @@ If you are using Maven, ensure to add the following dependencies:
 		<groupId>org.springframework.session</groupId>
 		<artifactId>spring-session-data-redis</artifactId>
 		<version>{spring-session-version}</version>
-		<type>pom</type>
+		<type>pom<type>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
@@ -79,12 +79,14 @@ Add the following Spring Configuration:
 include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
 ----

-<1> We use the combination of `<context:annotation-config/>` and `RedisHttpSessionConfiguration` because Spring Session does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
+<1> We create an embedded Redis Server so that there is no need to start up Redis external of our application.
+In a production application this is not necessary since we would point our connection to an external Redis instance.
+<2> We use the combination of `<context:annotation-config/>` and `RedisHttpSessionConfiguration` because Spring Session does not yet provide XML Namespace support (see https://github.com/spring-projects/spring-session/issues/104[gh-104]).
 This creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
 The filter is what is in charge of replacing the `HttpSession` implementation to be backed by Spring Session.
 In this instance Spring Session is backed by Redis.
-<2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
-We configure the connection to connect to localhost on the default port (6379)
+<3> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
+We use a http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#xsd-config-body-schemas-context-pphc[PropertyPlaceholderConfigurer] to externalize the port location.
 For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].

 == XML Servlet Container Initialization
@@ -126,12 +128,6 @@ For every request that `DelegatingFilterProxy` is invoked, the `springSessionRep

 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:

-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
 ----
 $ ./gradlew :samples:httpsession-xml:tomcatRun
 ----
--- a/docs/src/docs/asciidoc/guides/httpsession.adoc
+++ b/docs/src/docs/asciidoc/guides/httpsession.adoc
@@ -21,7 +21,7 @@ If you are using Maven, ensure to add the following dependencies:
 		<groupId>org.springframework.session</groupId>
 		<artifactId>spring-session-data-redis</artifactId>
 		<version>{spring-session-version}</version>
-		<type>pom</type>
+		<type>pom<type>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
@@ -78,11 +78,13 @@ Add the following Spring Configuration:
 include::{samples-dir}httpsession/src/main/java/sample/Config.java[tags=class]
 ----

-<1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
+<1> We import an embedded Redis Server so that there is no need to start up Redis external of our application.
+In a production application this is not necessary since we would point our connection to an external Redis instance.
+<2> The `@EnableRedisHttpSession` 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 Redis.
-<2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
-We configure the connection to connect to localhost on the default port (6379)
+<3> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
+We use a http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#xsd-config-body-schemas-context-pphc[PropertyPlaceholderConfigurer] to externalize the port location.
 For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].

 == Java Servlet Container Initialization
@@ -118,12 +120,6 @@ This ensures that the Spring Bean by the name `springSessionRepositoryFilter` is

 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:

-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
 ----
 $ ./gradlew :samples:httpsession:tomcatRun
 ----
--- a/docs/src/docs/asciidoc/guides/rest.adoc
+++ b/docs/src/docs/asciidoc/guides/rest.adoc
@@ -21,7 +21,7 @@ If you are using Maven, ensure to add the following dependencies:
 		<groupId>org.springframework.session</groupId>
 		<artifactId>spring-session-data-redis</artifactId>
 		<version>{spring-session-version}</version>
-		<type>pom</type>
+		<type>pom<type>
 	</dependency>
 	<dependency>
 		<groupId>org.springframework</groupId>
@@ -78,13 +78,15 @@ Add the following Spring Configuration:
 include::{samples-dir}rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
 ----

-<1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements `Filter`.
+<1> We import an embedded Redis Server so that there is no need to start up Redis external of our application.
+In a production application this is not necessary since we would point our connection to an external Redis instance.
+<2> The `@EnableRedisHttpSession` 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 Redis.
-<2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
-We configure the connection to connect to localhost on the default port (6379)
+<3> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
+In our example, we are connecting to localhost on the default port (6379).
 For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].
-<3> We customize Spring Session's HttpSession integration to use HTTP headers to convey the current session information instead of cookies.
+<4> We customize Spring Session's HttpSession integration to use HTTP headers to convey the current session information instead of cookies.

 == Servlet Container Initialization

@@ -119,12 +121,6 @@ NOTE: The name of our class (Initializer) does not matter. What is important is

 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:

-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
 ----
 $ ./gradlew :samples:rest:tomcatRun
 ----
--- a/docs/src/docs/asciidoc/guides/security.adoc
+++ b/docs/src/docs/asciidoc/guides/security.adoc
@@ -22,7 +22,7 @@ If you are using Maven, ensure to add the following dependencies:
 	<groupId>org.springframework.session</groupId>
 	<artifactId>spring-session-data-redis</artifactId>
 	<version>{spring-session-version}</version>
-	<type>pom</type>
+	<type>pom<type>
 	</dependency>
 	<dependency>
 	<groupId>org.springframework</groupId>
@@ -77,11 +77,13 @@ Add the following Spring Configuration:
 include::{samples-dir}security/src/main/java/sample/Config.java[tags=class]
 ----

-<1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
+<1> We import an embedded Redis Server so that there is no need to start up Redis external of our application.
+In a production application this is not necessary since we would point our connection to an external Redis instance.
+<2> The `@EnableRedisHttpSession` 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 Redis.
-<2> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
-We configure the connection to connect to localhost on the default port (6379)
+<3> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
+In our example, we are connecting to localhost on the default port (6379).
 For more information on configuring Spring Data Redis, refer to the http://docs.spring.io/spring-data/data-redis/docs/current/reference/html/[reference documentation].

 == Servlet Container Initialization
@@ -123,12 +125,6 @@ By extending `AbstractHttpSessionApplicationInitializer` we ensure that the Spri

 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:

-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
 ----
 $ ./gradlew :samples:security:tomcatRun
 ----
--- a/docs/src/docs/asciidoc/guides/users.adoc
+++ b/docs/src/docs/asciidoc/guides/users.adoc
@@ -17,12 +17,6 @@ The users application demonstrates how to allow an application to manage multipl

 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:

-[NOTE]
-====
-For the sample to work, you must http://redis.io/download[install Redis 2.8+] on localhost and run it with the default port (6379).
-Alternatively, you can update the `JedisConnectionFactory` to point to a Redis server.
-====
-
 ----
 $ ./gradlew :samples:users:tomcatRun
 ----
--- a/docs/src/docs/asciidoc/guides/websocket.adoc
+++ b/docs/src/docs/asciidoc/guides/websocket.adoc
@@ -82,12 +82,6 @@ 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.
-====
-
 ----
 $ ./gradlew :samples:websocket:bootRun
 ----
--- a/docs/src/docs/asciidoc/index.adoc
+++ b/docs/src/docs/asciidoc/index.adoc
@@ -22,19 +22,6 @@ Additional features include:

 * <<websocket,WebSocket>> - provides the ability to keep the `HttpSession` alive when receiving WebSocket messages

-== What's New in 1.1
-
-Below are the highlights of what is new in Spring Session 1.1. You can find a complete list in the https://github.com/spring-projects/spring-session/issues?utf8=%E2%9C%93&q=milestone%3A%221.1.0+M1%22[changelog].
-
-* https://github.com/spring-projects/spring-session/issues/7[#7] - link:guides/findbyusername.html[Query by Username]
-* https://github.com/spring-projects/spring-session/issues/299[#299] - link:guides/custom-cookie.html[Customize Cookie Creation]
-* https://github.com/spring-projects/spring-session/issues/4[#4] - Add <<httpsession-httpsessionlistener,HttpSessionListener>> support
-* https://github.com/spring-projects/spring-session/issues/283[#283] - Allow override default `RedisSerializer`
-* https://github.com/spring-projects/spring-session/issues/277[#277] - Added link:guides/hazelcast-spring.html[@EnableHazelcastHttpSession]
-* https://github.com/spring-projects/spring-session/issues/271[#271] - Performance improvements
-* https://github.com/spring-projects/spring-session/pull/218[#218] - Allow scoping the session in Redis using <<api-redisoperationssessionrepository-config,redisNamespace>>
-* https://github.com/spring-projects/spring-session/issues/272[#272] - Add `ExpiringSession.setLastAccessedTime(long)`
-
 [[samples]]
 == Samples and Guides (Start Here)

@@ -52,10 +39,6 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store using XML based configuration.
 | link:guides/httpsession-xml.html[HttpSession XML Guide]

-| {gh-samples-url}custom-cookie[Custom Cookie]
-| Demonstrates how to use Spring Session and customize the cookie.
-| link:guides/custom-cookie.html[Custom Cookie Guide]
-
 | {gh-samples-url}boot[Spring Boot]
 | Demonstrates how to use Spring Session with Spring Boot.
 | link:guides/boot.html[Spring Boot Guide]
@@ -68,10 +51,6 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session in a REST application to support authenticating with a header.
 | link:guides/rest.html[REST Guide]

-| {gh-samples-url}findbyusername[Find by Username]
-| Demonstrates how to use Spring Session to find sessions by username.
-| link:guides/findbyusername.html[Find by Username]
-
 | {gh-samples-url}users[Multiple Users]
 | Demonstrates how to use Spring Session to manage multiple simultaneous browser sessions (i.e Google Accounts).
 | link:guides/users.html[Manage Multiple Users Guide]
@@ -85,11 +64,6 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session with Hazelcast.
 | TBD

-[[samples-hazelcast-spring]]
-| {gh-samples-url}hazelcast-spring[Hazelcast Spring]
-| Demonstrates how to use Spring Session and Hazelcast with an existing Spring Security application.
-| link:guides/hazelcast-spring.html[Hazelcast Spring Guide]
-
 |===

 [[httpsession]]
@@ -212,33 +186,8 @@ Spring Session can work with RESTful APIs by allowing the session to be provided
 NOTE: The <<samples, REST Sample>> provides a working sample on how to use Spring Session in a REST application to support authenticating with a header.
 You can follow the basic steps for integration below, but you are encouraged to follow along with the detailed REST Guide when integrating with your own application.

-include::guides/rest.adoc[tags=config,leveloffset=+2]
+include::guides/rest.adoc[tags=config,leveloffset=+1]

-[[httpsession-httpsessionlistener]]
-=== HttpSessionListener
-
-Spring Session supports `HttpSessionListener` by translating `SessionDestroyedEvent` and `SessionCreatedEvent` into `HttpSessionEvent` by declaring `SessionEventHttpSessionListenerAdapter`.
-To use this support, you need to:
-
-* Ensure your `SessionRepository` implementation supports and is configured to fire `SessionDestroyedEvent` and `SessionCreatedEvent`.
-* Configure `SessionEventHttpSessionListenerAdapter` as a Spring bean.
-* Inject every `HttpSessionListener` into the `SessionEventHttpSessionListenerAdapter`
-
-If you are using the configuration support documented in <<httpsession-redis,HttpSession with Redis>>, then all you need to do is register every `HttpSessionListener` as a bean.
-For example, assume you want to support Spring Security's concurrency control and need to use `HttpSessionEventPublisher` you can simply add `HttpSessionEventPublisher` as a bean.
-In Java configuration, this might look like:
-
-[source,java,indent=0]
----
-include::{docs-test-dir}docs/http/RedisHttpSessionConfig.java[tags=config]
----
-
-In XML configuration, this might look like:
-
-[source,xml,indent=0]
----
-include::{docs-test-resources-dir}docs/http/HttpSessionListenerXmlTests-context.xml[tags=config]
----

 [[websocket]]
 == WebSocket Integration
@@ -330,78 +279,12 @@ A `SessionRepository` is in charge of creating, retrieving, and persisting `Sess
 If possible, developers should not interact directly with a `SessionRepository` or a `Session`.
 Instead, developers should prefer interacting with `SessionRepository` and `Session` indirectly through the <<httpsession,HttpSession>> and <<websocket,WebSocket>> integration.

-[[api-findbyusernamesessionrepository]]
-=== FindByUsernameSessionRepository
-
-Spring Session's most basic API for using a `Session` is the `SessionRepository`.
-This API is intentionally very simple, so that it is easy to provide additional implementations with basic functionality.
-
-The `FindByUsernameSessionRepository` adds a single method to look up all the sessions for a particular user.
-This is done by ensuring that the session attribute with the name `Session.PRINCIPAL_NAME_ATTRIBUTE_NAME` is populated with the username.
-It is the responsibility of the developer to ensure the attribute is populated since Spring Session is not aware of the authentication mechanism being used.
-
-Some `SessionRepository` implementations may choose to implement `FindByUsernameSessionRepository` also.
-For example, Spring's Redis support implements `FindByUsernameSessionRepository`.
-
-[[api-enablespringhttpsession]]
-=== EnableSpringHttpSession
-
-The `@EnableSpringHttpSession` annotation can be added to an `@Configuration` class to expose the `SessionRepositoryFilter` as a bean named "springSessionRepositoryFilter".
-In order to leverage the annotation, a single `SessionRepository` bean must be provided.
-For example:
-
-[source,java,indent=0]
----
-include::{docs-test-dir}docs/SpringHttpSessionConfig.java[tags=class]
----
-
-It is important to note that no infrastructure for session expirations is configured for you out of the box.
-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/hazelcast-documentation.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 native support for configuring a map's `max-idle-seconds` setting.
-Entries (sessions) that have been idle longer than the max idle setting will be automatically removed from the `Map`.
-
-[[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

 `RedisOperationsSessionRepository` is a `SessionRepository` that is implemented using Spring Data's `RedisOperations`.
 In a web environment, this is typically used in combination with `SessionRepositoryFilter`.
-The implementation supports `SessionDestroyedEvent` and `SessionCreatedEvent` through `SessionMessageListener`.
+The implementation supports `SessionDestroyedEvent` through `SessionMessageListener`.

 [[api-redisoperationssessionrepository-new]]
 ==== Instantiating a RedisOperationsSessionRepository
@@ -415,107 +298,30 @@ include::{indexdoc-tests}[tags=new-redisoperationssessionrepository]

 For additional information on how to create a `RedisConnectionFactory`, refer to the Spring Data Redis Reference.

-[[api-redisoperationssessionrepository-config]]
-==== EnableRedisHttpSession
-
-In a web environment, the simplest way to create a new `RedisOperationsSessionRepository` is to use `@EnableRedisHttpSession`.
-Complete example usage can be found in the <<samples>>
-You can use the following attributes to customize the configuration:
-
-* **maxInactiveIntervalInSeconds** - the amount of time before the session will expire in seconds
-* **redisNamespace** - allows configuring an application specific namespace for the sessions. Redis keys and channel ids will start with the prefix of `spring:session:<redisNamespace>:`.
-
 [[api-redisoperationssessionrepository-storage]]
 ==== Storage Details

-The sections below outline how Redis is updated for each operation.
-An example of creating a new session can be found below.
-The subsequent sections describe the details.
-
----
-HMSET spring:session:sessions:33fdd1b6-b496-4b33-9f7d-df96679d32fe creationTime 1404360000000 \
-	maxInactiveInterval 1800 \
-	lastAccessedTime 1404360000000 \
-	sessionAttr:attrName someAttrValue \
-	sessionAttr2:attrName someAttrValue2
-EXPIRE spring:session:sessions:33fdd1b6-b496-4b33-9f7d-df96679d32fe 2100
-APPEND spring:session:sessions:expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe ""
-EXPIRE spring:session:sessions:expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe 1800
-SADD spring:session:expirations:1439245080000 expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe
-EXPIRE spring:session:expirations1439245080000 2100
----
-
-===== Saving a Session
-
 Each session is stored in Redis as a Hash.
 Each session is set and updated using the HMSET command.
 An example of how each session is stored can be seen below.

-
----
-HMSET spring:session:sessions:33fdd1b6-b496-4b33-9f7d-df96679d32fe creationTime 1404360000000 \
-	maxInactiveInterval 1800 \
-	lastAccessedTime 1404360000000 \
-	sessionAttr:attrName someAttrValue \
-	sessionAttr2:attrName someAttrValue2
----
-
-In this example, the session following statements are true about the session:
-
-* The session id is 33fdd1b6-b496-4b33-9f7d-df96679d32fe
-* The session was created at 1404360000000 in milliseconds since midnight of 1/1/1970 GMT.
-* The session expires in 1800 seconds (30 minutes).
-* The session was last accessed at 1404360000000 in milliseconds since midnight of 1/1/1970 GMT.
-* The session has two attributes.
-The first is "attrName" with the value of "someAttrValue".
-The second session attribute is named "attrName2" with the value of "someAttrValue2".
-
-[[api-redisoperationssessionrepository-writes]]
-===== Optimized Writes
-
-The `Session` instances managed by `RedisOperationsSessionRepository` keeps track of the properties that have changed and only updates those.
-This means if an attribute is written once and read many times we only need to write that attribute once.
-For example, assume the session attribute "sessionAttr2" from earlier was updated.
-The following would be executed upon saving:
-
----
-HMSET spring:session:sessions:33fdd1b6-b496-4b33-9f7d-df96679d32fe sessionAttr:attrName2 newValue
----
+	HMSET spring:session:sessions:<session-id> creationTime 1404360000000 \
+		maxInactiveInterval 1800 lastAccessedTime 1404360000000 \
+		sessionAttr:<attrName> someAttrValue sessionAttr:<attrName2> someAttrValue2

 [[api-redisoperationssessionrepository-expiration]]
 ===== Session Expiration

-An expiration is associated to each session using the EXPIRE command based upon the `ExpiringSession.getMaxInactiveInterval()`.
+An expiration is associated to each session using the EXPIRE command based upon the RedisOperationsSessionRepository.RedisSession.getMaxInactiveInterval().
 For example:

----
-EXPIRE spring:session:sessions:33fdd1b6-b496-4b33-9f7d-df96679d32fe 2100
----
+	EXPIRE spring:session:sessions:<session-id> 1800

-You will note that the expiration that is set is 5 minutes after the session actually expires.
-This is necessary so that the value of the session can be accessed when the session expires.
-An expiration is set on the session itself five minutes after it actually expires to ensure it is cleaned up, but only after we perform any necessary processing.
-
-[NOTE]
-====
-The `SessionRepository.getSession(String)` method ensures that no expired sessions will be returned.
-This means there is no need to check the expiration before using a session.
-====
-
-Spring Session relies on the delete and expired http://redis.io/topics/notifications[keyspace notifications] from Redis to fire a <<api-redisoperationssessionrepository-sessiondestroyedevent,SessionDeletedEvent>> and <<api-redisoperationssessionrepository-sessiondestroyedevent,SessionExpiredEvent>> respectively.
-It is the `SessionDeletedEvent` or `SessionExpiredEvent` that ensures resources associated with the Session are cleaned up.
+Spring Session relies on the expired and delete http://redis.io/topics/notifications[keyspace notifications] from Redis to fire a <<SessionDestroyedEvent>>.
+It is the `SessionDestroyedEvent` that ensures resources associated with the Session are cleaned up.
 For example, when using Spring Session's WebSocket support the Redis expired or delete event is what triggers any WebSocket connections associated with the session to be closed.

-Expiration is not tracked directly on the session key itself since this would mean the session data would no longer be available. Instead a special session expires key is used. In our example the expires key is:
-
----
-APPEND spring:session:sessions:expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe ""
-EXPIRE spring:session:sessions:expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe 1800
----
-
-When a session expires key is deleted or expires, the keyspace notification triggers a lookup of the actual session and a SessionDestroyedEvent is fired.
-
-One problem with relying on Redis expiration exclusively is that Redis makes no guarantee of when the expired event will be fired if they key has not been accessed.
+One problem with this approach is that Redis makes no guarantee of when the expired event will be fired if they key has not been accessed.
 Specifically the background task that Redis uses to clean up expired keys is a low priority task and may not trigger the key expiration.
 For additional details see http://redis.io/topics/notifications[Timing of expired events] section in the Redis documentation.

@@ -526,33 +332,35 @@ For this reason, each session expiration is also tracked to the nearest minute.
 This allows a background task to access the potentially expired sessions to ensure that Redis expired events are fired in a more deterministic fashion.
 For example:

----
-SADD spring:session:expirations:1439245080000 expires:33fdd1b6-b496-4b33-9f7d-df96679d32fe
-EXPIRE spring:session:expirations1439245080000 2100
----
+SADD spring:session:expirations:<expire-rounded-up-to-nearest-minute> <session-id>
+EXPIRE spring:session:expirations:<expire-rounded-up-to-nearest-minute> 1860

 The background task will then use these mappings to explicitly request each key.
 By accessing they key, rather than deleting it, we ensure that Redis deletes the key for us only if the TTL is expired.

-[NOTE]
-====
-We do not explicitly delete the keys since in some instances there may be a race condition that incorrectly identifies a key as expired when it is not.
+NOTE: We do not explicitly delete the keys since in some instances there may be a race condition that incorrectly identifies a key as expired when it is not.
 Short of using distributed locks (which would kill our performance) there is no way to ensure the consistency of the expiration mapping.
 By simply accessing the key, we ensure that the key is only removed if the TTL on that key is expired.
-====

+[[api-redisoperationssessionrepository-writes]]
+===== Optimized Writes
+
+The `Session` instances managed by `RedisOperationsSessionRepository` keeps track of the properties that have changed and only updates those.
+This means if an attribute is written once and read many times we only need to write that attribute once.
+For example, assume the session attribute "sessionAttr2" from earlier was updated.
+The following would be executed upon saving:
+
+HMSET spring:session:sessions:<session-id> sessionAttr:<attrName2> newValue
+EXPIRE spring:session:sessions:<session-id> 1800

 [[api-redisoperationssessionrepository-sessiondestroyedevent]]
-==== SessionDeletedEvent and SessionExpiredEvent
+==== SessionDestroyedEvent

-`SessionDeletedEvent` and `SessionExpiredEvent` are both types of `SessionDestroyedEvent`.
-
-`RedisOperationsSessionRepository` supports firing a `SessionDeletedEvent` whenever a `Session` is deleted or a `SessionExpiredEvent` when it expires.
+`RedisOperationsSessionRepository` supports firing a `SessionDestroyedEvent` whenever a `Session` is deleted or when it expires.
 This is necessary to ensure resources associated with the `Session` are properly cleaned up.
-
 For example, when integrating with WebSockets the `SessionDestroyedEvent` is in charge of closing any active WebSocket connections.

-Firing `SessionDeletedEvent` or `SessionExpiredEvent` is made available through the `SessionMessageListener` which listens to http://redis.io/topics/notifications[Redis Keyspace events].
+Firing a `SessionDestroyedEvent` is made available through the `SessionMessageListener` which listens to http://redis.io/topics/notifications[Redis Keyspace events].
 In order for this to work, Redis Keyspace events for Generic commands and Expired events needs to be enabled.
 For example:

@@ -580,14 +388,6 @@ XML Configuraiton can use the following:
 include::{docs-test-resources-dir}docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests-context.xml[tags=configure-redis-action]
 ----

-[[api-redisoperationssessionrepository-sessioncreatedevent]]
-==== SessionCreatedEvent
-
-When a session is created an event is sent to Redis with the channel of `spring:session:channel:created:33fdd1b6-b496-4b33-9f7d-df96679d32fe`
-such that `33fdd1b6-b496-4b33-9f7d-df96679d32fe` is the session id. The body of the event will be the session that was created.
-
-If registered as a MessageListener (default), then `RedisOperationsSessionRepository` will then translate the Redis message into a `SessionCreatedEvent`.
-
 [[api-redisoperationssessionrepository-cli]]
 ==== Viewing the Session in Redis

@@ -639,22 +439,10 @@ include::{indexdoc-tests}[tags=new-mapsessionrepository]
 ==== Using Spring Session and Hazlecast

 The <<samples,Hazelcast Sample>> is a complete application demonstrating using Spring Session with Hazelcast.
-
 To run it use the following:

 	./gradlew :samples:hazelcast:tomcatRun

-The <<samples,Hazelcast Spring Sample>> is a complete application demonstrating using Spring Session with Hazelcast and Spring Security.
-
-It includes example Hazelcast `MapListener` implementations that support firing `SessionCreatedEvent`, `SessionDeletedEvent` and `SessionExpiredEvent`.
-
-To run it use the following:
-
-	./gradlew :samples:hazelcast-spring:tomcatRun
-
-[[api-mapsessionrepository-hazelcast]]
-==== Using Spring Session and Hazlecast
-
 [[community]]
 == Spring Session Community

@@ -686,20 +474,3 @@ We appreciate https://help.github.com/articles/using-pull-requests/[Pull Request
 === License

 Spring Session is Open Source software released under the http://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
-
-[[minimum-requirements]]
-== Minimum Requirements
-
-The minimum requirements for Spring Session are:
-
-* Java 5+
-* If you are running in a Servlet Container (not required), Servlet 2.5+
-* If you are using other Spring libraries (not required), the minimum required version is Spring 3.2.14.
-While we re-run all unit tests against Spring 3.2.x, we recommend using the latest Spring 4.x version when possible.
-* `@EnableRedisHttpSession` requires Redis 2.8+. This is necessary to support <<api-redisoperationssessionrepository-expiration,Session Expiration>>
-
-[NOTE]
-====
-At its core Spring Session only has a required dependency on commons-logging.
-For an example of using Spring Session without any other Spring dependencies, refer to the <<samples,hazelcast sample>> application.
-====
--- a/docs/src/test/java/docs/IndexDocTests.java
+++ b/docs/src/test/java/docs/IndexDocTests.java
@@ -15,19 +15,12 @@
 */
 package docs;

-import static org.fest.assertions.Assertions.assertThat;
-
 import org.junit.Test;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.session.ExpiringSession;
-import org.springframework.session.MapSessionRepository;
-import org.springframework.session.Session;
-import org.springframework.session.SessionRepository;
+import org.springframework.session.*;
 import org.springframework.session.data.redis.RedisOperationsSessionRepository;
-import org.springframework.session.web.http.SessionRepositoryFilter;
-import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+
+import static org.fest.assertions.Assertions.assertThat;

 /**
 * @author Rob Winch
@@ -111,20 +104,6 @@ public class IndexDocTests {
 		// end::new-mapsessionrepository[]
 	}

-	@Test
-	public void runSpringHttpSessionConfig() {
-		AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext();
-		context.register(SpringHttpSessionConfig.class);
-		context.setServletContext(new MockServletContext());
-		context.refresh();
-
-		try {
-			context.getBean(SessionRepositoryFilter.class);
-		} finally {
-			context.close();
-		}
-	}
-
 	private static class User {
 		private User(String username) {}
 	}
--- a/docs/src/test/java/docs/SpringHttpSessionConfig.java
+++ b/docs/src/test/java/docs/SpringHttpSessionConfig.java
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package docs;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.MapSessionRepository;
-import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
-
-// tag::class[]
-@EnableSpringHttpSession
-@Configuration
-public class SpringHttpSessionConfig {
-	@Bean
-	public MapSessionRepository sessionRepository() {
-		return new MapSessionRepository();
-	}
-}
-// end::class[]
--- a/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
+++ b/docs/src/test/java/docs/http/AbstractHttpSessionListenerTests.java
@@ -1,81 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package docs.http;
-
-import static org.fest.assertions.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.ApplicationListener;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.security.core.session.SessionDestroyedEvent;
-import org.springframework.session.MapSession;
-import org.springframework.session.Session;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-
-/**
- * @author Rob Winch
- * @since 1.2
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@WebAppConfiguration
-public abstract class AbstractHttpSessionListenerTests {
-	@Autowired
-	ApplicationEventPublisher publisher;
-
-	@Autowired
-	SecuritySessionDestroyedListener listener;
-
-	@Test
-	public void springSessionDestroyedTranslatedToSpringSecurityDestroyed() {
-		Session session = new MapSession();
-
-		publisher.publishEvent(new org.springframework.session.events.SessionDestroyedEvent(this, session));
-
-		assertThat(listener.getEvent().getId()).isEqualTo(session.getId());
-	}
-
-	static RedisConnectionFactory createMockRedisConnection() {
-		RedisConnectionFactory factory = mock(RedisConnectionFactory.class);
-		RedisConnection connection = mock(RedisConnection.class);
-
-		when(factory.getConnection()).thenReturn(connection);
-		return factory;
-	}
-
-	static class SecuritySessionDestroyedListener implements ApplicationListener<SessionDestroyedEvent> {
-
-		private SessionDestroyedEvent event;
-
-		/* (non-Javadoc)
-		 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-		 */
-		@Override
-		public void onApplicationEvent(SessionDestroyedEvent event) {
-			this.event = event;
-		}
-
-		public SessionDestroyedEvent getEvent() {
-			return event;
-		}
-	}
-}
--- a/docs/src/test/java/docs/http/HazelcastHttpSessionConfig.java
+++ b/docs/src/test/java/docs/http/HazelcastHttpSessionConfig.java
@@ -1,36 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package docs.http;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
-
-import com.hazelcast.config.Config;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.HazelcastInstance;
-
-//tag::config[]
-@EnableHazelcastHttpSession // <1>
-@Configuration
-public class HazelcastHttpSessionConfig {
-	@Bean
-	public HazelcastInstance embeddedHazelcast() {
-		Config hazelcastConfig = new Config();
-		return Hazelcast.newHazelcastInstance(hazelcastConfig); // <2>
-	}
-}
-// end::config[]
--- a/docs/src/test/java/docs/http/HttpSessionListenerJavaConfigTests.java
+++ b/docs/src/test/java/docs/http/HttpSessionListenerJavaConfigTests.java
@@ -1,44 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package docs.http;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Rob Winch
- *
- */
-@ContextConfiguration(classes = { HttpSessionListenerJavaConfigTests.MockConfig.class,
-		RedisHttpSessionConfig.class })
-public class HttpSessionListenerJavaConfigTests extends AbstractHttpSessionListenerTests {
-
-	@Configuration
-	static class MockConfig {
-
-		@Bean
-		public static RedisConnectionFactory redisConnectionFactory() {
-			return AbstractHttpSessionListenerTests.createMockRedisConnection();
-		}
-
-		@Bean
-		public SecuritySessionDestroyedListener securitySessionDestroyedListener() {
-			return new SecuritySessionDestroyedListener();
-		}
-	}
-}
--- a/docs/src/test/java/docs/http/HttpSessionListenerXmlTests.java
+++ b/docs/src/test/java/docs/http/HttpSessionListenerXmlTests.java
@@ -1,27 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package docs.http;
-
-import org.springframework.test.context.ContextConfiguration;
-
-/**
- * @author Rob Winch
- *
- */
-@ContextConfiguration
-public class HttpSessionListenerXmlTests extends AbstractHttpSessionListenerTests {
-
-}
--- a/docs/src/test/java/docs/http/RedisHttpSessionConfig.java
+++ b/docs/src/test/java/docs/http/RedisHttpSessionConfig.java
@@ -1,35 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package docs.http;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.web.session.HttpSessionEventPublisher;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-
-// tag::config[]
-@Configuration
-@EnableRedisHttpSession
-public class RedisHttpSessionConfig {
-
-	@Bean
-	public HttpSessionEventPublisher httpSessionEventPublisher() {
-		return new HttpSessionEventPublisher();
-	}
-
-	// ...
-}
-// end::config[]
--- a/docs/src/test/resources/docs/http/HttpSessionListenerXmlTests-context.xml
+++ b/docs/src/test/resources/docs/http/HttpSessionListenerXmlTests-context.xml
@@ -1,22 +0,0 @@
-<?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:context="http://www.springframework.org/schema/context"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd">
-
-	<!-- tag::config[] -->
-	<bean class="org.springframework.security.web.session.HttpSessionEventPublisher"/>
-	<!-- end::config[] -->
-
-
-	<context:annotation-config/>
-	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
-
-	<bean class="docs.http.AbstractHttpSessionListenerTests"
-		factory-method="createMockRedisConnection"/>
-	<bean class="docs.http.AbstractHttpSessionListenerTests$SecuritySessionDestroyedListener"/>
-</beans>
--- a/etc/eclipse-formatter.xml
+++ b/etc/eclipse-formatter.xml
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Spring" version="12">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="90"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="90"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
-</profiles>
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,16 +1,16 @@
 springSecurityVersion=4.0.0.RELEASE
+embeddedRedisVersion=0.6
 junitVersion=4.11
 jstlVersion=1.2.1
 jedisVersion=2.5.2
 springVersion=4.1.6.RELEASE
 groovyVersion=2.3.11
-version=1.1.0.M1
+version=1.0.1.RELEASE
 seleniumVersion=2.44.0
 jacksonVersion=2.4.5
 gebVersion=0.10.0
-jspApiVersion=2.0
 servletApiVersion=3.0.1
 spockVersion=0.7-groovy-2.0
 commonsPoolVersion=2.2
 springDataRedisVersion=1.4.2.RELEASE
-hazelcastVersion=3.5.1
+hazelcastVersion=3.3.3
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -22,6 +22,7 @@ ext.spockDependencies = [
 ext.gebDependencies = spockDependencies + [
 		"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
 		"org.gebish:geb-spock:$gebVersion",
+		'commons-httpclient:commons-httpclient:3.1',
 		"org.codehaus.groovy:groovy:$groovyVersion"
 ]

@@ -72,7 +73,6 @@ task integrationTest(type: Test, dependsOn: jar) {
 		junitXml.destination = project.file("$project.buildDir/integration-test-results/")
 	}
 }
-check.dependsOn integrationTest

 eclipse {
 	classpath {
--- a/gradle/spring3.gradle
+++ b/gradle/spring3.gradle
@@ -1,24 +0,0 @@
-configurations {
-	spring3TestRuntime.extendsFrom testRuntime
-}
-
-configurations.spring3TestRuntime {
-	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-		if (details.requested.group == 'org.springframework'
-				&& details.requested.name != 'spring-websocket'
-				&& details.requested.name != 'spring-messaging') {
-			details.useVersion '3.2.14.RELEASE'
-		}
-	}
-}
-
-task spring3Test(type: Test) {
-	jvmArgs = ['-ea', '-Xmx500m', '-XX:MaxPermSize=128M']
-	classpath = sourceSets.test.output + sourceSets.main.output + configurations.spring3TestRuntime
-	exclude "org/springframework/session/web/socket/**"
-	reports {
-		html.destination = project.file("$buildDir/spring3-test-results/")
-		junitXml.destination = project.file("$buildDir/reports/spring3-tests/")
-	}
-}
-check.dependsOn spring3Test
--- a/gradle/tomcat.gradle
+++ b/gradle/tomcat.gradle
@@ -31,8 +31,6 @@ task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
 		httpPort = ports[0]
 		ajpPort = ports[1]
 		stopPort = ports[2]
-
-		System.setProperty('spring.session.redis.namespace',project.name)
 	}
 }

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
--- a/samples/boot/build.gradle
+++ b/samples/boot/build.gradle
@@ -17,6 +17,7 @@ group = 'samples'

 dependencies {
 	compile project(':spring-session'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework.boot:spring-boot-starter-redis",
 			"org.springframework.boot:spring-boot-starter-web",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
@@ -40,8 +41,6 @@ integrationTest {
 		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
 		systemProperties['server.port'] = port
 		systemProperties['management.port'] = 0
-
-		systemProperties['spring.session.redis.namespace'] = project.name
 	}
 }

--- a/samples/boot/src/main/java/sample/config/HttpSessionConfig.java
+++ b/samples/boot/src/main/java/sample/config/HttpSessionConfig.java
@@ -15,9 +15,11 @@
 */
 package sample.config;

-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.data.redis.config.annotation.web.http.*;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;


+@EnableEmbeddedRedis
 // tag::class[]
@EnableRedisHttpSession // <1>
 public class HttpSessionConfig { }
--- a/samples/custom-cookie/build.gradle
+++ b/samples/custom-cookie/build.gradle
@@ -1,19 +0,0 @@
-apply from: JAVA_GRADLE
-apply from: TOMCAT_7_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
-	skipProject = true
-}
-
-dependencies {
-	compile project(':spring-session-data-redis'),
-			"org.springframework:spring-web:$springVersion",
-			jstlDependencies
-
-	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
-
-	testCompile "junit:junit:$junitVersion"
-
-	integrationTestCompile gebDependencies
-}
--- a/samples/custom-cookie/src/integration-test/groovy/sample/AttributeTests.groovy
+++ b/samples/custom-cookie/src/integration-test/groovy/sample/AttributeTests.groovy
@@ -1,45 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample
-
-import geb.spock.*
-import sample.pages.HomePage;
-import spock.lang.Stepwise
-import pages.*
-
-/**
- * Tests the CAS sample application using service tickets.
- *
- * @author Rob Winch
- */
-@Stepwise
-class AttributeTests extends GebReportingSpec {
-	def 'first visit no attributes'() {
-		when:
-		to HomePage
-		then:
-		attributes.empty
-	}
-
-	def 'create attribute'() {
-		when:
-		createAttribute('a','b')
-		then:
-		attributes.size() == 1
-		attributes[0].name == 'a'
-		attributes[0].value == 'b'
-	}
-}
--- a/samples/custom-cookie/src/integration-test/groovy/sample/pages/HomePage.groovy
+++ b/samples/custom-cookie/src/integration-test/groovy/sample/pages/HomePage.groovy
@@ -1,45 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.pages
-
-import geb.*
-
-/**
- * The home page
- *
- * @author Rob Winch
- */
-class HomePage extends Page {
-	static url = ''
-	static at = { assert driver.title == 'Session Attributes'; true}
-	static content = {
-		form { $('form') }
-		submit { $('input[type=submit]') }
-		createAttribute(required:false) { name, value ->
-			form.attributeName = name
-			form.attributeValue = value
-			submit.click(HomePage)
-		}
-		attributes { moduleList AttributeRow, $("table tr").tail() }
-	}
-}
-class AttributeRow extends Module {
-	static content = {
-		cell { $("td", it) }
-		name { cell(0).text() }
-		value { cell(1).text() }
-	}
-}
--- a/samples/custom-cookie/src/main/java/sample/Config.java
+++ b/samples/custom-cookie/src/main/java/sample/Config.java
@@ -1,43 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-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;
-
-
-@EnableRedisHttpSession
-public class Config {
-
-	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
-	}
-
-	// tag::cookie-serializer[]
-	@Bean
-	public CookieSerializer cookieSerializer() {
-		DefaultCookieSerializer serializer = new DefaultCookieSerializer();
-		serializer.setCookieName("JSESSIONID"); // <1>
-		serializer.setCookiePath("/"); // <2>
-		serializer.setDomainNamePattern("^.+?\\.(\\w+\\.[a-z]+)$"); // <3>
-		return serializer;
-	}
-	// end::cookie-serializer[]
-}
--- a/samples/custom-cookie/src/main/java/sample/Initializer.java
+++ b/samples/custom-cookie/src/main/java/sample/Initializer.java
@@ -1,28 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
-
-// tag::class[]
-public class Initializer
-		extends AbstractHttpSessionApplicationInitializer { // <1>
-
-	public Initializer() {
-		super(Config.class); // <2>
-	}
-}
-// end::class[]
--- a/samples/custom-cookie/src/main/java/sample/SessionServlet.java
+++ b/samples/custom-cookie/src/main/java/sample/SessionServlet.java
@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import javax.servlet.*;
-import javax.servlet.annotation.*;
-import javax.servlet.http.*;
-import java.io.IOException;
-
-// tag::class[]
-@WebServlet("/session")
-public class SessionServlet extends HttpServlet {
-
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		String attributeName = req.getParameter("attributeName");
-		String attributeValue = req.getParameter("attributeValue");
-		req.getSession().setAttribute(attributeName, attributeValue);
-		resp.sendRedirect(req.getContextPath() + "/");
-	}
-
-	private static final long serialVersionUID = 2878267318695777395L;
-}
-// tag::end[]
--- a/samples/custom-cookie/src/main/webapp/META-INF/MANIFEST.MF
+++ b/samples/custom-cookie/src/main/webapp/META-INF/MANIFEST.MF
--- a/samples/custom-cookie/src/main/webapp/assets/bootstrap.min.css
+++ b/samples/custom-cookie/src/main/webapp/assets/bootstrap.min.css
--- a/samples/custom-cookie/src/main/webapp/index.jsp
+++ b/samples/custom-cookie/src/main/webapp/index.jsp
@@ -1,48 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<title>Session Attributes</title>
-	<link rel="stylesheet" href="assets/bootstrap.min.css">
-	<style type="text/css">
-		body {
-			padding: 1em;
-		}
-	</style>
-</head>
-<body>
-	<div class="container">
-		<h1>Description</h1>
-		<p>This application demonstrates how to use a Redis instance to back your session. Notice that there is no JSESSIONID cookie. We are also able to customize the way of identifying what the requested session id is.</p>
-
-		<h1>Try it</h1>
-
-		<form class="form-inline" role="form" action="./session" method="post">
-			<label for="attributeName">Attribute Name</label>
-			<input id="attributeName" type="text" name="attributeName"/>
-			<label for="attributeValue">Attribute Value</label>
-			<input id="attributeValue" type="text" name="attributeValue"/>
-			<input type="submit" value="Set Attribute"/>
-		</form>
-
-		<hr/>
-
-		<table class="table table-striped">
-			<thead>
-			<tr>
-				<th>Attribute Name</th>
-				<th>Attribute Value</th>
-			</tr>
-			</thead>
-			<tbody>
-			<c:forEach items="${sessionScope}" var="attr">
-				<tr>
-					<td><c:out value="${attr.key}"/></td>
-					<td><c:out value="${attr.value}"/></td>
-				</tr>
-			</c:forEach>
-			</tbody>
-		</table>
-	</div>
-</body>
-</html>
--- a/samples/findbyusername/README.adoc
+++ b/samples/findbyusername/README.adoc
@@ -1,4 +0,0 @@
-Demonstrates using Spring Session to lookup a user's session by the username.
-The sample provides a hook to add the current username to the session (required for finding the user) by providing a custom implementation of Spring Security's `AuthenticationSuccessHandler`.
-
-NOTE: This product includes GeoLite2 data created by MaxMind, available from http://www.maxmind.com
--- a/samples/findbyusername/build.gradle
+++ b/samples/findbyusername/build.gradle
@@ -1,56 +0,0 @@
-buildscript {
-	repositories {
-		mavenCentral()
-	}
-	dependencies {
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-	}
-}
-
-apply plugin: 'spring-boot'
-
-apply from: JAVA_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-
-group = 'samples'
-
-dependencies {
-	compile project(':spring-session'),
-			"org.springframework.boot:spring-boot-starter-redis",
-			"org.springframework.boot:spring-boot-starter-web",
-			"org.springframework.boot:spring-boot-starter-thymeleaf",
-			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion",
-			"com.maxmind.geoip2:geoip2:2.3.1",
-			"org.apache.httpcomponents:httpclient:4.4.1"
-
-	testCompile "org.springframework.boot:spring-boot-starter-test",
-				'org.easytesting:fest-assert:1.4'
-
-	integrationTestCompile gebDependencies,
-			"org.spockframework:spock-spring:$spockVersion"
-
-}
-
-integrationTest {
-	doFirst {
-		def port = reservePort()
-
-		def host = 'localhost:' + port
-		systemProperties['geb.build.baseUrl'] = 'http://'+host+'/'
-		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
-		systemProperties['server.port'] = port
-		systemProperties['management.port'] = 0
-
-		systemProperties['spring.session.redis.namespace'] = project.name
-	}
-}
-
-def reservePort() {
-	def socket = new ServerSocket(0)
-	def result = socket.localPort
-	socket.close()
-	result
-}
--- a/samples/findbyusername/src/integration-test/groovy/sample/FindByUsernameTests.groovy
+++ b/samples/findbyusername/src/integration-test/groovy/sample/FindByUsernameTests.groovy
@@ -1,104 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample
-
-import geb.Browser
-import geb.spock.*
-
-import org.openqa.selenium.htmlunit.HtmlUnitDriver
-import org.springframework.boot.test.IntegrationTest
-import org.springframework.boot.test.SpringApplicationContextLoader
-import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.web.WebAppConfiguration
-
-import pages.*
-import sample.pages.HomePage
-import sample.pages.LoginPage
-import spock.lang.Stepwise
-
-/**
- * Tests findbyusername web application
- *
- * @author Rob Winch
- */
-@Stepwise
-@ContextConfiguration(classes = FindByUsernameApplication, loader = SpringApplicationContextLoader)
-@WebAppConfiguration
-@IntegrationTest
-class FindByUsernameTests extends MultiBrowserGebSpec {
-	def 'Unauthenticated user sent to log in page'() {
-		given: 'unauthenticated user request protected page'
-		withBrowserSession a, {
-			via HomePage
-			then: 'sent to the log in page'
-			at LoginPage
-		}
-	}
-
-	def 'Log in views home page'() {
-		when: 'log in successfully'
-		a.login()
-		then: 'sent to original page'
-		a.at HomePage
-		and: 'the username is displayed'
-		a.username == 'user'
-		and: 'Spring Session Management is being used'
-		a.driver.manage().cookies.find { it.name == 'SESSION' }
-		and: 'Standard Session is NOT being used'
-		!a.driver.manage().cookies.find { it.name == 'JSESSIONID' }
-		and: 'Session id exists and terminate disabled'
-		a.sessionId
-		a.terminate(a.sessionId).@disabled
-	}
-
-	def 'Other Browser: Unauthenticated user sent to log in page'() {
-		given:
-		withBrowserSession b, {
-			via HomePage
-			then: 'sent to the log in page'
-			at LoginPage
-		}
-	}
-
-	def 'Other Browser: Log in views home page'() {
-		when: 'log in successfully'
-		b.login()
-		then: 'sent to original page'
-		b.at HomePage
-		and: 'the username is displayed'
-		b.username == 'user'
-		and: 'Spring Session Management is being used'
-		b.driver.manage().cookies.find { it.name == 'SESSION' }
-		and: 'Standard Session is NOT being used'
-		!b.driver.manage().cookies.find { it.name == 'JSESSIONID' }
-		and: 'Session id exists and terminate disabled'
-		b.sessionId
-		b.terminate(b.sessionId).@disabled
-	}
-
-	def 'Other Browser: Terminate Original'() {
-		setup: 'get the session id from browser a'
-		def sessionId = a.sessionId
-		when: 'we terminate browser a session'
-		b.terminate(sessionId).click(HomePage)
-		then: 'session is not listed'
-		!b.terminate(sessionId)
-		when: 'browser a visits home page after session was terminated'
-		a.via HomePage
-		then: 'browser a sent to log in'
-		a.at LoginPage
-	}
-}
--- a/samples/findbyusername/src/integration-test/groovy/sample/MultiBrowserGebSpec.groovy
+++ b/samples/findbyusername/src/integration-test/groovy/sample/MultiBrowserGebSpec.groovy
@@ -1,100 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-import geb.*
-import spock.lang.*
-
-/**
- * https://github.com/kensiprell/geb-multibrowser
- */
-abstract class MultiBrowserGebSpec extends Specification {
-    String gebConfEnv = null
-    String gebConfScript = null
-
-    // Map of geb browsers which can be referenced by name in the spec
-    // THese currently share the same config.  This is not a problem for
-    // my uses, but I can see potential for wanting to configure different
-    // browsers separately
-    @Shared _browsers = createBrowserMap()
-    def currentBrowser
-
-    def createBrowserMap() {
-        [:].withDefault { new Browser(createConf()) }
-    }
-
-    Configuration createConf() {
-        // Use the standard configured geb driver, but turn off cacheing so
-        // we can run multiple
-        def conf = new ConfigurationLoader(gebConfEnv).getConf(gebConfScript)
-        conf.cacheDriver = false
-        return conf
-    }
-
-    def withBrowserSession(browser, Closure c) {
-        currentBrowser = browser
-        def returnedValue = c.call()
-        currentBrowser = null
-        returnedValue
-    }
-
-    void resetBrowsers() {
-        _browsers.each { k, browser ->
-            if (browser.config?.autoClearCookies) {
-                browser.clearCookiesQuietly()
-            }
-            browser.quit()
-        }
-        _browsers = createBrowserMap()
-    }
-
-    def propertyMissing(String name) {
-        if(currentBrowser) {
-            return currentBrowser."$name"
-        } else {
-            return _browsers[name]
-        }
-    }
-
-    def methodMissing(String name, args) {
-        if(currentBrowser) {
-            return currentBrowser."$name"(*args)
-        } else {
-            def browser = _browsers[name]
-            if(args) {
-                return browser."${args[0]}"(*(args[1..-1]))
-            } else {
-                return browser
-            }
-        }
-    }
-
-    def propertyMissing(String name, value) {
-        if(!currentBrowser) throw new IllegalArgumentException("No context for setting property $name")
-        currentBrowser."$name" = value
-    }
-
-    private isSpecStepwise() {
-        this.class.getAnnotation(Stepwise) != null
-    }
-
-    def cleanup() {
-        if (!isSpecStepwise()) resetBrowsers()
-    }
-
-    def cleanupSpec() {
-        if (isSpecStepwise()) resetBrowsers()
-    }
-}
--- a/samples/findbyusername/src/integration-test/groovy/sample/pages/HomePage.groovy
+++ b/samples/findbyusername/src/integration-test/groovy/sample/pages/HomePage.groovy
@@ -1,46 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.pages
-
-import geb.*
-
-/**
- * The home page
- *
- * @author Rob Winch
- */
-class HomePage extends Page {
-	static url = ''
-	static at = { assert driver.title == 'Spring Session Sample - Secured Content'; true}
-	static content = {
-		username { $('#un').text() }
-		logout(to:LoginPage) { $('input[type=submit]').click() }
-		sessions { moduleList AttributeRow, $("table tr").tail() }
-		terminate(required:false) { sessionId -> $("#terminate-$sessionId") }
-		sessionId { $("#session-id").text() }
-	}
-}
-
-class AttributeRow extends Module {
-	static content = {
-		cell { $("td", it) }
-		location { cell(0).text() }
-		created { cell(1).text() }
-		lastUpdated { cell(2).text() }
-		information { cell(3).text() }
-		terminate { cell(4).text() }
-	}
-}
--- a/samples/findbyusername/src/integration-test/groovy/sample/pages/LoginPage.groovy
+++ b/samples/findbyusername/src/integration-test/groovy/sample/pages/LoginPage.groovy
@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.pages
-
-import geb.*
-
-/**
- * The Links Page
- *
- * @author Rob Winch
- */
-class LoginPage extends Page {
-	static url = '/login'
-	static at = { assert driver.title == 'Spring Session Sample - Log In'; true}
-	static content = {
-		form { $('form') }
-		submit { $('button[type=submit]') }
-		login(required:false) { user='user', pass='password' ->
-			form.username = user
-			form.password = pass
-			submit.click(HomePage)
-		}
-	}
-}
--- a/samples/findbyusername/src/main/java/sample/FindByUsernameApplication.java
+++ b/samples/findbyusername/src/main/java/sample/FindByUsernameApplication.java
@@ -1,34 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package sample;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Rob Winch
- */
-@Configuration
-@ComponentScan
-@EnableAutoConfiguration
-public class FindByUsernameApplication {
-
-	public static void main(String[] args) {
-		SpringApplication.run(FindByUsernameApplication.class, args);
-	}
-}
--- a/samples/findbyusername/src/main/java/sample/config/GeoConfig.java
+++ b/samples/findbyusername/src/main/java/sample/config/GeoConfig.java
@@ -1,39 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.config;
-
-import java.io.InputStream;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.maxmind.geoip2.DatabaseReader;
-
-/**
- *
- * @author Rob Winch
- *
- */
-@Configuration
-public class GeoConfig {
-
-	@Bean
-	public DatabaseReader geoDatabaseReader(@Value("classpath:GeoLite2-City.mmdb") InputStream geoInputStream) throws Exception {
-		return new DatabaseReader.Builder(geoInputStream).build();
-	}
-
-}
--- a/samples/findbyusername/src/main/java/sample/config/HttpSessionConfig.java
+++ b/samples/findbyusername/src/main/java/sample/config/HttpSessionConfig.java
@@ -1,28 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.config;
-
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-
-/**
- *
- * @author Rob Winch
- *
- */
-// tag::class[]
-@EnableRedisHttpSession // <1>
-public class HttpSessionConfig { }
-// end::class[]
--- a/samples/findbyusername/src/main/java/sample/config/SecurityConfig.java
+++ b/samples/findbyusername/src/main/java/sample/config/SecurityConfig.java
@@ -1,74 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package sample.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-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.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
-
-import sample.session.CompositeAuthenticationSuccessHandler;
-import sample.session.SpringSessionPrincipalNameSuccessHandler;
-
-/**
- * @author Rob Winch
- */
-
-@EnableWebSecurity
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
-
-	// tag::config[]
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
-		CompositeAuthenticationSuccessHandler successHandler = createHandler();
-
-		http
-			.formLogin()
-				.successHandler(successHandler)
-				.loginPage("/login")
-				.permitAll()
-				.and()
-			.authorizeRequests()
-				.antMatchers("/resources/**").permitAll()
-				.anyRequest().authenticated()
-				.and()
-			.logout()
-				.permitAll();
-	}
-	// end::config[]
-
-	// tag::handler[]
-	private CompositeAuthenticationSuccessHandler createHandler() {
-		SpringSessionPrincipalNameSuccessHandler setUsernameHandler =
-				new SpringSessionPrincipalNameSuccessHandler();
-		SavedRequestAwareAuthenticationSuccessHandler defaultHandler =
-				new SavedRequestAwareAuthenticationSuccessHandler();
-
-		CompositeAuthenticationSuccessHandler successHandler =
-				new CompositeAuthenticationSuccessHandler(setUsernameHandler, defaultHandler);
-		return successHandler;
-	}
-	// end::handler[]
-
-	@Autowired
-	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
-	}
-}
--- a/samples/findbyusername/src/main/java/sample/mvc/IndexController.java
+++ b/samples/findbyusername/src/main/java/sample/mvc/IndexController.java
@@ -1,61 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package sample.mvc;
-
-import java.security.Principal;
-import java.util.Collection;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.session.ExpiringSession;
-import org.springframework.session.FindByPrincipalNameSessionRepository;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-/**
- * Controller for sending the user to the login view.
- *
- * @author Rob Winch
- *
- */
-@Controller
-public class IndexController {
-	// tag::findbyusername[]
-	@Autowired
-	FindByPrincipalNameSessionRepository<? extends ExpiringSession> sessions;
-
-	@RequestMapping("/")
-	public String index(Principal principal, Model model) {
-		Collection<? extends ExpiringSession> usersSessions =
-				sessions.findByPrincipalName(principal.getName()).values();
-		model.addAttribute("sessions", usersSessions);
-		return "index";
-	}
-	// end::findbyusername[]
-
-	@RequestMapping(value = "/sessions/{sessionIdToDelete}", method = RequestMethod.DELETE)
-	public String removeSession(Principal principal, @PathVariable String sessionIdToDelete) {
-		Set<String> usersSessionIds = sessions.findByPrincipalName(principal.getName()).keySet();
-		if(usersSessionIds.contains(sessionIdToDelete)) {
-			sessions.delete(sessionIdToDelete);
-		}
-
-		return "redirect:/";
-	}
-}
--- a/samples/findbyusername/src/main/java/sample/mvc/LoginController.java
+++ b/samples/findbyusername/src/main/java/sample/mvc/LoginController.java
@@ -1,33 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.mvc;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-/**
- * Returns view for log in page
- *
- * @author Rob Winch
- */
-@Controller
-public class LoginController {
-
-	@RequestMapping("/login")
-	public String login() {
-		return "login";
-	}
-}
--- a/samples/findbyusername/src/main/java/sample/session/CompositeAuthenticationSuccessHandler.java
+++ b/samples/findbyusername/src/main/java/sample/session/CompositeAuthenticationSuccessHandler.java
@@ -1,49 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.session;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-
-/**
- * @author Rob Winch
- *
- */
-// tag::class[]
-public class CompositeAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
-	private List<AuthenticationSuccessHandler> handlers;
-
-	public CompositeAuthenticationSuccessHandler(AuthenticationSuccessHandler... handlers) {
-		super();
-		this.handlers = Arrays.asList(handlers);
-	}
-
-	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-			Authentication authentication) throws IOException, ServletException {
-		for(AuthenticationSuccessHandler handler : handlers) {
-			handler.onAuthenticationSuccess(request, response, authentication);
-		}
-	}
-}
-// end::class[]
--- a/samples/findbyusername/src/main/java/sample/session/SessionDetails.java
+++ b/samples/findbyusername/src/main/java/sample/session/SessionDetails.java
@@ -1,50 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.session;
-
-import java.io.Serializable;
-
-/**
- * An example of how users can provide details about their session.
- *
- * @author Rob Winch
- * @see SessionDetailsFilter
- */
-// tag::class[]
-public class SessionDetails implements Serializable {
-	private String location;
-
-	private String accessType;
-
-	public String getLocation() {
-		return location;
-	}
-
-	public void setLocation(String location) {
-		this.location = location;
-	}
-
-	public String getAccessType() {
-		return accessType;
-	}
-
-	public void setAccessType(String accessType) {
-		this.accessType = accessType;
-	}
-
-	private static final long serialVersionUID = 8850489178248613501L;
-}
-// end::class[]
--- a/samples/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java
+++ b/samples/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java
@@ -1,107 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.session;
-
-import java.io.IOException;
-import java.net.InetAddress;
-
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-
-import com.maxmind.geoip2.DatabaseReader;
-import com.maxmind.geoip2.model.CityResponse;
-
-/**
- * Inserts the session details into the session for every request. Some users
- * may prefer to insert session details only after authentication. This is fine,
- * but it may be valuable to the most up to date information so that if someone
- * stole the user's session id it can be observed.
- *
- * @author Rob Winch
- *
- */
-// tag::class[]
-@Component
-@Order(Ordered.HIGHEST_PRECEDENCE + 101)
-public class SessionDetailsFilter extends OncePerRequestFilter {
-	static final String UNKNOWN = "Unknown";
-
-	private DatabaseReader reader;
-
-	@Autowired
-	public SessionDetailsFilter(DatabaseReader reader) {
-		this.reader = reader;
-	}
-
-	// tag::dofilterinternal[]
-	public void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-		chain.doFilter(request, response);
-
-		HttpSession session = request.getSession(false);
-		if (session != null) {
-			String remoteAddr = getRemoteAddress(request);
-			String geoLocation = getGeoLocation(remoteAddr);
-
-			SessionDetails details = new SessionDetails();
-			details.setAccessType(request.getHeader("User-Agent"));
-			details.setLocation(remoteAddr + " " + geoLocation);
-
-			session.setAttribute("SESSION_DETAILS", details);
-		}
-	}
-	// end::dofilterinternal[]
-
-	String getGeoLocation(String remoteAddr) {
-		try {
-			CityResponse city = reader.city(InetAddress.getByName(remoteAddr));
-			String cityName = city.getCity().getName();
-			String countryName = city.getCountry().getName();
-			if(cityName == null && countryName == null) {
-				return null;
-			} else if(cityName == null) {
-				return countryName;
-			} else if(countryName == null) {
-				return cityName;
-			}
-			return cityName + ", " + countryName;
-		} catch (Exception e) {
-			return UNKNOWN;
-
-		}
-	}
-
-	private String getRemoteAddress(HttpServletRequest request) {
-		String remoteAddr = request.getHeader("X-FORWARDED-FOR");
-		if (remoteAddr == null) {
-			remoteAddr = request.getRemoteAddr();
-		} else if (remoteAddr.contains(",")) {
-			remoteAddr = remoteAddr.split(",")[0];
-		}
-		return remoteAddr;
-	}
-}
-//end::class[]
-
--- a/samples/findbyusername/src/main/java/sample/session/SpringSessionPrincipalNameSuccessHandler.java
+++ b/samples/findbyusername/src/main/java/sample/session/SpringSessionPrincipalNameSuccessHandler.java
@@ -1,52 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.session;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.springframework.security.core.Authentication;
-import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
-import org.springframework.session.FindByPrincipalNameSessionRepository;
-import org.springframework.session.Session;
-
-/**
- * Inserts the username into Spring session after we successfully authenticate.
- * Adding the principal name to the session is a requirement of
- * {@link FindByPrincipalNameSessionRepository}
- *
- * @author Rob Winch
- */
-// tag::class[]
-public class SpringSessionPrincipalNameSuccessHandler
-		implements AuthenticationSuccessHandler {
-
-	public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
-			Authentication authentication) throws IOException, ServletException {
-
-		HttpSession session = request.getSession();
-		String currentUsername = authentication.getName();
-
-		// tag::set-username[]
-		session.setAttribute(Session.PRINCIPAL_NAME_ATTRIBUTE_NAME, currentUsername);
-		// end::set-username[]
-	}
-}
-// end::class[]
--- a/samples/findbyusername/src/main/resources/GeoLite2-City.mmdb
+++ b/samples/findbyusername/src/main/resources/GeoLite2-City.mmdb
--- a/samples/findbyusername/src/main/resources/application.properties
+++ b/samples/findbyusername/src/main/resources/application.properties
@@ -1,2 +0,0 @@
-spring.thymeleaf.cache=false
-spring.template.cache=false
--- a/samples/findbyusername/src/main/resources/static/resources/css/bootstrap-responsive.css
+++ b/samples/findbyusername/src/main/resources/static/resources/css/bootstrap-responsive.css
--- a/samples/findbyusername/src/main/resources/static/resources/css/bootstrap.css
+++ b/samples/findbyusername/src/main/resources/static/resources/css/bootstrap.css
--- a/samples/findbyusername/src/main/resources/static/resources/img/favicon.ico
+++ b/samples/findbyusername/src/main/resources/static/resources/img/favicon.ico
--- a/samples/findbyusername/src/main/resources/static/resources/img/logo.png
+++ b/samples/findbyusername/src/main/resources/static/resources/img/logo.png
--- a/samples/findbyusername/src/main/resources/templates/index.html
+++ b/samples/findbyusername/src/main/resources/templates/index.html
@@ -1,36 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="layout">
-<head>
-	<title>Secured Content</title>
-</head>
-<body>
-	<div layout:fragment="content">
-		<h1>Secured Page</h1>
-		<p>This page is secured using Spring Boot, Spring Session, and Spring Security.</p>
-
-		<p>Your current session id is <span id="session-id" th:text="${#httpSession.id}"></span></p>
-
-		<table class="table table-stripped">
-			<tr>
-				<th>Id Suffix</th>
-				<th>Location</th>
-				<th>Created</th>
-				<th>Last Updated</th>
-				<th>Information</th>
-				<th>Terminate</th>
-			</tr>
-			<tr th:each="session : ${sessions}" th:with="details=${session.getAttribute('SESSION_DETAILS')}">
-				<td th:text="${session.id.substring(30)}"></td>
-				<td th:text="${details.location}"></td>
-				<td th:text="${#dates.format(new java.util.Date(session.creationTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
-				<td th:text="${#dates.format(new java.util.Date(session.lastAccessedTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
-				<td th:text="${details.accessType}"></td>
-				<td>
-					<form th:action="@{'/sessions/' + ${session.id}}" th:method="delete">
-						<input th:id="'terminate-' + ${session.id}" type="submit" value="Terminate" th:disabled="${session.id == #httpSession.id}"/>
-					</form>
-				</td>
-			</tr>
-		</table>
-	</div>
-</body>
-</html>
--- a/samples/findbyusername/src/main/resources/templates/layout.html
+++ b/samples/findbyusername/src/main/resources/templates/layout.html
@@ -1,122 +0,0 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-3.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-			xmlns:th="http://www.thymeleaf.org"
-			xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
-	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
-		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
-		<link th:href="@{/resources/css/bootstrap.css}" href="../static/css/bootstrap.css" rel="stylesheet"></link>
-		<style type="text/css">
-			/* Sticky footer styles
-			-------------------------------------------------- */
-
-			html,
-			body {
-				height: 100%;
-				/* The html and body elements cannot have any padding or margin. */
-			}
-
-			/* Wrapper for page content to push down footer */
-			#wrap {
-				min-height: 100%;
-				height: auto !important;
-				height: 100%;
-				/* Negative indent footer by it's height */
-				margin: 0 auto -60px;
-			}
-
-			/* Set the fixed height of the footer here */
-			#push,
-			#footer {
-				height: 60px;
-			}
-			#footer {
-				background-color: #f5f5f5;
-			}
-
-			/* Lastly, apply responsive CSS fixes as necessary */
-			@media (max-width: 767px) {
-				#footer {
-					margin-left: -20px;
-					margin-right: -20px;
-					padding-left: 20px;
-					padding-right: 20px;
-				}
-			}
-
-
-
-			/* Custom page CSS
-			-------------------------------------------------- */
-			/* Not required for template or sticky footer method. */
-
-			.container {
-				width: auto;
-				max-width: 680px;
-			}
-			.container .credit {
-				margin: 20px 0;
-				text-align: center;
-			}
-			a {
-					color: green;
-			}
-			.navbar-form {
-				margin-left: 1em;
-			}
-		</style>
-		<link th:href="@{resources/css/bootstrap-responsive.css}" href="/static/css/bootstrap-responsive.css" rel="stylesheet"></link>
-
-		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-		<!--[if lt IE 9]>
-			<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-		<![endif]-->
-	</head>
-
-
-	<body>
-		<div id="wrap">
-			<div class="navbar navbar-inverse navbar-static-top">
-				<div class="navbar-inner">
-					<div class="container">
-						<a class="brand" th:href="@{/}"><img th:src="@{/resources/img/logo.png}" alt="Spring Security Sample"/></a>
-
-<div class="nav-collapse collapse"
-		 th:with="currentUser=${#httpServletRequest.userPrincipal?.principal}">
-	<div th:if="${currentUser != null}">
-			<form class="navbar-form pull-right" th:action="@{/logout}" method="post">
-					<input type="submit" value="Log out" />
-			</form>
-			<p id="un" class="navbar-text pull-right" th:text="${currentUser.username}">
-				sample_user
-			</p>
-	</div>
-	<ul class="nav">
-	</ul>
-</div>
-
-				</div>
-			</div>
-		</div>
-			<!-- Begin page content -->
-			<div class="container">
-				<div class="alert alert-success"
-							th:if="${globalMessage}"
-							th:text="${globalMessage}">
-						Some Success message
-				</div>
-				<div layout:fragment="content">
-						Fake content
-				</div>
-			</div>
-
-			<div id="push"><!--  --></div>
-		</div>
-
-		<div id="footer">
-			<div class="container">
-				<p class="muted credit">This product includes GeoLite2 data created by MaxMind, available from <a href="http://www.maxmind.com">http://www.maxmind.com</a>.</p>
-			</div>
-		</div>
-	</body>
-</html>
--- a/samples/findbyusername/src/main/resources/templates/login.html
+++ b/samples/findbyusername/src/main/resources/templates/login.html
@@ -1,47 +0,0 @@
-<html xmlns:th="http://www.thymeleaf.org"
-	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	layout:decorator="layout">
-<head>
-<title>Log In</title>
-</head>
-<body>
-	<div layout:fragment="content">
-		<form name="f" th:action="@{/login}" method="post">
-			<fieldset>
-				<legend>Please Login</legend>
-				<div th:if="${param.error}" class="alert alert-error">Invalid
-					username and password.</div>
-				<div th:if="${param.logout}" class="alert alert-success">You
-					have been logged out.</div>
-				<label for="username">Username</label> <input type="text"
-					id="username" name="username" /> <label for="password">Password</label>
-				<input type="password" id="password" name="password" />
-				<div class="form-actions">
-					<button type="submit" class="btn">Log in</button>
-				</div>
-			</fieldset>
-		</form>
-
-		<div class="container">
-			<p>The intention is to demo a way to terminate a user's active
-				session without access to the device. Consider the following</p>
-			<ul>
-				<li>User goes to library and authenticates to the application</li>
-				<li>User goes home and realizes they forgot to log out</li>
-				<li>User can log in and terminate the session from the library
-					using clues like the location, created time, last accessed time,
-					etc.</li>
-			</ul>
-
-			<p>To emulate the workflow:</p>
-
-			<ul>
-				<li>Sign in with the <b>username</b> "user" and <b>password</b> "password"</li>
-				<li>Sign in again using an incognito window</li>
-				<li>Terminate your original session</li>
-				<li>Refresh the original window and see you are logged out</li>
-			</ul>
-		</div>
-	</div>
-</body>
-</html>
--- a/samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java
+++ b/samples/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java
@@ -1,62 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.session;
-
-import static org.fest.assertions.Assertions.*;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.maxmind.geoip2.DatabaseReader;
-
-import sample.config.GeoConfig;
-
-/**
- * @author Rob Winch
- *
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = GeoConfig.class)
-public class SessionDetailsFilterTests {
-	@Autowired
-	DatabaseReader reader;
-
-	SessionDetailsFilter filter;
-
-	@Before
-	public void setup() {
-		filter = new SessionDetailsFilter(reader);
-	}
-
-	@Test
-	public void getGeoLocationHanldesInvalidIp() {
-		assertThat(filter.getGeoLocation("a")).isEqualTo(SessionDetailsFilter.UNKNOWN);
-	}
-
-	@Test
-	public void getGeoLocationNullCity() {
-		assertThat(filter.getGeoLocation("22.231.113.64")).isEqualTo("United States");
-	}
-
-	@Test
-	public void getGeoLocationBoth() {
-		assertThat(filter.getGeoLocation("184.154.83.119")).isEqualTo("Chicago, United States");
-	}
-}
--- a/samples/hazelcast-spring/build.gradle
+++ b/samples/hazelcast-spring/build.gradle
@@ -1,23 +0,0 @@
-apply from: JAVA_GRADLE
-apply from: TOMCAT_7_GRADLE
-
-tasks.findByPath("artifactoryPublish")?.enabled = false
-sonarRunner {
-	skipProject = true
-}
-
-dependencies {
-	compile project(':spring-session'),
-			"org.springframework:spring-web:$springVersion",
-			"org.springframework.security:spring-security-config:$springSecurityVersion",
-			"org.springframework.security:spring-security-web:$springSecurityVersion",
-			"com.hazelcast:hazelcast-client:$hazelcastVersion",
-			jstlDependencies
-
-	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion",
-					"javax.servlet:jsp-api:$jspApiVersion"
-
-	testCompile "junit:junit:$junitVersion"
-
-	integrationTestCompile gebDependencies
-}
--- a/samples/hazelcast-spring/src/integration-test/groovy/sample/HazelcastSpringTests.groovy
+++ b/samples/hazelcast-spring/src/integration-test/groovy/sample/HazelcastSpringTests.groovy
@@ -1,65 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample
-
-import geb.spock.GebReportingSpec
-import pages.*
-import sample.pages.HomePage
-import sample.pages.LoginPage
-import spock.lang.Stepwise
-
-/**
- * Ensures that Spring Security and Session are working
- *
- * @author Rob Winch
- */
-@Stepwise
-class HazelcastSpringTests extends GebReportingSpec {
-
-	def 'Unauthenticated user sent to log in page'() {
-		when: 'unauthenticated user request protected page'
-		via HomePage
-		then: 'sent to the log in page'
-		at LoginPage
-	}
-
-	def 'Log in views home page'() {
-		when: 'log in successfully'
-		login()
-		then: 'sent to original page'
-		at HomePage
-		and: 'the username is displayed'
-		username == 'user'
-		and: 'Spring Session Management is being used'
-		driver.manage().cookies.find { it.name == 'SESSION' }
-		and: 'Standard Session is NOT being used'
-		!driver.manage().cookies.find { it.name == 'JSESSIONID' }
-	}
-
-	def 'Log out success'() {
-		when:
-		logout()
-		then:
-		at LoginPage
-	}
-
-	def 'Logged out user sent to log in page'() {
-		when: 'logged out user request protected page'
-		via HomePage
-		then: 'sent to the log in page'
-		at LoginPage
-	}
-}
--- a/samples/hazelcast-spring/src/integration-test/groovy/sample/pages/HomePage.groovy
+++ b/samples/hazelcast-spring/src/integration-test/groovy/sample/pages/HomePage.groovy
@@ -1,32 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.pages
-
-import geb.Page
-
-/**
- * The home page
- *
- * @author Rob Winch
- */
-class HomePage extends Page {
-	static url = ''
-	static at = { assert driver.title == 'Secured Content'; true}
-	static content = {
-		username { $('#un').text() }
-		logout(to:LoginPage) { $('input[type=submit]').click() }
-	}
-}
--- a/samples/hazelcast-spring/src/integration-test/groovy/sample/pages/LoginPage.groovy
+++ b/samples/hazelcast-spring/src/integration-test/groovy/sample/pages/LoginPage.groovy
@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample.pages
-
-import geb.Page
-
-/**
- * The Links Page
- *
- * @author Rob Winch
- */
-class LoginPage extends Page {
-	static url = '/login'
-	static at = { assert driver.title == 'Login Page'; true}
-	static content = {
-		form { $('form') }
-		submit { $('input[type=submit]') }
-		login(required:false) { user='user', pass='password' ->
-			form.username = user
-			form.password = pass
-			submit.click(HomePage)
-		}
-	}
-}
--- a/samples/hazelcast-spring/src/main/java/sample/Config.java
+++ b/samples/hazelcast-spring/src/main/java/sample/Config.java
@@ -1,48 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.session.hazelcast.config.annotation.web.http.EnableHazelcastHttpSession;
-import org.springframework.util.SocketUtils;
-
-import com.hazelcast.config.NetworkConfig;
-import com.hazelcast.config.SerializerConfig;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.HazelcastInstance;
-
-// tag::class[]
-@EnableHazelcastHttpSession(maxInactiveIntervalInSeconds = "300")
-@Configuration
-public class Config {
-
-	@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);
-
-		return Hazelcast.newHazelcastInstance(cfg);
-	}
-
-}
-// end::class[]
--- a/samples/hazelcast-spring/src/main/java/sample/Initializer.java
+++ b/samples/hazelcast-spring/src/main/java/sample/Initializer.java
@@ -1,24 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer;
-
-// tag::class[]
-public class Initializer extends AbstractHttpSessionApplicationInitializer {
-
-}
-// end::class[]
--- a/samples/hazelcast-spring/src/main/java/sample/ObjectStreamSerializer.java
+++ b/samples/hazelcast-spring/src/main/java/sample/ObjectStreamSerializer.java
@@ -1,59 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import java.io.*;
-
-import com.hazelcast.nio.ObjectDataInput;
-import com.hazelcast.nio.ObjectDataOutput;
-import com.hazelcast.nio.serialization.StreamSerializer;
-
-/**
- * A {@link StreamSerializer} that uses Java serialization to persist the
- * session. This is certainly not the most efficient way to persist sessions,
- * but the example is intended to demonstrate using minimal dependencies. For
- * better serialization methods try using <a
- * href="https://github.com/EsotericSoftware/kryo">Kryo</a>.
- *
- * @author Rob Winch
- *
- */
-public class ObjectStreamSerializer implements StreamSerializer<Object> {
-	public int getTypeId() {
-		return 2;
-	}
-
-	public void write(ObjectDataOutput objectDataOutput, Object object)
-		   throws IOException {
-		ObjectOutputStream out = new ObjectOutputStream((OutputStream) objectDataOutput);
-		out.writeObject(object);
-		out.flush();
-	}
-
-	public Object read(ObjectDataInput objectDataInput)
-		   throws IOException {
-		ObjectInputStream in = new ObjectInputStream((InputStream) objectDataInput);
-		try {
-			return in.readObject();
-		} catch (ClassNotFoundException e) {
-			throw new IOException(e);
-		}
-	}
-
-	public void destroy() {
-	}
-
-}
--- a/samples/hazelcast-spring/src/main/java/sample/SecurityConfig.java
+++ b/samples/hazelcast-spring/src/main/java/sample/SecurityConfig.java
@@ -1,34 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package sample;
-
-/**
- * @author Rob Winch
- */
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-
-@EnableWebSecurity
-public class SecurityConfig {
-	@Autowired
-	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-		auth
-			.inMemoryAuthentication()
-				.withUser("user").password("password").roles("USER");
-	}
-}
--- a/samples/hazelcast-spring/src/main/java/sample/SecurityInitializer.java
+++ b/samples/hazelcast-spring/src/main/java/sample/SecurityInitializer.java
@@ -1,28 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import org.springframework.security.web.context.AbstractSecurityWebApplicationInitializer;
-
-// tag::class[]
-public class SecurityInitializer extends
-		AbstractSecurityWebApplicationInitializer {
-
-	public SecurityInitializer() {
-		super(SecurityConfig.class, Config.class);
-	}
-}
-// end::class[]
--- a/samples/hazelcast-spring/src/main/java/sample/SessionServlet.java
+++ b/samples/hazelcast-spring/src/main/java/sample/SessionServlet.java
@@ -1,37 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package sample;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@WebServlet("/session")
-public class SessionServlet extends HttpServlet {
-
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
-		String attributeName = req.getParameter("attributeName");
-		String attributeValue = req.getParameter("attributeValue");
-		req.getSession().setAttribute(attributeName, attributeValue);
-		resp.sendRedirect(req.getContextPath() + "/");
-	}
-
-	private static final long serialVersionUID = 2878267318695777395L;
-}
--- a/samples/hazelcast-spring/src/main/webapp/META-INF/MANIFEST.MF
+++ b/samples/hazelcast-spring/src/main/webapp/META-INF/MANIFEST.MF
--- a/samples/hazelcast-spring/src/main/webapp/assets/bootstrap.min.css
+++ b/samples/hazelcast-spring/src/main/webapp/assets/bootstrap.min.css
--- a/samples/hazelcast-spring/src/main/webapp/index.jsp
+++ b/samples/hazelcast-spring/src/main/webapp/index.jsp
@@ -1,32 +0,0 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<!DOCTYPE html>
-<html lang="en">
-<head>
-	<title>Secured Content</title>
-	<link rel="stylesheet" href="assets/bootstrap.min.css">
-	<style type="text/css">
-		body {
-			padding: 1em;
-		}
-		#un {
-			font-weight: bold;
-		}
-	</style>
-</head>
-<body>
-	<div class="container">
-		<h1>Description</h1>
-		<p>This demonstrates how Spring Session and Hazelcast can be combined with Spring Security. The important thing to ensure is that Spring Session's Filter is included before Spring Security's Filter.</p>
-
-		<h1>Logged in as</h1>
-
-		<p>You are currently logged in as <span id="un"><c:out value="${pageContext.request.remoteUser}"/></span>.</p>
-
-		<c:url value="/logout" var="logoutUrl"/>
-		<form action="${logoutUrl}" method="post">
-			<input type="submit" value="Log Out"/>
-			<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
-		</form>
-	</div>
-</body>
-</html>
--- a/samples/hazelcast/src/main/webapp/index.jsp
+++ b/samples/hazelcast/src/main/webapp/index.jsp
@@ -13,13 +13,13 @@
 <body>
    <div class="container">
        <h1>Description</h1>
-        <p>This application demonstrates how to use Hazelcast to back your session. Notice that there is no JSESSIONID cookie. We are also able to customize the way of identifying what the requested session id is.</p>
+        <p>This application demonstrates how to use a Redis instance to back your session. Notice that there is no JSESSIONID cookie. We are also able to customize the way of identifying what the requested session id is.</p>

        <h1>Try it</h1>

        <form class="form-inline" role="form" action="./session" method="post">
-            <label for="attributeName">Attribute Name</label>
-            <input id="attributeName" type="text" name="attributeName"/>
+            <label for="attributeValue">Attribute Name</label>
+            <input id="attributeValue" type="text" name="attributeName"/>
            <label for="attributeValue">Attribute Value</label>
            <input id="attributeValue" type="text" name="attributeValue"/>
            <input type="submit" value="Set Attribute"/>
--- a/samples/httpsession-xml/build.gradle
+++ b/samples/httpsession-xml/build.gradle
@@ -8,6 +8,7 @@ sonarRunner {

 dependencies {
 	compile project(':spring-session-data-redis'),
+		project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-web:$springVersion",
 			jstlDependencies

--- a/samples/httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml
+++ b/samples/httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml
@@ -7,12 +7,14 @@
 		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">

 	<!-- tag::beans[] -->
+	<bean class="org.springframework.session.redis.embedded.EmbeddedRedisConfiguration"/> <!--1-->

-	<!--1-->
+	<!--2-->
 	<context:annotation-config/>
 	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>

-	<!--2-->
-	<bean class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"/>
+	<!--3-->
+	<bean class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
+		p:port="${spring.redis.port}"/>
 	<!-- end::beans[] -->
 </beans>
--- a/samples/httpsession-xml/src/main/webapp/index.jsp
+++ b/samples/httpsession-xml/src/main/webapp/index.jsp
@@ -18,8 +18,8 @@
        <h1>Try it</h1>

        <form class="form-inline" role="form" action="./session" method="post">
-            <label for="attributeName">Attribute Name</label>
-            <input id="attributeName" type="text" name="attributeName"/>
+            <label for="attributeValue">Attribute Name</label>
+            <input id="attributeValue" type="text" name="attributeName"/>
            <label for="attributeValue">Attribute Value</label>
            <input id="attributeValue" type="text" name="attributeValue"/>
            <input type="submit" value="Set Attribute"/>
--- a/samples/httpsession/build.gradle
+++ b/samples/httpsession/build.gradle
@@ -8,6 +8,7 @@ sonarRunner {

 dependencies {
 	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-web:$springVersion",
 			jstlDependencies

--- a/samples/httpsession/src/main/java/sample/Config.java
+++ b/samples/httpsession/src/main/java/sample/Config.java
@@ -18,14 +18,19 @@ package sample;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;

 // tag::class[]
-@EnableRedisHttpSession // <1>
+@EnableEmbeddedRedis // <1>
+@EnableRedisHttpSession // <2>
 public class Config {

 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <2>
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
 	}
 }
 // end::class[]
--- a/samples/httpsession/src/main/webapp/index.jsp
+++ b/samples/httpsession/src/main/webapp/index.jsp
@@ -18,8 +18,8 @@
 		<h1>Try it</h1>

 		<form class="form-inline" role="form" action="./session" method="post">
-			<label for="attributeName">Attribute Name</label>
-			<input id="attributeName" type="text" name="attributeName"/>
+			<label for="attributeValue">Attribute Name</label>
+			<input id="attributeValue" type="text" name="attributeName"/>
 			<label for="attributeValue">Attribute Value</label>
 			<input id="attributeValue" type="text" name="attributeValue"/>
 			<input type="submit" value="Set Attribute"/>
--- a/samples/rest/build.gradle
+++ b/samples/rest/build.gradle
@@ -8,6 +8,7 @@ sonarRunner {

 dependencies {
 	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-webmvc:$springVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
--- a/samples/rest/src/integration-test/java/rest/RestMockMvcTests.java
+++ b/samples/rest/src/integration-test/java/rest/RestMockMvcTests.java
@@ -15,7 +15,6 @@
 */
 package rest;

-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -25,7 +24,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.session.ExpiringSession;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 import org.springframework.test.context.ContextConfiguration;
@@ -58,29 +56,12 @@ public class RestMockMvcTests {
 		mvc = MockMvcBuilders.webAppContextSetup(context)
 				.alwaysDo(print())
 				.addFilters(sessionRepositoryFilter)
-				.apply(springSecurity())
-				.build();
+				.apply(springSecurity()).build();
 	}

 	@Test
 	public void noSessionOnNoCredentials() throws Exception {
 		mvc.perform(get("/"))
-			.andExpect(header().doesNotExist("x-auth-token"))
-			.andExpect(status().isUnauthorized());
-	}
-
-	@WithMockUser
-	@Test
-	public void autheticatedAnnotation() throws Exception {
-		mvc.perform(get("/"))
-			.andExpect(content().string("{\"username\":\"user\"}"));
-
-	}
-
-	@Test
-	public void autheticatedRequestPostProcessor() throws Exception {
-		mvc.perform(get("/").with(user("user")))
-			.andExpect(content().string("{\"username\":\"user\"}"));
-
+			.andExpect(header().doesNotExist("x-auth-token"));
 	}
 }
--- a/samples/rest/src/main/java/sample/HttpSessionConfig.java
+++ b/samples/rest/src/main/java/sample/HttpSessionConfig.java
@@ -19,22 +19,27 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;
 import org.springframework.session.web.http.HeaderHttpSessionStrategy;
 import org.springframework.session.web.http.HttpSessionStrategy;

 // tag::class[]
@Configuration
-@EnableRedisHttpSession // <1>
+@EnableEmbeddedRedis // <1>
+@EnableRedisHttpSession // <2>
 public class HttpSessionConfig {

 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();  // <2>
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory factory = new JedisConnectionFactory();  // <3>
+		factory.setPort(port);
+		return factory;
 	}

 	@Bean
 	public HttpSessionStrategy httpSessionStrategy() {
-		return new HeaderHttpSessionStrategy(); // <3>
+		return new HeaderHttpSessionStrategy(); // <4>
 	}
 }
 // end::class[]
--- a/samples/security/build.gradle
+++ b/samples/security/build.gradle
@@ -8,13 +8,13 @@ sonarRunner {

 dependencies {
 	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-web:$springVersion",
 			"org.springframework.security:spring-security-config:$springSecurityVersion",
 			"org.springframework.security:spring-security-web:$springSecurityVersion",
 			jstlDependencies

-	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion",
-					"javax.servlet:jsp-api:$jspApiVersion"
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"

 	testCompile "junit:junit:$junitVersion"

--- a/samples/security/src/main/java/sample/Config.java
+++ b/samples/security/src/main/java/sample/Config.java
@@ -19,15 +19,20 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;

 // tag::class[]
@Configuration
-@EnableRedisHttpSession // <1>
+@EnableEmbeddedRedis // <1>
+@EnableRedisHttpSession // <2>
 public class Config {

 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory(); // <2>
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
 	}
 }
 // end::class[]
--- a/samples/spring-embedded-redis/build.gradle
+++ b/samples/spring-embedded-redis/build.gradle
@@ -0,0 +1,14 @@
+apply from: JAVA_GRADLE
+
+tasks.findByPath("artifactoryPublish")?.enabled = false
+sonarRunner {
+	skipProject = true
+}
+
+dependencies {
+	compile "com.github.kstyrc:embedded-redis:$embeddedRedisVersion",
+			"org.springframework:spring-context:$springVersion"
+
+	testCompile "junit:junit:$junitVersion",
+				"org.springframework.security:spring-security-test:$springSecurityVersion"
+}
--- a/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EmbeddedRedisConfiguration.java
+++ b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EmbeddedRedisConfiguration.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.session.redis.embedded;
+
+import java.io.IOException;
+import java.net.ServerSocket;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.PropertySource;
+
+import redis.embedded.RedisServer;
+
+/**
+ * Runs an embedded Redis instance. This is only necessary since we do not want
+ * users to have to setup a Redis instance. In a production environment, this
+ * would not be used since a Redis Server would be setup.
+ *
+ * @author Rob Winch
+ */
+@Configuration
+class EmbeddedRedisConfiguration {
+	public static final String SERVER_PORT_PROP_NAME = "spring.redis.port";
+
+	@Bean
+	public static RedisServerBean redisServer(ConfigurableEnvironment env) {
+		RedisServerBean bean = new RedisServerBean();
+		env.getPropertySources().addLast(bean);
+		return bean;
+	}
+
+	@Bean
+	public static PropertySourcesPlaceholderConfigurer propertyPlaceholderConfigurer() {
+		return new PropertySourcesPlaceholderConfigurer();
+	}
+
+	/**
+	 * Implements BeanDefinitionRegistryPostProcessor to ensure this Bean is initialized
+	 * before any other Beans. Specifically, we want to ensure that the Redis Server is
+	 * started before RedisHttpSessionConfiguration attempts to enable Keyspace
+	 * notifications. We also want to ensure that we are able to register the
+	 * {@link PropertySource} before any beans are initialized.
+	 */
+	static class RedisServerBean extends PropertySource<RedisServerBean> implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
+		private final int port = getAvailablePort();
+
+		private RedisServer redisServer;
+
+		public RedisServerBean() {
+			super("redisServerPortPropertySource");
+		}
+
+		public void afterPropertiesSet() throws Exception {
+			redisServer = new RedisServer(port);
+			redisServer.start();
+		}
+
+		public void destroy() throws Exception {
+			if(redisServer != null) {
+				redisServer.stop();
+			}
+		}
+
+		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
+
+		public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
+
+		@Override
+		public Object getProperty(String name) {
+			if(SERVER_PORT_PROP_NAME.equals(name)) {
+				return port;
+			}
+			return null;
+		}
+
+		private static int getAvailablePort() {
+			ServerSocket socket = null;
+			try {
+				socket = new ServerSocket(0);
+				return socket.getLocalPort();
+			} catch(IOException e) {
+				throw new RuntimeException(e);
+			} finally {
+				try {
+					if(socket != null) {
+						socket.close();
+					}
+				}catch(IOException e) {}
+			}
+		}
+	}
+}
--- a/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EnableEmbeddedRedis.java
+++ b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/EnableEmbeddedRedis.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.session.redis.embedded;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * <p>
+ * Runs an embedded Redis instance on a random available port.This is only necessary
+ * sincewe do not want users to have to setup a Redis instance. In a production
+ * environment, this would not be used since a Redis Server would be setup.
+ * </p>
+ * <p>
+ * The port being used can be identified by using {@literal @RedisServerPort} on a Spring
+ * Bean. For example:
+ * </p>
+ *
+ * <pre>
+ * {@literal @Configuration}
+ * {@literal @EnableEmbeddedRedis}
+ * public class RedisHttpSessionConfig {
+ *
+ *     {@literal @Bean}
+ *     public JedisConnectionFactory connectionFactory({@literal @RedisServerPort} int port) throws Exception {
+ *         JedisConnectionFactory connection = new JedisConnectionFactory();
+ *         connection.setPort(port);
+ *         return connection;
+ *     }
+ *
+ * }
+ * </pre>
+ *
+ * See <a href="https://github.com/spring-projects/spring-session/issues/121"
+ * >spring-projects/spring-session/issues/121</a> for details on exposing embedded Redis
+ * support.
+ *
+ * @author Rob Winch
+ * @see RedisServerPort
+ *
+ */
+@Retention(value=java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target(value={java.lang.annotation.ElementType.TYPE})
+@Documented
+@Import(EmbeddedRedisConfiguration.class)
+@Configuration
+public @interface EnableEmbeddedRedis {}
--- a/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/RedisServerPort.java
+++ b/samples/spring-embedded-redis/src/main/java/org/springframework/session/redis/embedded/RedisServerPort.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2002-2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.session.redis.embedded;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.beans.factory.annotation.Value;
+
+/**
+ * A convenience for finding the Redis Server port when using {@link EnableEmbeddedRedis}. For example:
+ *
+ * <pre>
+ * {@literal @Configuration}
+ * {@literal @EnableEmbeddedRedis}
+ * public class RedisHttpSessionConfig {
+ *
+ *     {@literal @Bean}
+ *     public JedisConnectionFactory connectionFactory({@literal @RedisServerPort} int port) throws Exception {
+ *         JedisConnectionFactory connection = new JedisConnectionFactory();
+ *         connection.setPort(port);
+ *         return connection;
+ *     }
+ *
+ * }
+ * </pre>
+ *
+ * @author Rob Winch
+ */
+@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Value("${"+EmbeddedRedisConfiguration.SERVER_PORT_PROP_NAME+"}")
+public @interface RedisServerPort { }
--- a/samples/users/build.gradle
+++ b/samples/users/build.gradle
@@ -8,6 +8,7 @@ sonarRunner {

 dependencies {
 	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-web:$springVersion",
 			jstlDependencies

--- a/samples/users/src/main/java/sample/Config.java
+++ b/samples/users/src/main/java/sample/Config.java
@@ -19,19 +19,24 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
+import org.springframework.session.redis.embedded.RedisServerPort;

 /**
 * @author Rob Winch
 */

+@EnableEmbeddedRedis
 // tag::class[]
@Configuration
@EnableRedisHttpSession
 public class Config {

 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return  new JedisConnectionFactory();
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory();
+		connection.setPort(port);
+		return connection;
 	}
 }
 // end::class[]
--- a/samples/websocket/build.gradle
+++ b/samples/websocket/build.gradle
@@ -18,6 +18,7 @@ group = 'samples'

 dependencies {
 	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
 			"org.springframework.boot:spring-boot-starter-web",
 			"org.springframework.boot:spring-boot-starter-data-jpa",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
--- a/samples/websocket/src/main/java/sample/config/DataSourceConfig.java
+++ b/samples/websocket/src/main/java/sample/config/DataSourceConfig.java
@@ -22,6 +22,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.session.redis.embedded.RedisServerPort;

@Configuration
 public class DataSourceConfig {
@@ -33,7 +34,9 @@ public class DataSourceConfig {
 	}

 	@Bean
-	public JedisConnectionFactory connectionFactory() {
-		return new JedisConnectionFactory();
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
 	}
 }
--- a/Show More
+++ b/Show More