Release version 1.0.1.RELEASE

Previously forcibly cleaning up sessions was not working. All the cleanup
was done by Redis expiration. This meant that sessions would be kept alive
until Redis cleaned them up (non deterministic).

This commit resolves the mapping of expiration to session ids.

Fixes gh-169

build.gradle

@@ -1,22 +1,24 @@
 buildscript {
-    repositories {
-        maven { url "https://repo.spring.io/plugins-release" }
-    }
-    dependencies {
-        classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
-        classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-        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'
-    }
+	repositories {
+		maven { url "https://repo.spring.io/plugins-release" }
+	}
+	dependencies {
+		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
+		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+		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'
+	}
 }
 
 group = 'org.springframework.session'
 
-ext.springBootVersion = '1.1.10.RELEASE'
+ext.springBootVersion = '1.2.3.RELEASE'
 ext.JAVA_GRADLE = "$rootDir/gradle/java.gradle"
 ext.MAVEN_GRADLE = "$rootDir/gradle/publish-maven.gradle"
 ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle"
+ext.TOMCAT_6_GRADLE = "$rootDir/gradle/tomcat6.gradle"
+ext.TOMCAT_7_GRADLE = "$rootDir/gradle/tomcat7.gradle"
 
 ext.releaseBuild = version.endsWith('RELEASE')
 ext.snapshotBuild = version.endsWith('SNAPSHOT')
@@ -27,37 +29,37 @@ apply plugin: 'base'
 
 
 sonarRunner {
-    sonarProperties {
-        property "sonar.java.coveragePlugin", "jacoco"
-        property "sonar.projectName", "Spring Session"
-        property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
-        property "sonar.links.homepage", 'https://github.com/spring-projects/spring-session'
-        property "sonar.links.ci", 'https://build.spring.io/browse/SESSION'
-        property "sonar.links.issue", 'https://github.com/spring-projects/spring-session/issues'
-        property "sonar.links.scm", 'https://github.com/spring-projects/spring-session'
-        property "sonar.links.scm_dev", 'https://github.com/spring-projects/spring-session.git'
-        property "sonar.java.coveragePlugin", "jacoco"
-    }
+	sonarProperties {
+		property "sonar.java.coveragePlugin", "jacoco"
+		property "sonar.projectName", "Spring Session"
+		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
+		property "sonar.links.homepage", 'https://github.com/spring-projects/spring-session'
+		property "sonar.links.ci", 'https://build.spring.io/browse/SESSION'
+		property "sonar.links.issue", 'https://github.com/spring-projects/spring-session/issues'
+		property "sonar.links.scm", 'https://github.com/spring-projects/spring-session'
+		property "sonar.links.scm_dev", 'https://github.com/spring-projects/spring-session.git'
+		property "sonar.java.coveragePlugin", "jacoco"
+	}
 }
 
 task configDocsZip(dependsOn: [':docs:asciidoctor',':spring-session:javadoc']) << {
-    project.tasks.docsZip.from(project(':docs').asciidoctor) {
-        into('reference')
-    }
-    project.tasks.docsZip.from(project(':spring-session').javadoc) {
-        into('api')
-    }
+	project.tasks.docsZip.from(project(':docs').asciidoctor) {
+		into('reference')
+	}
+	project.tasks.docsZip.from(project(':spring-session').javadoc) {
+		into('api')
+	}
 }
 
 
 task docsZip(type: Zip, dependsOn: 'configDocsZip') {
-    group = "Distribution"
-    baseName = "spring-session"
-    classifier = "docs"
-    description = "Builds -${classifier} archive containing api and reference " +
-            "for deployment."
+	group = "Distribution"
+	baseName = "spring-session"
+	classifier = "docs"
+	description = "Builds -${classifier} archive containing api and reference " +
+			"for deployment."
 }
 
 artifacts {
-    archives docsZip
+	archives docsZip
 }

docs/build.gradle

@@ -8,37 +8,39 @@ asciidoctorj {
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
 dependencies {
-        testCompile project(':spring-session'),
-                "org.springframework.data:spring-data-redis:$springDataRedisVersion",
-                "org.springframework:spring-websocket:${springVersion}",
-                "org.springframework:spring-messaging:${springVersion}",
-                'junit:junit:4.11',
-                'org.mockito:mockito-core:1.9.5',
-                "org.springframework:spring-test:$springVersion",
-                'org.easytesting:fest-assert:1.4',
-                "redis.clients:jedis:2.4.1"
+		testCompile project(':spring-session'),
+				"org.springframework.data:spring-data-redis:$springDataRedisVersion",
+				"org.springframework:spring-websocket:${springVersion}",
+				"org.springframework:spring-messaging:${springVersion}",
+				'junit:junit:4.11',
+				'org.mockito:mockito-core:1.9.5',
+				"org.springframework:spring-test:$springVersion",
+				'org.easytesting:fest-assert:1.4',
+				"redis.clients:jedis:2.4.1",
+				"javax.servlet:javax.servlet-api:$servletApiVersion"
 }
 
 asciidoctor {
-    def ghTag = snapshotBuild ? 'master' : project.version
-    def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag/"
-    attributes	'version-snapshot': snapshotBuild,
-            'version-milestone': milestoneBuild,
-            'version-release': releaseBuild,
-            'gh-url': ghUrl,
-            'gh-samples-url': "$ghUrl/samples/",
-            'download-url' : "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
-            'spring-session-version' : version,
-            'spring-version' : springVersion,
-            'docs-test-dir' : rootProject.projectDir.path + '/docs/src/test/java/',
-            'samples-dir' : rootProject.projectDir.path + '/samples/',
+	def ghTag = snapshotBuild ? 'master' : project.version
+	def ghUrl = "https://github.com/spring-projects/spring-session/tree/$ghTag/"
+	attributes	'version-snapshot': snapshotBuild,
+			'version-milestone': milestoneBuild,
+			'version-release': releaseBuild,
+			'gh-url': ghUrl,
+			'gh-samples-url': "$ghUrl/samples/",
+			'download-url' : "https://github.com/spring-projects/spring-session/archive/${ghTag}.zip",
+			'spring-session-version' : version,
+			'spring-version' : springVersion,
+			'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/',
 
-            'source-highlighter' : 'coderay',
-            'imagesdir':'./images',
-            'icons': 'font',
-            'sectanchors':'',
-            'idprefix':'',
-            'idseparator':'-',
-            'docinfo1':'true',
-            'revnumber' : project.version
+			'source-highlighter' : 'coderay',
+			'imagesdir':'./images',
+			'icons': 'font',
+			'sectanchors':'',
+			'idprefix':'',
+			'idseparator':'-',
+			'docinfo1':'true',
+			'revnumber' : project.version
 }

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

@@ -16,14 +16,17 @@ If you are using Maven, ensure to add the following dependencies:
 [subs="verbatim,attributes"]
 ----
 <dependencies>
-    <!-- ... -->
+	<!-- ... -->
 
-    <dependency>
-      <groupId>org.springframework.session</groupId>
-      <artifactId>spring-session-data-redis</artifactId>
-      <version>{spring-session-version}</version>
-      <type>pom<type>
-    </dependency>
+	<dependency>
+		<groupId>org.springframework.session</groupId>
+		<artifactId>spring-session</artifactId>
+		<version>{spring-session-version}</version>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-redis</artifactId>
+	</dependency>
 </dependencies>
 ----
 
@@ -36,12 +39,12 @@ Ensure you have the following in your pom.xml:
 ----
 <repositories>
 
-    <!-- ... -->
+	<!-- ... -->
 
-    <repository>
-      <id>spring-snapshot</id>
-      <url>https://repo.spring.io/libs-snapshot</url>
-    </repository>
+	<repository>
+		<id>spring-snapshot</id>
+		<url>https://repo.spring.io/libs-snapshot</url>
+	</repository>
 </repositories>
 ----
 endif::[]
@@ -54,8 +57,8 @@ Ensure you have the following in your pom.xml:
 [source,xml]
 ----
 <repository>
-  <id>spring-milestone</id>
-  <url>https://repo.spring.io/libs-milestone</url>
+	<id>spring-milestone</id>
+	<url>https://repo.spring.io/libs-milestone</url>
 </repository>
 ----
 endif::[]
@@ -69,16 +72,29 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}boot/src/main/java/sample/config/HttpSessionConfig.java[]
+include::{samples-dir}boot/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
 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.
-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].
 
+[[boot-redis-configuration]]
+== Configuring the Redis Connection
+
+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
+----
+spring.redis.host=localhost
+spring.redis.password=secret
+spring.redis.port=6379
+----
+
+For more information, refer to http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-connecting-to-redis[Connecting to Redis] portion of the Spring Boot documentation.
+
+[[boot-servlet-configuration]]
 == Servlet Container Initialization
 
 Our <<boot-spring-configuration,Spring Configuration>> created a Spring Bean named `springSessionRepositoryFilter` that implements `Filter`.
@@ -93,14 +109,18 @@ Fortunately, Spring Boot takes care of both of these steps for us.
 
 The boot Sample Application demonstrates how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` when using Spring Boot.
 
+[[boot-running]]
 === Running the boot Sample Application
 
 You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
 
-  $ ./gradlew :samples:boot:tomcatRun
+----
+$ ./gradlew :samples:boot:bootRun
+----
 
 You should now be able to access the application at http://localhost:8080/
 
+[[boot-explore]]
 === Exploring the security Sample Application
 
 Try using the application. Enter the following to log in:
@@ -112,6 +132,7 @@ Now click the **Login** button.
 You should now see a message indicating your are logged in with the user entered previously.
 The user's information is stored in Redis rather than Tomcat's `HttpSession` implementation.
 
+[[boot-how]]
 === How does it work?
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
@@ -123,12 +144,12 @@ Go ahead and view the cookies (click for help with https://developer.chrome.com/
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
-    $ redis-cli keys '*' | xargs redis-cli del
+	$ redis-cli keys '*' | xargs redis-cli del
 
 TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
-    $ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
-Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.
+Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

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

@@ -0,0 +1,170 @@
+= Spring Session - HttpSession (Quick Start)
+Rob Winch
+:toc:
+
+This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` with XML based configuration.
+
+NOTE: The completed guide can be found in the <<httpsession-xml-sample, httpsession-xml 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>org.springframework.session</groupId>
+		<artifactId>spring-session-data-redis</artifactId>
+		<version>{spring-session-version}</version>
+		<type>pom<type>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>{spring-version}</version>
+	</dependency>
+</dependencies>
+----
+
+ifeval::["{version-snapshot}" == "true"]
+Since we are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
+Ensure you have the following in your pom.xml:
+
+.pom.xml
+[source,xml]
+----
+<repositories>
+
+	<!-- ... -->
+
+	<repository>
+		<id>spring-snapshot</id>
+		<url>https://repo.spring.io/libs-snapshot</url>
+	</repository>
+</repositories>
+----
+endif::[]
+
+ifeval::["{version-milestone}" == "true"]
+Since We are using a Milestone version, we need to ensure to add the Spring Milestone Maven Repository.
+Ensure you have the following in your pom.xml:
+
+.pom.xml
+[source,xml]
+----
+<repository>
+	<id>spring-milestone</id>
+	<url>https://repo.spring.io/libs-milestone</url>
+</repository>
+----
+endif::[]
+
+// tag::config[]
+
+[[httpsession-xml-spring-configuration]]
+== Spring XML 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:
+
+.src/main/webapp/WEB-INF/spring/session.xml
+[source,xml,indent=0]
+----
+include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+----
+
+<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.
+<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
+
+Our <<httpsession-xml-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, we need to instruct Spring to load our `session.xml` configuration.
+We do this with the following configuration:
+
+
+.src/main/webapp/WEB-INF/web.xml
+[source,xml,indent=0]
+----
+include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+----
+
+The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener] reads the contextConfigLocation and picks up our session.xml configuration.
+
+Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
+The following snippet performs this last step for us:
+
+.src/main/webapp/WEB-INF/web.xml
+[source,xml,indent=0]
+----
+include::{samples-dir}httpsession-xml/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+----
+
+The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy] will look up a Bean by the name of `springSessionRepositoryFilter` and cast it to a `Filter`.
+For every request that `DelegatingFilterProxy` is invoked, the `springSessionRepositoryFilter` will be invoked.
+
+// end::config[]
+
+[[httpsession-xml-sample]]
+== httpsession-xml Sample Application
+
+=== Running the httpsession-xml Sample Application
+
+You can run the sample by obtaining the {download-url}[source code] and invoking the following command:
+
+----
+$ ./gradlew :samples:httpsession-xml:tomcatRun
+----
+
+You should now be able to access the application at http://localhost:8080/
+
+=== Exploring the httpsession-xml 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.
+
+=== How does it work?
+
+We interact with the standard `HttpSession` in the `SessionServlet` shown below:
+
+.src/main/java/sample/SessionServlet.java
+[source,java]
+----
+include::{samples-dir}httpsession-xml/src/main/java/sample/SessionServlet.java[tags=class]
+----
+
+Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
+Spring Session creates a cookie named SESSION in your browser that contains the id of your session.
+Go ahead and view the cookies (click for help with https://developer.chrome.com/devtools/docs/resources#cookies[Chrome] or https://getfirebug.com/wiki/index.php/Cookies_Panel#Cookies_List[Firefox]).
+
+If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
+
+	$ redis-cli keys '*' | xargs redis-cli del
+
+TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
+
+Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
+
+	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+
+Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

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

@@ -2,7 +2,7 @@
 Rob Winch
 :toc:
 
-This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession`.
+This guide describes how to use Spring Session to transparently leverage Redis to back a web application's `HttpSession` with Java Configuration.
 
 NOTE: The completed guide can be found in the <<httpsession-sample, httpsession sample application>>.
 
@@ -15,24 +15,24 @@ If you are using Maven, ensure to add the following dependencies:
 [subs="verbatim,attributes"]
 ----
 <dependencies>
-    <!-- ... -->
+	<!-- ... -->
 
-    <dependency>
-      <groupId>org.springframework.session</groupId>
-      <artifactId>spring-session-data-redis</artifactId>
-      <version>{spring-session-version}</version>
-      <type>pom<type>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>{spring-version}</version>
-    </dependency>
+	<dependency>
+		<groupId>org.springframework.session</groupId>
+		<artifactId>spring-session-data-redis</artifactId>
+		<version>{spring-session-version}</version>
+		<type>pom<type>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>{spring-version}</version>
+	</dependency>
 </dependencies>
 ----
 
 ifeval::["{version-snapshot}" == "true"]
-Since We are using a SNAPSHOT version, we need to ensure to add the Spring Snapshot Maven Repository.
+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
@@ -40,12 +40,12 @@ Ensure you have the following in your pom.xml:
 ----
 <repositories>
 
-    <!-- ... -->
+	<!-- ... -->
 
-    <repository>
-      <id>spring-snapshot</id>
-      <url>https://repo.spring.io/libs-snapshot</url>
-    </repository>
+	<repository>
+		<id>spring-snapshot</id>
+		<url>https://repo.spring.io/libs-snapshot</url>
+	</repository>
 </repositories>
 ----
 endif::[]
@@ -58,8 +58,8 @@ Ensure you have the following in your pom.xml:
 [source,xml]
 ----
 <repository>
-  <id>spring-milestone</id>
-  <url>https://repo.spring.io/libs-milestone</url>
+	<id>spring-milestone</id>
+	<url>https://repo.spring.io/libs-milestone</url>
 </repository>
 ----
 endif::[]
@@ -67,7 +67,7 @@ endif::[]
 // tag::config[]
 
 [[httpsession-spring-configuration]]
-== Spring Configuration
+== Spring Java 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.
@@ -75,7 +75,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Config.java[]
+include::{samples-dir}httpsession/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> We import an embedded Redis Server so that there is no need to start up Redis external of our application.
@@ -84,10 +84,10 @@ In a production application this is not necessary since we would point our conne
 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.
 <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).
+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].
 
-== Servlet Container Initialization
+== Java Servlet Container Initialization
 
 Our <<httpsession-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.
@@ -100,7 +100,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/Initializer.java[]
+include::{samples-dir}httpsession/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`.
@@ -120,7 +120,9 @@ 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:
 
-  $ ./gradlew :samples:httpsession:tomcatRun
+----
+$ ./gradlew :samples:httpsession:tomcatRun
+----
 
 You should now be able to access the application at http://localhost:8080/
 
@@ -128,8 +130,8 @@ You should now be able to access the application at http://localhost:8080/
 
 Try using the application. Fill out the form with the following information:
 
-* **Attribute Name** *username*
-* **Attribute Value** *rob*
+* **Attribute Name:** _username_
+* **Attribute Value:** _rob_
 
 Now click the **Set Attribute** button. You should now see the values displayed in the table.
 
@@ -140,7 +142,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}httpsession/src/main/java/sample/SessionServlet.java[]
+include::{samples-dir}httpsession/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in Redis.
@@ -149,12 +151,12 @@ Go ahead and view the cookies (click for help with https://developer.chrome.com/
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
-    $ redis-cli keys '*' | xargs redis-cli del
+	$ redis-cli keys '*' | xargs redis-cli del
 
 TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
-    $ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 Now visit the application at http://localhost:8080/ and observe that the attribute we added is no longer displayed.

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

@@ -15,19 +15,19 @@ If you are using Maven, ensure to add the following dependencies:
 [subs="verbatim,attributes"]
 ----
 <dependencies>
-    <!-- ... -->
+	<!-- ... -->
 
-    <dependency>
-      <groupId>org.springframework.session</groupId>
-      <artifactId>spring-session-data-redis</artifactId>
-      <version>{spring-session-version}</version>
-      <type>pom<type>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>{spring-version}</version>
-    </dependency>
+	<dependency>
+		<groupId>org.springframework.session</groupId>
+		<artifactId>spring-session-data-redis</artifactId>
+		<version>{spring-session-version}</version>
+		<type>pom<type>
+	</dependency>
+	<dependency>
+		<groupId>org.springframework</groupId>
+		<artifactId>spring-web</artifactId>
+		<version>{spring-version}</version>
+	</dependency>
 </dependencies>
 ----
 
@@ -40,12 +40,12 @@ Ensure you have the following in your pom.xml:
 ----
 <repositories>
 
-    <!-- ... -->
+	<!-- ... -->
 
-    <repository>
-      <id>spring-snapshot</id>
-      <url>https://repo.spring.io/libs-snapshot</url>
-    </repository>
+	<repository>
+		<id>spring-snapshot</id>
+		<url>https://repo.spring.io/libs-snapshot</url>
+	</repository>
 </repositories>
 ----
 endif::[]
@@ -58,8 +58,8 @@ Ensure you have the following in your pom.xml:
 [source,xml]
 ----
 <repository>
-  <id>spring-milestone</id>
-  <url>https://repo.spring.io/libs-milestone</url>
+	<id>spring-milestone</id>
+	<url>https://repo.spring.io/libs-milestone</url>
 </repository>
 ----
 endif::[]
@@ -75,12 +75,12 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}rest/src/main/java/sample/HttpSessionConfig.java[]
+include::{samples-dir}rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
 ----
 
 <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.
+<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.
 <3> We create a `RedisConnectionFactory` that connects Spring Session to the Redis Server.
@@ -107,7 +107,7 @@ Fortunately, Spring Session provides a utility class named `AbstractHttpSessionA
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}rest/src/main/java/sample/Initializer.java[]
+include::{samples-dir}rest/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -121,7 +121,9 @@ 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:
 
-  $ ./gradlew :samples:rest:tomcatRun
+----
+$ ./gradlew :samples:rest:tomcatRun
+----
 
 You should now be able to access the application at http://localhost:8080/
 
@@ -129,14 +131,14 @@ You should now be able to access the application at http://localhost:8080/
 
 Try using the application. Use your favorite REST client to request http://localhost:8080/
 
-    $ curl -v http://localhost:8080/
+	$ curl -v http://localhost:8080/
 
 Observe that we are prompted for basic authentication. Provide the following information for the username and password:
 
 * **Username** *user*
 * **Password** *password*
 
-   $ curl -v http://localhost:8080/ -u user:password
+$ curl -v http://localhost:8080/ -u user:password
 
 In the output you will notice the following:
 
@@ -156,13 +158,13 @@ Specifically, we notice the following things about our response:
 
 We can now use the *x-auth-token* to make another request without providing the username and password again. For example, the following outputs the the username just as before:
 
-    $ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
 
 The only difference is that the session id is not provided in the response headers because we are reusing an existing session.
 
 If we invalidate the session, then the x-auth-token is displayed in the response with an empty value. For example, the following will invalidate our session:
 
-    $ curl -v http://localhost:8080/logout -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/logout -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
 
 You will see in the output that the x-auth-token provides an empty String indicating that the previous session was invalidated.
 
@@ -170,7 +172,7 @@ You will see in the output that the x-auth-token provides an empty String indica
 HTTP/1.1 204 No Content
 ...
 x-auth-token:
----
+----
 
 === How does it work?
 
@@ -181,7 +183,7 @@ Spring Session creates a header named x-auth-token in your browser that contains
 
 If you like, you can easily see that the session is created in Redis. First create a session using the following:
 
-   $ curl -v http://localhost:8080/ -u user:password
+$ curl -v http://localhost:8080/ -u user:password
 
 In the output you will notice the following:
 
@@ -195,14 +197,14 @@ x-auth-token: 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 Now remove the session using redis-cli. For example, on a Linux based system you can type:
 
-    $ redis-cli keys '*' | xargs redis-cli del
+	$ redis-cli keys '*' | xargs redis-cli del
 
 TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
-    $ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 We can now use the *x-auth-token* to make another request with the session we deleted and observe we are prompted for a authentication. For example, the following returns an HTTP 401:
 
-    $ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"
+	$ curl -v http://localhost:8080/ -H "x-auth-token: 0dc1f6e1-c7f1-41ac-8ce2-32b6b3e57aa3"

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

@@ -16,19 +16,19 @@ If you are using Maven, ensure to add the following dependencies:
 [subs="verbatim,attributes"]
 ----
 <dependencies>
-    <!-- ... -->
+	<!-- ... -->
 
-    <dependency>
-      <groupId>org.springframework.session</groupId>
-      <artifactId>spring-session-data-redis</artifactId>
-      <version>{spring-session-version}</version>
-      <type>pom<type>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>{spring-version}</version>
-    </dependency>
+	<dependency>
+	<groupId>org.springframework.session</groupId>
+	<artifactId>spring-session-data-redis</artifactId>
+	<version>{spring-session-version}</version>
+	<type>pom<type>
+	</dependency>
+	<dependency>
+	<groupId>org.springframework</groupId>
+	<artifactId>spring-web</artifactId>
+	<version>{spring-version}</version>
+	</dependency>
 </dependencies>
 ----
 
@@ -41,12 +41,12 @@ Ensure you have the following in your pom.xml:
 ----
 <repositories>
 
-    <!-- ... -->
+	<!-- ... -->
 
-    <repository>
-      <id>spring-snapshot</id>
-      <url>https://repo.spring.io/libs-snapshot</url>
-    </repository>
+	<repository>
+	<id>spring-snapshot</id>
+	<url>https://repo.spring.io/libs-snapshot</url>
+	</repository>
 </repositories>
 ----
 endif::[]
@@ -59,8 +59,8 @@ Ensure you have the following in your pom.xml:
 [source,xml]
 ----
 <repository>
-  <id>spring-milestone</id>
-  <url>https://repo.spring.io/libs-milestone</url>
+<id>spring-milestone</id>
+<url>https://repo.spring.io/libs-milestone</url>
 </repository>
 ----
 endif::[]
@@ -74,7 +74,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/Config.java[]
+include::{samples-dir}security/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> We import an embedded Redis Server so that there is no need to start up Redis external of our application.
@@ -97,7 +97,7 @@ Since our application is already loading Spring configuration using our `Securit
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/SecurityInitializer.java[]
+include::{samples-dir}security/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -109,7 +109,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}security/src/main/java/sample/Initializer.java[]
+include::{samples-dir}security/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -125,7 +125,9 @@ 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:
 
-  $ ./gradlew :samples:security:tomcatRun
+----
+$ ./gradlew :samples:security:tomcatRun
+----
 
 You should now be able to access the application at http://localhost:8080/
 
@@ -151,12 +153,12 @@ Go ahead and view the cookies (click for help with https://developer.chrome.com/
 
 If you like, you can easily remove the session using redis-cli. For example, on a Linux based system you can type:
 
-    $ redis-cli keys '*' | xargs redis-cli del
+	$ redis-cli keys '*' | xargs redis-cli del
 
 TIP: The Redis documentation has instructions for http://redis.io/topics/quickstart[installing redis-cli].
 
 Alternatively, you can also delete the explicit key. Enter the following into your terminal ensuring to replace `7e8383a4-082c-4ffe-a4bc-c40fd3363c5e` with the value of your SESSION cookie:
 
-    $ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+	$ redis-cli del spring:session:sessions:7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 Now visit the application at http://localhost:8080/ and observe that we are no longer authenticated.

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

@@ -17,7 +17,9 @@ 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:
 
-  $ ./gradlew :samples:users:tomcatRun
+----
+$ ./gradlew :samples:users:tomcatRun
+----
 
 You should now be able to access the application at http://localhost:8080/
 
@@ -71,7 +73,7 @@ Let's take a look at how Spring Session keeps track of multiple sessions.
 Spring Session keeps track of the `HttpSession` by adding a value to a cookie named SESSION.
 For example, the SESSION cookie might have a value of:
 
-    7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
+	7e8383a4-082c-4ffe-a4bc-c40fd3363c5e
 
 === Adding a Session
 
@@ -103,17 +105,17 @@ include::{samples-dir}users/src/main/java/sample/UserAccountsFilter.java[tags=ad
 ----
 
 <1> We have an existing variable named `unauthenticatedAlias`.
-The value is an alias that points to existing unauthenticated session.
+The value is an alias that points to an existing unauthenticated session.
 If no such session exists, the value is null.
 This ensures if we have an existing unauthenticated session that we use it instead of creating a new session.
 <2> If all of our sessions are already associated to a user, we create a new session alias.
-<3> If a there exists a session that is not associated to a user, we use its session alias.
+<3> If there is an existing session that is not associated to a user, we use its session alias.
 <4> Finally, we create the add account URL.
 The URL contains a session alias that either points to an existing unauthenticated session or is an alias that is unused thus signaling to create a new session associated to that alias.
 
 Now our SESSION cookie looks something like this:
 
-    0 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e 1 1d526d4a-c462-45a4-93d9-84a39b6d44ad
+	0 7e8383a4-082c-4ffe-a4bc-c40fd3363c5e 1 1d526d4a-c462-45a4-93d9-84a39b6d44ad
 
 Such that:
 
@@ -150,4 +152,4 @@ will output a link of:
 <a id="navLink" href="/link.jsp?_s=1">Link</a>
 ----
 
-end::how-does-it-work[]
+// end::how-does-it-work[]

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

@@ -32,7 +32,21 @@ For example, the configuration might look something like the following:
 include::{websocketdoc-test-dir}WebSocketConfig.java[tags=class]
 ----
 
-To hook in the Spring Session support, we need to ensure
+We can easily update our configuration to use Spring Session's WebSocket support.
+For example:
+
+.src/main/java/samples/config/WebSocketConfig.java
+[source,java]
+----
+include::{samples-dir}websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
+----
+
+To hook in the Spring Session support we only need to change two things:
+
+<1> Instead of extending `AbstractWebSocketMessageBrokerConfigurer` we extend `AbstractSessionWebSocketMessageBrokerConfigurer`
+<2> We rename the `registerStompEndpoints` method to `configureStompEndpoints`
+
+What does `AbstractSessionWebSocketMessageBrokerConfigurer` do behind the scenes?
 
 * `WebSocketConnectHandlerDecoratorFactory` is added as a `WebSocketHandlerDecoratorFactory` to `WebSocketTransportRegistration`.
 This ensures a custom `SessionConnectEvent` is fired that contains the `WebSocketSession`.
@@ -45,20 +59,6 @@ This ensures that every time an inbound message is received, that the last acces
 This ensures that we have a mapping of all of the Session id to the corresponding WebSocket connections.
 By maintaining this mapping, we can close all the WebSocket connections when a Spring Session (HttpSession) is terminated.
 
-This is quite a bit of work to get things working.
-Fortunately, Spring Session provides a convenience class named `AbstractSessionWebSocketMessageBrokerConfigurer` that hides the complexity of the configuration.
-An example is provided below:
-
-.src/main/java/samples/config/WebSocketConfig.java
-[source,java]
-----
-include::{samples-dir}websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
-----
-
-We only need to change two things to use Spring Session:
-
-<1> Instead of extending `AbstractWebSocketMessageBrokerConfigurer` we extend `AbstractSessionWebSocketMessageBrokerConfigurer`
-<2> We rename the `registerStompEndpoints` method to `configureStompEndpoints`
 
 // end::config[]
 
@@ -82,7 +82,9 @@ include::{samples-dir}websocket/src/main/java/sample/config/WebSecurityConfig.ja
 ----
 ====
 
-  $ ./gradlew :samples:websocket:bootRun
+----
+$ ./gradlew :samples:websocket:bootRun
+----
 
 You should now be able to access the application at http://localhost:8080/
 
@@ -127,4 +129,4 @@ This demonstrates the session is kept alive.
 
 NOTE: Only messages sent from a user keep the session alive.
 This is because only messages coming from a user imply user activity.
-Messages received do not imply activity and thus do not renew the session expiration.
+Messages received do not imply activity and thus do not renew the session expiration.

docs/src/docs/asciidoc/index.adoc

@@ -35,6 +35,10 @@ If you are looking to get started with Spring Session, the best place to start i
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store.
 | link:guides/httpsession.html[HttpSession Guide]
 
+| {gh-samples-url}httpsession-xml[HttpSession XML]
+| Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store using XML based configuration.
+| link:guides/httpsession-xml.html[HttpSession XML Guide]
+
 | {gh-samples-url}boot[Spring Boot]
 | Demonstrates how to use Spring Session with Spring Boot.
 | link:guides/boot.html[Spring Boot Guide]
@@ -81,11 +85,30 @@ We have already mentioned that Spring Session provides transparent integration w
 === HttpSession with Redis
 
 Using Spring Session with `HttpSession` is enabled by adding a Servlet Filter before anything that uses the `HttpSession`.
+You can choose from enabling this using either:
 
-NOTE: The <<samples, HttpSession Sample>> provides a working sample on how to integrate Spring Session and `HttpSession`.
-You can the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession Guide when integrating with your own application.
+* <<httpsession-redis-jc,Java Based Configuration>>
+* <<httpsession-redis-xml,XML Based Configuration>>
 
-include::guides/httpsession.adoc[tags=config,leveloffset=+2]
+[[httpsession-redis-jc]]
+==== Redis Java Based Configuration
+
+This section describes how to use Redis to back `HttpSession` using Java based configuration.
+
+NOTE: The <<samples, HttpSession Sample>> provides a working sample on how to integrate Spring Session and `HttpSession` using XML configuration.
+You can read the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession Guide when integrating with your own application.
+
+include::guides/httpsession.adoc[tags=config,leveloffset=+3]
+
+[[httpsession-redis-xml]]
+==== Redis XML Based Configuration
+
+This section describes how to use Redis to back `HttpSession` using XML based configuration.
+
+NOTE: The <<samples, HttpSession XML Sample>> provides a working sample on how to integrate Spring Session and `HttpSession` using XML configuration.
+You can read the basic steps for integration below, but you are encouraged to follow along with the detailed HttpSession XML Guide when integrating with your own application.
+
+include::guides/httpsession-xml.adoc[tags=config,leveloffset=+3]
 
 [[httpsession-how]]
 === How HttpSession Integration Works
@@ -102,19 +125,19 @@ It looks something like the following:
 ----
 public class SessionRepositoryRequestWrapper extends HttpServletRequestWrapper {
 
-    public SessionRepositoryRequestWrapper(HttpServletRequest original) {
-        super(original);
-    }
+	public SessionRepositoryRequestWrapper(HttpServletRequest original) {
+		super(original);
+	}
 
-    public HttpSession getSession() {
-        return getSession(true);
-    }
+	public HttpSession getSession() {
+		return getSession(true);
+	}
 
-    public HttpSession getSession(boolean createNew) {
-        // create an HttpSession implementation from Spring Session
-    }
+	public HttpSession getSession(boolean createNew) {
+		// create an HttpSession implementation from Spring Session
+	}
 
-    // ... other methods delegate to the original HttpServletRequest ...
+	// ... other methods delegate to the original HttpServletRequest ...
 }
 ----
 
@@ -128,15 +151,15 @@ The pseudocode can be found below:
 ----
 public class SessionRepositoryFilter implements Filter {
 
-    public doFilter(ServletRequest request, ServletResponse response, FilterChain chain) {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        SessionRepositoryRequestWrapper customRequest =
-              new SessionRepositoryRequestWrapper(httpRequest);
+	public doFilter(ServletRequest request, ServletResponse response, FilterChain chain) {
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		SessionRepositoryRequestWrapper customRequest =
+			new SessionRepositoryRequestWrapper(httpRequest);
 
-        chain.doFilter(customRequest, response, chain);
-    }
+		chain.doFilter(customRequest, response, chain);
+	}
 
-    // ...
+	// ...
 }
 ----
 
@@ -150,18 +173,18 @@ Spring Session has the ability to support multiple sessions in a single browser
 This provides the ability to support authenticating with multiple users in the same browser instance (i.e. Google Accounts).
 
 NOTE: The <<samples,Manage Multiple Users Guide>> provides a complete working example of managing multiple users in the same browser instance.
-You can the basic steps for integration below, but you are encouraged to follow along with the detailed Manage Multiple Users Guide when integrating with your own application.
+You can follow the basic steps for integration below, but you are encouraged to follow along with the detailed Manage Multiple Users Guide when integrating with your own application.
 
 include::guides/users.adoc[tags=how-does-it-work,leveloffset=+1]
 
 [[httpsession-rest]]
 === HttpSession & RESTful APIs
 
-Spring Session has can work with RESTful APIs by allowing the session to be provided in a header.
+Spring Session can work with RESTful APIs by allowing the session to be provided in a header.
 
 
 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 the basic steps for integration below, but you are encouraged to follow along with the detailed REST Guide when integrating with your own application.
+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=+1]
 
@@ -190,7 +213,7 @@ This means that if we are actively chatting in our application and are not using
 === WebSocket Usage
 
 The <<samples, WebSocket Sample>> provides a working sample on how to integrate Spring Session with WebSockets.
-You can the basic steps for integration below, but you are encouraged to follow along with the detailed WebSocket Guide when integrating with your own application:
+You can follow the basic steps for integration below, but you are encouraged to follow along with the detailed WebSocket Guide when integrating with your own application:
 
 [[websocket-httpsession]]
 ==== HttpSession Integration
@@ -282,9 +305,9 @@ 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:<session-id> creationTime 1404360000000 \
-          maxInactiveInterval 1800 lastAccessedTime 1404360000000 \
-          sessionAttr:<attrName> someAttrValue sessionAttr:<attrName2> someAttrValue2
+	HMSET spring:session:sessions:<session-id> creationTime 1404360000000 \
+		maxInactiveInterval 1800 lastAccessedTime 1404360000000 \
+		sessionAttr:<attrName> someAttrValue sessionAttr:<attrName2> someAttrValue2
 
 [[api-redisoperationssessionrepository-expiration]]
 ===== Session Expiration
@@ -292,7 +315,7 @@ An example of how each session is stored can be seen below.
 An expiration is associated to each session using the EXPIRE command based upon the RedisOperationsSessionRepository.RedisSession.getMaxInactiveInterval().
 For example:
 
-    EXPIRE spring:session:sessions:<session-id> 1800
+	EXPIRE spring:session:sessions:<session-id> 1800
 
 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.
@@ -309,8 +332,8 @@ 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:<expire-rounded-up-to-nearest-minute> <session-id>
-   EXPIRE spring:session:expirations:<expire-rounded-up-to-nearest-minute> 1800
+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.
@@ -327,8 +350,8 @@ This means if an attribute is written once and read many times we only need to w
 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
+HMSET spring:session:sessions:<session-id> sessionAttr:<attrName2> newValue
+EXPIRE spring:session:sessions:<session-id> 1800
 
 [[api-redisoperationssessionrepository-sessiondestroyedevent]]
 ==== SessionDestroyedEvent
@@ -341,13 +364,30 @@ Firing a `SessionDestroyedEvent` is made available through the `SessionMessageLi
 In order for this to work, Redis Keyspace events for Generic commands and Expired events needs to be enabled.
 For example:
 
-TIP: If you are using `@EnableRedisHttpSession` the `SessionMessageListener` and enabling the necessary Redis Keyspace events is done automatically.
-
 [source,bash]
 ----
 redis-cli config set notify-keyspace-events Egx
 ----
 
+If you are using `@EnableRedisHttpSession` the `SessionMessageListener` and enabling the necessary Redis Keyspace events is done automatically.
+However, in a secured Redis enviornment the config command is disabled.
+This means that Spring Session cannot configure Redis Keyspace events for you.
+To disable the automatic configuration add `ConfigureRedisAction.NO_OP` as a bean.
+
+For example, Java Configuration can use the following:
+
+[source,java,indent=0]
+----
+include::{docs-test-dir}docs/RedisHttpSessionConfigurationNoOpConfigureRedisActionTests.java[tags=configure-redis-action]
+----
+
+XML Configuraiton can use the following:
+
+[source,xml,indent=0]
+----
+include::{docs-test-resources-dir}docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests-context.xml[tags=configure-redis-action]
+----
+
 [[api-redisoperationssessionrepository-cli]]
 ==== Viewing the Session in Redis
 
@@ -401,7 +441,7 @@ include::{indexdoc-tests}[tags=new-mapsessionrepository]
 The <<samples,Hazelcast Sample>> is a complete application demonstrating using Spring Session with Hazelcast.
 To run it use the following:
 
-    ./gradlew :samples:hazelcast:tomcatRun
+	./gradlew :samples:hazelcast:tomcatRun
 
 [[community]]
 == Spring Session Community

docs/src/test/java/docs/HttpSessionConfigurationNoOpConfigureRedisActionXmlTests.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 docs;
+
+import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+/**
+ * @author Rob Winch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+public class HttpSessionConfigurationNoOpConfigureRedisActionXmlTests {
+	@Autowired
+	SessionRepositoryFilter<? extends ExpiringSession> filter;
+
+	@Test
+	public void redisConnectionFactoryNotUsedSinceNoValidation() {
+		assertThat(filter).isNotNull();
+	}
+
+
+	static RedisConnectionFactory connectionFactory() {
+		return mock(RedisConnectionFactory.class);
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -26,85 +26,85 @@ import static org.fest.assertions.Assertions.assertThat;
  * @author Rob Winch
  */
 public class IndexDocTests {
-    static final String ATTR_USER = "user";
+	static final String ATTR_USER = "user";
 
-    @Test
-    public void repositoryDemo() {
-        ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
-        demo.repository = new MapSessionRepository();
+	@Test
+	public void repositoryDemo() {
+		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
+		demo.repository = new MapSessionRepository();
 
-        demo.demo();
-    }
+		demo.demo();
+	}
 
-    // tag::repository-demo[]
-    public class RepositoryDemo<S extends Session> {
-        private SessionRepository<S> repository; // <1>
+	// tag::repository-demo[]
+	public class RepositoryDemo<S extends Session> {
+		private SessionRepository<S> repository; // <1>
 
-        public void demo() {
-            S toSave = repository.createSession(); // <2>
+		public void demo() {
+			S toSave = repository.createSession(); // <2>
 
-            // <3>
-            User rwinch = new User("rwinch");
-            toSave.setAttribute(ATTR_USER, rwinch);
+			// <3>
+			User rwinch = new User("rwinch");
+			toSave.setAttribute(ATTR_USER, rwinch);
 
-            repository.save(toSave); // <4>
+			repository.save(toSave); // <4>
 
-            S session = repository.getSession(toSave.getId()); // <5>
+			S session = repository.getSession(toSave.getId()); // <5>
 
-            // <6>
-            User user = session.getAttribute(ATTR_USER);
-            assertThat(user).isEqualTo(rwinch);
-        }
+			// <6>
+			User user = session.getAttribute(ATTR_USER);
+			assertThat(user).isEqualTo(rwinch);
+		}
 
-        // ... setter methods ...
-    }
-    // end::repository-demo[]
+		// ... setter methods ...
+	}
+	// end::repository-demo[]
 
 
-    @Test
-    public void expireRepositoryDemo() {
-        ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
-        demo.repository = new MapSessionRepository();
+	@Test
+	public void expireRepositoryDemo() {
+		ExpiringRepositoryDemo<ExpiringSession> demo = new ExpiringRepositoryDemo<ExpiringSession>();
+		demo.repository = new MapSessionRepository();
 
-        demo.demo();
-    }
+		demo.demo();
+	}
 
-    // tag::expire-repository-demo[]
-    public class ExpiringRepositoryDemo<S extends ExpiringSession> {
-        private SessionRepository<S> repository; // <1>
+	// tag::expire-repository-demo[]
+	public class ExpiringRepositoryDemo<S extends ExpiringSession> {
+		private SessionRepository<S> repository; // <1>
 
-        public void demo() {
-            S toSave = repository.createSession(); // <2>
-            // ...
-            toSave.setMaxInactiveIntervalInSeconds(30); // <3>
+		public void demo() {
+			S toSave = repository.createSession(); // <2>
+			// ...
+			toSave.setMaxInactiveIntervalInSeconds(30); // <3>
 
-            repository.save(toSave); // <4>
+			repository.save(toSave); // <4>
 
-            S session = repository.getSession(toSave.getId()); // <5>
-            // ...
-        }
+			S session = repository.getSession(toSave.getId()); // <5>
+			// ...
+		}
 
-        // ... setter methods ...
-    }
-    // end::expire-repository-demo[]
+		// ... setter methods ...
+	}
+	// end::expire-repository-demo[]
 
-    @Test
-    public void newRedisOperationsSessionRepository() {
-        // tag::new-redisoperationssessionrepository[]
-        JedisConnectionFactory factory = new JedisConnectionFactory();
-        SessionRepository<? extends ExpiringSession> repository =
-                new RedisOperationsSessionRepository(factory);
-        // end::new-redisoperationssessionrepository[]
-    }
+	@Test
+	public void newRedisOperationsSessionRepository() {
+		// tag::new-redisoperationssessionrepository[]
+		JedisConnectionFactory factory = new JedisConnectionFactory();
+		SessionRepository<? extends ExpiringSession> repository =
+				new RedisOperationsSessionRepository(factory);
+		// end::new-redisoperationssessionrepository[]
+	}
 
-    @Test
-    public void mapRepository() {
-        // tag::new-mapsessionrepository[]
-        SessionRepository<? extends ExpiringSession> repository = new MapSessionRepository();
-        // end::new-mapsessionrepository[]
-    }
+	@Test
+	public void mapRepository() {
+		// tag::new-mapsessionrepository[]
+		SessionRepository<? extends ExpiringSession> repository = new MapSessionRepository();
+		// end::new-mapsessionrepository[]
+	}
 
-    private static class User {
-        private User(String username) {}
-    }
+	private static class User {
+		private User(String username) {}
+	}
 }

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

@@ -0,0 +1,58 @@
+/*
+ * 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 static org.mockito.Mockito.mock;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.session.data.redis.config.ConfigureRedisAction;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+
+/**
+ * @author Rob Winch
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+@WebAppConfiguration
+public class RedisHttpSessionConfigurationNoOpConfigureRedisActionTests {
+
+	@Test
+	public void redisConnectionFactoryNotUsedSinceNoValidation() {}
+
+	@EnableRedisHttpSession
+	@Configuration
+	static class Config {
+
+		// tag::configure-redis-action[]
+		@Bean
+		public static ConfigureRedisAction configureRedisAction() {
+			return ConfigureRedisAction.NO_OP;
+		}
+		// end::configure-redis-action[]
+
+		@Bean
+		public RedisConnectionFactory redisConnectionFactory() {
+			return mock(RedisConnectionFactory.class);
+		}
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -30,17 +30,17 @@ import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
 @EnableScheduling
 @EnableWebSocketMessageBroker
 public class WebSocketConfig
-        extends AbstractWebSocketMessageBrokerConfigurer {
+		extends AbstractWebSocketMessageBrokerConfigurer {
 
-    public void registerStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/messages")
-                .withSockJS();
-    }
+	public void registerStompEndpoints(StompEndpointRegistry registry) {
+		registry.addEndpoint("/messages")
+				.withSockJS();
+	}
 
-    @Override
-    public void configureMessageBroker(MessageBrokerRegistry registry) {
-        registry.enableSimpleBroker("/queue/", "/topic/");
-        registry.setApplicationDestinationPrefixes("/app");
-    }
+	@Override
+	public void configureMessageBroker(MessageBrokerRegistry registry) {
+		registry.enableSimpleBroker("/queue/", "/topic/");
+		registry.setApplicationDestinationPrefixes("/app");
+	}
 }
 // end::class[]

docs/src/test/java/docs/websocket/WebSocketDocTests.java

@@ -1,30 +0,0 @@
-/*
- * Copyright 2002-2014 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.websocket;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.messaging.simp.config.MessageBrokerRegistry;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.socket.config.annotation.AbstractWebSocketMessageBrokerConfigurer;
-import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
-import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
-
-/**
- * @author Rob Winch
- */
-public class WebSocketDocTests {
-
-}

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

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns: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">
+
+	<context:annotation-config/>
+
+	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
+
+	<!-- tag::configure-redis-action[] -->
+	<util:constant
+		static-field="org.springframework.session.data.redis.config.ConfigureRedisAction.NO_OP"/>
+	<!-- end::configure-redis-action[] -->
+
+	<bean class="docs.HttpSessionConfigurationNoOpConfigureRedisActionXmlTests"
+		factory-method="connectionFactory"/>
+</beans>

gradle.properties

@@ -1,14 +1,16 @@
-springSecurityVersion=4.0.0.RC1
-embeddedRedisVersion=0.2
+springSecurityVersion=4.0.0.RELEASE
+embeddedRedisVersion=0.6
+junitVersion=4.11
 jstlVersion=1.2.1
-jedisVersion=2.4.1
-springVersion=4.1.3.RELEASE
-groovyVersion=2.3.8
-version=1.0.0.RELEASE
+jedisVersion=2.5.2
+springVersion=4.1.6.RELEASE
+groovyVersion=2.3.11
+version=1.0.1.RELEASE
 seleniumVersion=2.44.0
-jacksonVersion=2.4.4
+jacksonVersion=2.4.5
 gebVersion=0.10.0
 servletApiVersion=3.0.1
 spockVersion=0.7-groovy-2.0
 commonsPoolVersion=2.2
-springDataRedisVersion=1.3.0.RELEASE
+springDataRedisVersion=1.4.2.RELEASE
+hazelcastVersion=3.3.3

gradle/java.gradle

@@ -11,76 +11,75 @@ group = 'org.springframework.session'
 sourceCompatibility = 1.5
 targetCompatibility = 1.5
 
-ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : '1.1.0.BUILD-SNAPSHOT'
+ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'latest.integration'
 
 ext.spockDependencies = [
-        dependencies.create("org.spockframework:spock-core:$spockVersion") {
-            exclude group: 'junit', module: 'junit-dep'
-        }
+		dependencies.create("org.spockframework:spock-core:$spockVersion") {
+			exclude group: 'junit', module: 'junit-dep'
+		}
 ]
 
 ext.gebDependencies = spockDependencies + [
-        "org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
-        "org.gebish:geb-spock:$gebVersion",
-        'commons-httpclient:commons-httpclient:3.1',
-        "org.codehaus.groovy:groovy:$groovyVersion"
+		"org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion",
+		"org.gebish:geb-spock:$gebVersion",
+		'commons-httpclient:commons-httpclient:3.1',
+		"org.codehaus.groovy:groovy:$groovyVersion"
 ]
 
 ext.jstlDependencies = [
-        "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
-        "org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
+		"javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:$jstlVersion",
+		"org.apache.taglibs:taglibs-standard-jstlel:1.2.1"
 ]
 
 repositories {
-    mavenCentral()
-    maven { url 'http://clojars.org/repo' }
-    maven { url 'https://repo.spring.io/libs-snapshot' }
+	mavenCentral()
+	maven { url 'https://repo.spring.io/libs-snapshot' }
 }
 
 configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            if (details.requested.group == 'org.springframework') {
-                details.useVersion springVersion
-            }
-    }
+	resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+			if (details.requested.group == 'org.springframework') {
+				details.useVersion springVersion
+			}
+	}
 }
 // Integration test setup
 configurations {
-    integrationTestCompile {
-        extendsFrom testCompile, optional, provided
-    }
-    integrationTestRuntime {
-        extendsFrom integrationTestCompile, testRuntime
-    }
+	integrationTestCompile {
+		extendsFrom testCompile, optional, provided
+	}
+	integrationTestRuntime {
+		extendsFrom integrationTestCompile, testRuntime
+	}
 }
 
 sourceSets {
-    integrationTest {
-        java.srcDir file('src/integration-test/java')
-        groovy.srcDirs file('src/integration-test/groovy')
-        resources.srcDir file('src/integration-test/resources')
-        compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile
-        runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime
-    }
+	integrationTest {
+		java.srcDir file('src/integration-test/java')
+		groovy.srcDirs file('src/integration-test/groovy')
+		resources.srcDir file('src/integration-test/resources')
+		compileClasspath = sourceSets.main.output + sourceSets.test.output + configurations.integrationTestCompile
+		runtimeClasspath = output + compileClasspath + configurations.integrationTestRuntime
+	}
 }
 
 task integrationTest(type: Test, dependsOn: jar) {
-    testClassesDir = sourceSets.integrationTest.output.classesDir
-    logging.captureStandardOutput(LogLevel.INFO)
-    classpath = sourceSets.integrationTest.runtimeClasspath
-    maxParallelForks = 1
-    reports {
-        html.destination = project.file("$project.buildDir/reports/integration-tests/")
-        junitXml.destination = project.file("$project.buildDir/integration-test-results/")
-    }
+	testClassesDir = sourceSets.integrationTest.output.classesDir
+	logging.captureStandardOutput(LogLevel.INFO)
+	classpath = sourceSets.integrationTest.runtimeClasspath
+	maxParallelForks = 1
+	reports {
+		html.destination = project.file("$project.buildDir/reports/integration-tests/")
+		junitXml.destination = project.file("$project.buildDir/integration-test-results/")
+	}
 }
 
 eclipse {
-    classpath {
-        plusConfigurations += [ configurations.integrationTestCompile ]
-    }
+	classpath {
+		plusConfigurations += [ configurations.integrationTestCompile ]
+	}
 }
 
 project.idea.module {
-    scopes.TEST.plus += [project.configurations.integrationTestRuntime]
+	scopes.TEST.plus += [project.configurations.integrationTestRuntime]
 }

gradle/publish-maven.gradle

@@ -1,51 +1,51 @@
 apply plugin: 'propdeps-maven'
 
 install {
-    repositories.mavenInstaller {
-        customizePom(pom, project)
-    }
+	repositories.mavenInstaller {
+		customizePom(pom, project)
+	}
 }
 
 def customizePom(pom, gradleProject) {
-    pom.whenConfigured { generatedPom ->
+	pom.whenConfigured { generatedPom ->
 
-        // sort to make pom dependencies order consistent to ease comparison of older poms
-        generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
-            "$dep.scope:$dep.groupId:$dep.artifactId"
-        }
+		// sort to make pom dependencies order consistent to ease comparison of older poms
+		generatedPom.dependencies = generatedPom.dependencies.sort { dep ->
+			"$dep.scope:$dep.groupId:$dep.artifactId"
+		}
 
-        // add all items necessary for maven central publication
-        generatedPom.project {
-            name = gradleProject.description
-            description = gradleProject.description
-            url = "https://github.com/spring-projects/spring-session"
-            organization {
-                name = "Spring IO"
-                url = "http://projects.spring.io/spring-session"
-            }
-            licenses {
-                license {
-                    name "The Apache Software License, Version 2.0"
-                    url "http://www.apache.org/licenses/LICENSE-2.0.txt"
-                    distribution "repo"
-                }
-            }
-            scm {
-                url = "https://github.com/spring-projects/spring-session"
-                connection = "scm:git:git://github.com/spring-projects/spring-session"
-                developerConnection = "scm:git:git://github.com/spring-projects/spring-session"
-            }
-            developers {
-                developer {
-                    id = "rwinch"
-                    name = "Rob Winch"
-                    email = "rwinch@pivotal.io"
-                }
-            }
-            issueManagement {
-                system = "GitHub"
-                url = "https://github.com/spring-projects/spring-session/issues"
-            }
-        }
-    }
+		// add all items necessary for maven central publication
+		generatedPom.project {
+			name = gradleProject.description
+			description = gradleProject.description
+			url = "https://github.com/spring-projects/spring-session"
+			organization {
+				name = "Spring IO"
+				url = "http://projects.spring.io/spring-session"
+			}
+			licenses {
+				license {
+					name "The Apache Software License, Version 2.0"
+					url "http://www.apache.org/licenses/LICENSE-2.0.txt"
+					distribution "repo"
+				}
+			}
+			scm {
+				url = "https://github.com/spring-projects/spring-session"
+				connection = "scm:git:git://github.com/spring-projects/spring-session"
+				developerConnection = "scm:git:git://github.com/spring-projects/spring-session"
+			}
+			developers {
+				developer {
+					id = "rwinch"
+					name = "Rob Winch"
+					email = "rwinch@pivotal.io"
+				}
+			}
+			issueManagement {
+				system = "GitHub"
+				url = "https://github.com/spring-projects/spring-session/issues"
+			}
+		}
+	}
 }

gradle/tomcat.gradle

@@ -1,71 +1,62 @@
 buildscript {
-    repositories {
-        maven { url "https://repo.spring.io/plugins-release" }
-    }
-    dependencies {
-        classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
-    }
+	repositories {
+		maven { url "https://repo.spring.io/plugins-release" }
+	}
+	dependencies {
+		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.3")
+	}
 }
 
 apply plugin: 'war'
 apply plugin: 'tomcat'
 
-dependencies {
-    def tomcatVersion = '7.0.54'
-    tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-            "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
-    tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {
-        exclude group: 'org.eclipse.jdt.core.compiler', module: 'ecj'
-    }
-}
-
 [tomcatRun,tomcatRunWar]*.contextPath = '/'
 
 
 task integrationTomcatRun(type: org.gradle.api.plugins.tomcat.tasks.TomcatRun) {
-    onlyIf { !sourceSets.integrationTest.allSource.empty }
-    buildscriptClasspath = tomcatRun.buildscriptClasspath
-    contextPath = tomcatRun.contextPath
-    daemon = true
-    tomcatClasspath = tomcatRun.tomcatClasspath
-    webAppClasspath = tomcatRun.webAppClasspath
-    webAppSourceDirectory = tomcatRun.webAppSourceDirectory
-    doFirst {
-        def mainOutputDir = project.sourceSets.main.output.classesDir
-        if(mainOutputDir) {
-            classesDirectory = mainOutputDir
-        }
-        // delay reserving ports to ensure they are still available
-        def ports = reservePorts(3)
-        httpPort = ports[0]
-        ajpPort = ports[1]
-        stopPort = ports[2]
-    }
+	onlyIf { !sourceSets.integrationTest.allSource.empty }
+	buildscriptClasspath = tomcatRun.buildscriptClasspath
+	contextPath = tomcatRun.contextPath
+	daemon = true
+	tomcatClasspath = tomcatRun.tomcatClasspath
+	webAppClasspath = tomcatRun.webAppClasspath
+	webAppSourceDirectory = tomcatRun.webAppSourceDirectory
+	doFirst {
+		def mainOutputDir = project.sourceSets.main.output.classesDir
+		if(mainOutputDir) {
+			classesDirectory = mainOutputDir
+		}
+		// delay reserving ports to ensure they are still available
+		def ports = reservePorts(3)
+		httpPort = ports[0]
+		ajpPort = ports[1]
+		stopPort = ports[2]
+	}
 }
 
 task integrationTomcatStop(type: org.gradle.api.plugins.tomcat.tasks.TomcatStop) {
-    onlyIf { !sourceSets.integrationTest.allSource.empty }
-    doFirst {
-        stopPort = integrationTomcatRun.stopPort
-    }
+	onlyIf { !sourceSets.integrationTest.allSource.empty }
+	doFirst {
+		stopPort = integrationTomcatRun.stopPort
+	}
 }
 
 integrationTest {
-    dependsOn integrationTomcatRun
-    doFirst {
-        def host = 'localhost:' + integrationTomcatRun.httpPort
-        systemProperties['geb.build.baseUrl'] = 'http://'+host+'/' + integrationTomcatRun.contextPath
-        systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
-    }
-    finalizedBy integrationTomcatStop
+	dependsOn integrationTomcatRun
+	doFirst {
+		def host = 'localhost:' + integrationTomcatRun.httpPort
+		systemProperties['geb.build.baseUrl'] = 'http://'+host+'/' + integrationTomcatRun.contextPath
+		systemProperties['geb.build.reportsDir'] = 'build/geb-reports'
+	}
+	finalizedBy integrationTomcatStop
 }
 
 def reservePorts(int count) {
-    def sockets = []
-    for(int i in 1..count) {
-        sockets << new ServerSocket(0)
-    }
-    def result = sockets*.localPort
-    sockets*.close()
-    result
+	def sockets = []
+	for(int i in 1..count) {
+		sockets << new ServerSocket(0)
+	}
+	def result = sockets*.localPort
+	sockets*.close()
+	result
 }

gradle/tomcat6.gradle

@@ -0,0 +1,8 @@
+apply from: TOMCAT_GRADLE
+
+dependencies {
+	def tomcatVersion = '6.0.43'
+	tomcat "org.apache.tomcat:catalina:${tomcatVersion}",
+			"org.apache.tomcat:coyote:${tomcatVersion}",
+			"org.apache.tomcat:jasper:${tomcatVersion}"
+}

gradle/tomcat7.gradle

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

gradlew

@@ -7,7 +7,7 @@
 ##############################################################################
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

gradlew.bat

@@ -9,7 +9,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS=-Xmx1024M -XX:MaxPermSize=512M
 
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.

samples/boot/build.gradle

@@ -1,10 +1,10 @@
 buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-    }
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
+	}
 }
 
 apply plugin: 'spring-boot'
@@ -16,36 +16,37 @@ tasks.findByPath("artifactoryPublish")?.enabled = false
 group = 'samples'
 
 dependencies {
-    compile project(':spring-session-data-redis'),
-            "org.springframework.boot:spring-boot-starter-web",
-            "org.springframework.boot:spring-boot-starter-thymeleaf",
-            "redis.embedded:embedded-redis:0.2",
-            "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-            "org.springframework.security:spring-security-web:$springSecurityVersion",
-            "org.springframework.security:spring-security-config:$springSecurityVersion"
+	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",
+			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
+			"org.springframework.security:spring-security-web:$springSecurityVersion",
+			"org.springframework.security:spring-security-config:$springSecurityVersion"
 
-    testCompile "org.springframework.boot:spring-boot-starter-test"
+	testCompile "org.springframework.boot:spring-boot-starter-test"
 
-    integrationTestCompile gebDependencies,
-            "org.spockframework:spock-spring:$spockVersion"
+	integrationTestCompile gebDependencies,
+			"org.spockframework:spock-spring:$spockVersion"
 
 }
 
 integrationTest {
-    doFirst {
-        def port = reservePort()
+	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
-    }
+		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
+	}
 }
 
 def reservePort() {
-    def socket = new ServerSocket(0)
-    def result = socket.localPort
-    socket.close()
-    result
+	def socket = new ServerSocket(0)
+	def result = socket.localPort
+	socket.close()
+	result
 }

samples/boot/src/integration-test/groovy/sample/BootTests.groovy

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -23,37 +38,37 @@ import pages.*
 @IntegrationTest
 class BootTests 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 '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 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 '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
-    }
+	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
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -8,10 +23,10 @@ import geb.*
  * @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() }
-    }
+	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() }
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -8,15 +23,15 @@ import geb.*
  * @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)
-        }
-    }
+	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)
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
 @EnableAutoConfiguration
 public class Application {
 
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}
 }

samples/boot/src/main/java/sample/config/EmbeddedRedisConfiguration.java

@@ -1,70 +0,0 @@
-package sample.config;
-/*
- * Copyright 2002-2014 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.
- */
-
-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 redis.clients.jedis.Protocol;
-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
-public class EmbeddedRedisConfiguration {
-
-    @Bean
-    public static RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
-
-    /**
-     * 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.
-     */
-    static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-        private RedisServer redisServer;
-
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-            redisServer.start();
-        }
-
-        public void destroy() throws Exception {
-            if(redisServer != null) {
-                redisServer.stop();
-            }
-        }
-
-        @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-        @Override
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-    }
-}

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

@@ -1,16 +1,26 @@
+/*
+ * 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.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.data.redis.config.annotation.web.http.*;
+import org.springframework.session.redis.embedded.EnableEmbeddedRedis;
 
-@Configuration
+
+@EnableEmbeddedRedis
+// tag::class[]
 @EnableRedisHttpSession // <1>
-public class HttpSessionConfig {
-
-    @Bean
-    public JedisConnectionFactory connectionFactory() {
-        return new JedisConnectionFactory(); // <2>
-    }
-}
+public class HttpSessionConfig { }
+// end::class[]

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -26,10 +26,10 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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
@@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @Controller
 public class IndexController {
-    @RequestMapping("/")
-    public String index() {
-        return "index";
-    }
+	@RequestMapping("/")
+	public String index() {
+		return "index";
+	}
 }

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

@@ -1,11 +1,11 @@
 <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>
-    </div>
-  </body>
+<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>
+	</div>
+</body>
 </html>

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

@@ -1,122 +1,122 @@
 <!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
-      -------------------------------------------------- */
+			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. */
-      }
+			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;
-      }
+			/* 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;
-      }
+			/* 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;
-        }
-      }
+			/* 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. */
+			/* 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>
+			.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>
+		<!-- 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>
+	<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>
+		 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>
+			</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="push"><!--  --></div>
+		</div>
 
-    <div id="footer">
-      <div class="container">
-        <p class="muted credit">Visit the <a href="http://spring.io/spring-security">Spring Security</a> site for more <a href="https://github.com/spring-projects/spring-security/blob/master/samples/">samples</a>.</p>
-      </div>
-    </div>
-  </body>
+		<div id="footer">
+			<div class="container">
+				<p class="muted credit">Visit the <a href="http://spring.io/spring-security">Spring Security</a> site for more <a href="https://github.com/spring-projects/spring-security/blob/master/samples/">samples</a>.</p>
+			</div>
+		</div>
+	</body>
 </html>

samples/hazelcast/build.gradle

@@ -1,19 +1,19 @@
 apply from: JAVA_GRADLE
-apply from: TOMCAT_GRADLE
+apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 sonarRunner {
-    skipProject = true
+	skipProject = true
 }
 
 dependencies {
-    compile project(':spring-session'),
-            "com.hazelcast:hazelcast-client:3.3.3",
-            jstlDependencies
+	compile project(':spring-session'),
+			"com.hazelcast:hazelcast-client:$hazelcastVersion",
+			jstlDependencies
 
-    providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
-    testCompile 'junit:junit:4.11'
+	testCompile "junit:junit:$junitVersion"
 
-    integrationTestCompile gebDependencies
+	integrationTestCompile gebDependencies
 }

samples/hazelcast/src/integration-test/groovy/sample/AttributeTests.groovy

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -12,19 +27,19 @@ import pages.*
  */
 @Stepwise
 class AttributeTests extends GebReportingSpec {
-    def 'first visit no attributes'() {
-        when:
-        to HomePage
-        then:
-        attributes.empty
-    }
+	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'
-    }
+	def 'create attribute'() {
+		when:
+		createAttribute('a','b')
+		then:
+		attributes.size() == 1
+		attributes[0].name == 'a'
+		attributes[0].value == 'b'
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -8,23 +23,23 @@ import geb.*
  * @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() }
-    }
+	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() }
-    }
+	static content = {
+		cell { $("td", it) }
+		name { cell(0).text() }
+		value { cell(1).text() }
+	}
 }

samples/hazelcast/src/main/java/sample/Initializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -40,51 +40,51 @@ import java.util.Map;
 
 @WebListener
 public class Initializer implements ServletContextListener {
-    private HazelcastInstance instance;
+	private HazelcastInstance instance;
 
-    public void contextInitialized(ServletContextEvent sce) {
-        String sessionMapName = "spring:session:sessions";
-        ServletContext sc = sce.getServletContext();
+	public void contextInitialized(ServletContextEvent sce) {
+		String sessionMapName = "spring:session:sessions";
+		ServletContext sc = sce.getServletContext();
 
-        Config cfg = new Config();
-        NetworkConfig netConfig = new NetworkConfig();
-        netConfig.setPort(getAvailablePort());
-        cfg.setNetworkConfig(netConfig);
-        SerializerConfig serializer = new SerializerConfig()
-            .setTypeClass(Object.class)
-            .setImplementation(new ObjectStreamSerializer());
-        cfg.getSerializationConfig().addSerializerConfig(serializer);
-        MapConfig mc = new MapConfig();
-        mc.setName(sessionMapName);
-        mc.setTimeToLiveSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS);
-        cfg.addMapConfig(mc);
+		Config cfg = new Config();
+		NetworkConfig netConfig = new NetworkConfig();
+		netConfig.setPort(getAvailablePort());
+		cfg.setNetworkConfig(netConfig);
+		SerializerConfig serializer = new SerializerConfig()
+			.setTypeClass(Object.class)
+			.setImplementation(new ObjectStreamSerializer());
+		cfg.getSerializationConfig().addSerializerConfig(serializer);
+		MapConfig mc = new MapConfig();
+		mc.setName(sessionMapName);
+		mc.setTimeToLiveSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS);
+		cfg.addMapConfig(mc);
 
-        instance = Hazelcast.newHazelcastInstance(cfg);
-        Map<String,ExpiringSession> sessions = instance.getMap(sessionMapName);
+		instance = Hazelcast.newHazelcastInstance(cfg);
+		Map<String,ExpiringSession> sessions = instance.getMap(sessionMapName);
 
-        SessionRepository<ExpiringSession> sessionRepository =
-                new MapSessionRepository(sessions);
-        SessionRepositoryFilter<ExpiringSession> filter =
-                new SessionRepositoryFilter<ExpiringSession>(sessionRepository);
-        Dynamic fr = sc.addFilter("springSessionFilter", filter);
-        fr.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
-    }
+		SessionRepository<ExpiringSession> sessionRepository =
+				new MapSessionRepository(sessions);
+		SessionRepositoryFilter<ExpiringSession> filter =
+				new SessionRepositoryFilter<ExpiringSession>(sessionRepository);
+		Dynamic fr = sc.addFilter("springSessionFilter", filter);
+		fr.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+	}
 
-    public void contextDestroyed(ServletContextEvent sce) {
-        instance.shutdown();
-    }
+	public void contextDestroyed(ServletContextEvent sce) {
+		instance.shutdown();
+	}
 
-    private static int getAvailablePort() {
-        ServerSocket socket = null;
-        try {
-            socket = new ServerSocket(0);
-            return socket.getLocalPort();
-        } catch(IOException e) {
-            throw new RuntimeException(e);
-        } finally {
-            try {
-                socket.close();
-            }catch(IOException e) {}
-        }
-    }
+	private static int getAvailablePort() {
+		ServerSocket socket = null;
+		try {
+			socket = new ServerSocket(0);
+			return socket.getLocalPort();
+		} catch(IOException e) {
+			throw new RuntimeException(e);
+		} finally {
+			try {
+				socket.close();
+			}catch(IOException e) {}
+		}
+	}
 }

samples/hazelcast/src/main/java/sample/ObjectStreamSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -32,28 +32,28 @@ import com.hazelcast.nio.serialization.StreamSerializer;
  *
  */
 public class ObjectStreamSerializer implements StreamSerializer<Object> {
-    public int getTypeId() {
-        return 2;
-    }
+	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 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 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() {
-    }
+	public void destroy() {
+	}
 
 }

samples/hazelcast/src/main/java/sample/SessionServlet.java

@@ -1,19 +1,19 @@
-package sample;
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
+ * 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
+ *      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.
+ * 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;
@@ -28,13 +28,13 @@ 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() + "/");
-    }
+	@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;
+	private static final long serialVersionUID = 2878267318695777395L;
 }

samples/httpsession-xml/build.gradle

@@ -0,0 +1,20 @@
+apply from: JAVA_GRADLE
+apply from: TOMCAT_6_GRADLE
+
+tasks.findByPath("artifactoryPublish")?.enabled = false
+sonarRunner {
+	skipProject = true
+}
+
+dependencies {
+	compile project(':spring-session-data-redis'),
+		project(':samples:spring-embedded-redis'),
+			"org.springframework:spring-web:$springVersion",
+			jstlDependencies
+
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
+
+	testCompile "junit:junit:$junitVersion"
+
+	integrationTestCompile gebDependencies
+}

samples/httpsession-xml/src/integration-test/groovy/sample/AttributeTests.groovy

@@ -0,0 +1,45 @@
+/*
+ * 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'
+	}
+}

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

@@ -0,0 +1,45 @@
+/*
+ * 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() }
+	}
+}

samples/httpsession-xml/src/main/java/sample/SessionServlet.java

@@ -0,0 +1,36 @@
+/*
+ * 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.http.*;
+import java.io.IOException;
+
+// tag::class[]
+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;
+}
+
+// end::class[]

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

@@ -0,0 +1,20 @@
+<?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"
+	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">
+
+	<!-- tag::beans[] -->
+	<bean class="org.springframework.session.redis.embedded.EmbeddedRedisConfiguration"/> <!--1-->
+
+	<!--2-->
+	<context:annotation-config/>
+	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
+
+	<!--3-->
+	<bean class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
+		p:port="${spring.redis.port}"/>
+	<!-- end::beans[] -->
+</beans>

samples/httpsession-xml/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+	<!--
+	- Location of the XML file that defines the root application context
+	- Applied by ContextLoaderListener.
+	-->
+	<!-- tag::context-param[] -->
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>
+			/WEB-INF/spring/*.xml
+		</param-value>
+	</context-param>
+	<!-- end::context-param[] -->
+
+	<!-- tag::springSessionRepositoryFilter[] -->
+	<filter>
+		<filter-name>springSessionRepositoryFilter</filter-name>
+		<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>springSessionRepositoryFilter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+	<!-- end::springSessionRepositoryFilter[] -->
+
+	<!--
+	- Loads the root application context of this web app at startup.
+	- The application context is then available via
+	- WebApplicationContextUtils.getWebApplicationContext(servletContext).
+	-->
+	<!-- tag::listeners[] -->
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+	<!-- end::listeners[] -->
+
+	<servlet>
+		<servlet-name>session</servlet-name>
+		<servlet-class>sample.SessionServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>session</servlet-name>
+		<url-pattern>/session</url-pattern>
+	</servlet-mapping>
+
+	<welcome-file-list>
+		<welcome-file>index.jsp</welcome-file>
+	</welcome-file-list>
+</web-app>

samples/httpsession-xml/src/main/webapp/index.jsp

@@ -0,0 +1,48 @@
+<%@ 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="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"/>
+        </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>

samples/httpsession/build.gradle

@@ -1,20 +1,20 @@
 apply from: JAVA_GRADLE
-apply from: TOMCAT_GRADLE
+apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 sonarRunner {
-    skipProject = true
+	skipProject = true
 }
 
 dependencies {
-    compile project(':spring-session-data-redis'),
-            "org.springframework:spring-web:$springVersion",
-            "redis.embedded:embedded-redis:0.2",
-            jstlDependencies
+	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
+			"org.springframework:spring-web:$springVersion",
+			jstlDependencies
 
-    providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
-    testCompile 'junit:junit:4.11'
+	testCompile "junit:junit:$junitVersion"
 
-    integrationTestCompile gebDependencies
+	integrationTestCompile gebDependencies
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -12,19 +27,19 @@ import pages.*
  */
 @Stepwise
 class AttributeTests extends GebReportingSpec {
-    def 'first visit no attributes'() {
-        when:
-        to HomePage
-        then:
-        attributes.empty
-    }
+	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'
-    }
+	def 'create attribute'() {
+		when:
+		createAttribute('a','b')
+		then:
+		attributes.size() == 1
+		attributes[0].name == 'a'
+		attributes[0].value == 'b'
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -8,23 +23,23 @@ import geb.*
  * @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() }
-    }
+	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() }
-    }
+	static content = {
+		cell { $("td", it) }
+		name { cell(0).text() }
+		value { cell(1).text() }
+	}
 }

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

@@ -1,17 +1,36 @@
+/*
+ * 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.context.annotation.Import;
-import org.springframework.data.redis.connection.jedis.*;
-import org.springframework.session.data.redis.config.annotation.web.http.*;
+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(EmbeddedRedisConfiguration.class) // <1>
+// tag::class[]
+@EnableEmbeddedRedis // <1>
 @EnableRedisHttpSession // <2>
 public class Config {
 
-    @Bean
-    public JedisConnectionFactory connectionFactory() {
-        return new JedisConnectionFactory(); // <3>
-    }
+	@Bean
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
+	}
 }
+// end::class[]

samples/httpsession/src/main/java/sample/EmbeddedRedisConfiguration.java

@@ -1,69 +0,0 @@
-package sample;
-/*
- * Copyright 2002-2014 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.
- */
-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 redis.clients.jedis.Protocol;
-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
-public class EmbeddedRedisConfiguration {
-
-    @Bean
-    public static RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
-
-    /**
-     * 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.
-     */
-    static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-        private RedisServer redisServer;
-
-
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(Protocol.DEFAULT_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 {}
-    }
-}

samples/httpsession/src/main/java/sample/Initializer.java

@@ -1,11 +1,28 @@
+/*
+ * 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>
+		extends AbstractHttpSessionApplicationInitializer { // <1>
 
-    public Initializer() {
-        super(Config.class); // <2>
-    }
+	public Initializer() {
+		super(Config.class); // <2>
+	}
 }
+// end::class[]

samples/httpsession/src/main/java/sample/SessionServlet.java

@@ -1,3 +1,18 @@
+/*
+ * 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.*;
@@ -5,16 +20,18 @@ 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() + "/");
-    }
+	@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;
+	private static final long serialVersionUID = 2878267318695777395L;
 }
+// tag::end[]

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

@@ -2,47 +2,47 @@
 <!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>
+	<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>
+	<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>
+		<h1>Try it</h1>
 
-        <form class="form-inline" role="form" action="./session" method="post">
-            <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"/>
-        </form>
+		<form class="form-inline" role="form" action="./session" method="post">
+			<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"/>
+		</form>
 
-        <hr/>
+		<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>
+		<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>

samples/rest/build.gradle

@@ -1,24 +1,25 @@
 apply from: JAVA_GRADLE
-apply from: TOMCAT_GRADLE
+apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 sonarRunner {
-    skipProject = true
+	skipProject = true
 }
 
 dependencies {
-    compile project(':spring-session-data-redis'),
-            "org.springframework:spring-webmvc:$springVersion",
-            "redis.embedded:embedded-redis:0.2",
-            "org.springframework.security:spring-security-config:$springSecurityVersion",
-            "org.springframework.security:spring-security-web:$springSecurityVersion",
-            "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
-            jstlDependencies
+	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",
+			"com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
+			jstlDependencies
 
-    providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
-    testCompile 'junit:junit:4.11'
+	testCompile "junit:junit:$junitVersion",
+				"org.springframework.security:spring-security-test:$springSecurityVersion"
 
-    integrationTestCompile spockDependencies,
-                    'org.codehaus.groovy.modules.http-builder:http-builder:0.7'
+	integrationTestCompile spockDependencies,
+					'org.codehaus.groovy.modules.http-builder:http-builder:0.7'
 }

samples/rest/src/integration-test/groovy/sample/RestTests.groovy

@@ -1,3 +1,18 @@
+/*
+ * 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 groovyx.net.http.HttpResponseException

samples/rest/src/integration-test/java/rest/RestMockMvcTests.java

@@ -0,0 +1,67 @@
+/*
+ * 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 rest;
+
+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.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.*;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.session.ExpiringSession;
+import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import sample.HttpSessionConfig;
+import sample.SecurityConfig;
+import sample.mvc.MvcConfig;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes= {HttpSessionConfig.class,SecurityConfig.class, MvcConfig.class})
+@WebAppConfiguration
+public class RestMockMvcTests {
+
+	@Autowired
+	SessionRepositoryFilter<? extends ExpiringSession> sessionRepositoryFilter;
+
+	@Autowired
+	WebApplicationContext context;
+
+	MockMvc mvc;
+
+	@Before
+	public void setup() {
+		mvc = MockMvcBuilders.webAppContextSetup(context)
+				.alwaysDo(print())
+				.addFilters(sessionRepositoryFilter)
+				.apply(springSecurity()).build();
+	}
+
+	@Test
+	public void noSessionOnNoCredentials() throws Exception {
+		mvc.perform(get("/"))
+			.andExpect(header().doesNotExist("x-auth-token"));
+	}
+}

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

@@ -1,70 +0,0 @@
-package sample;
-/*
- * Copyright 2002-2014 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.
- */
-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 redis.clients.jedis.Protocol;
-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
-public class EmbeddedRedisConfiguration {
-
-    @Bean
-    public static RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
-
-    /**
-     * 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.
-     */
-    static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-        private RedisServer redisServer;
-
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-            redisServer.start();
-        }
-
-        public void destroy() throws Exception {
-            if(redisServer != null) {
-                redisServer.stop();
-            }
-        }
-
-        @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-        @Override
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-    }
-}

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

@@ -1,25 +1,45 @@
+/*
+ * 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.context.annotation.Import;
 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
-@Import(EmbeddedRedisConfiguration.class) // <1>
+@EnableEmbeddedRedis // <1>
 @EnableRedisHttpSession // <2>
 public class HttpSessionConfig {
 
-    @Bean
-    public JedisConnectionFactory connectionFactory() {
-        return new JedisConnectionFactory(); // <3>
-    }
+	@Bean
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory factory = new JedisConnectionFactory();  // <3>
+		factory.setPort(port);
+		return factory;
+	}
 
-    @Bean
-    public HttpSessionStrategy httpSessionStrategy() {
-        return new HeaderHttpSessionStrategy(); // <4>
-    }
+	@Bean
+	public HttpSessionStrategy httpSessionStrategy() {
+		return new HeaderHttpSessionStrategy(); // <4>
+	}
 }
+// end::class[]

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

@@ -1,7 +1,24 @@
+/*
+ * 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[]

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -15,32 +15,36 @@
  */
 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.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.savedrequest.NullRequestCache;
 
 @EnableWebSecurity
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http
-            .authorizeRequests()
-                .anyRequest().authenticated()
-                .and()
-            .httpBasic();
-    }
+	// @formatter:off
+	@Override
+	protected void configure(HttpSecurity http) throws Exception {
+		http
+			.authorizeRequests()
+				.anyRequest().authenticated()
+				.and()
+			.requestCache()
+				.requestCache(new NullRequestCache())
+				.and()
+			.httpBasic();
+	}
+	// @formatter:on
 
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	// @formatter:off
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
+	// @formatter:on
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -21,6 +21,6 @@ import org.springframework.security.web.context.AbstractSecurityWebApplicationIn
  * @author Rob Winch
  */
 public class SecurityInitializer extends
-        AbstractSecurityWebApplicationInitializer {
+		AbstractSecurityWebApplicationInitializer {
 
 }

samples/rest/src/main/java/sample/mvc/MvcConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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

samples/rest/src/main/java/sample/mvc/MvcInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -23,20 +23,20 @@ import sample.SecurityConfig;
  * @author Rob Winch
  */
 public class MvcInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-    // tag::config[]
-    @Override
-    protected Class<?>[] getRootConfigClasses() {
-        return new Class[] {SecurityConfig.class, HttpSessionConfig.class};
-    }
-    // end::config[]
+	// tag::config[]
+	@Override
+	protected Class<?>[] getRootConfigClasses() {
+		return new Class[] {SecurityConfig.class, HttpSessionConfig.class};
+	}
+	// end::config[]
 
-    @Override
-    protected Class<?>[] getServletConfigClasses() {
-        return new Class[] { MvcConfig.class };
-    }
+	@Override
+	protected Class<?>[] getServletConfigClasses() {
+		return new Class[] { MvcConfig.class };
+	}
 
-    @Override
-    protected String[] getServletMappings() {
-        return new String[] { "/" };
-    }
+	@Override
+	protected String[] getServletMappings() {
+		return new String[] { "/" };
+	}
 }

samples/rest/src/main/java/sample/mvc/RestDemoController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -15,33 +15,33 @@
  */
 package sample.mvc;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpSession;
 import java.security.Principal;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.servlet.http.HttpSession;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
 /**
  * @author Rob Winch
  */
 @RestController
 public class RestDemoController {
 
-    @RequestMapping(value="/",produces = "application/json")
-    public Map<String,String> helloUser(Principal principal) {
-        HashMap<String,String> result = new HashMap<String,String>();
-        result.put("username", principal.getName());
-        return result;
-    }
+	@RequestMapping(value="/",produces = "application/json")
+	public Map<String,String> helloUser(Principal principal) {
+		HashMap<String,String> result = new HashMap<String,String>();
+		result.put("username", principal.getName());
+		return result;
+	}
 
-    @RequestMapping("/logout")
-    @ResponseStatus(HttpStatus.NO_CONTENT)
-    public void logout(HttpSession session) {
-        session.invalidate();
-    }
+	@RequestMapping("/logout")
+	@ResponseStatus(HttpStatus.NO_CONTENT)
+	public void logout(HttpSession session) {
+		session.invalidate();
+	}
 }

samples/security/build.gradle

@@ -1,22 +1,22 @@
 apply from: JAVA_GRADLE
-apply from: TOMCAT_GRADLE
+apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 sonarRunner {
-    skipProject = true
+	skipProject = true
 }
 
 dependencies {
-    compile project(':spring-session-data-redis'),
-            "org.springframework:spring-web:$springVersion",
-            "redis.embedded:embedded-redis:0.2",
-            "org.springframework.security:spring-security-config:$springSecurityVersion",
-            "org.springframework.security:spring-security-web:$springSecurityVersion",
-            jstlDependencies
+	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"
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
-    testCompile 'junit:junit:4.11'
+	testCompile "junit:junit:$junitVersion"
 
-    integrationTestCompile gebDependencies
+	integrationTestCompile gebDependencies
 }

samples/security/src/integration-test/groovy/sample/SecurityTests.groovy

@@ -1,3 +1,18 @@
+/*
+ * 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
@@ -14,37 +29,37 @@ import spock.lang.Stepwise
 @Stepwise
 class SecurityTests 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 '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 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 '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
-    }
+	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
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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
@@ -8,10 +23,10 @@ import geb.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() }
-    }
+	static url = ''
+	static at = { assert driver.title == 'Secured Content'; true}
+	static content = {
+		username { $('#un').text() }
+		logout(to:LoginPage) { $('input[type=submit]').click() }
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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
@@ -8,15 +23,15 @@ import geb.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)
-        }
-    }
+	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)
+		}
+	}
 }

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

@@ -1,18 +1,38 @@
+/*
+ * 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.context.annotation.Import;
 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
-@Import(EmbeddedRedisConfiguration.class) // <1>
+@EnableEmbeddedRedis // <1>
 @EnableRedisHttpSession // <2>
 public class Config {
 
-    @Bean
-    public JedisConnectionFactory connectionFactory() {
-        return new JedisConnectionFactory(); // <3>
-    }
+	@Bean
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
+	}
 }
+// end::class[]

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

@@ -1,70 +0,0 @@
-package sample;
-/*
- * Copyright 2002-2014 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.
- */
-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 redis.clients.jedis.Protocol;
-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
-public class EmbeddedRedisConfiguration {
-
-    @Bean
-    public static RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
-
-    /**
-     * 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.
-     */
-    static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-        private RedisServer redisServer;
-
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-            redisServer.start();
-        }
-
-        public void destroy() throws Exception {
-            if(redisServer != null) {
-                redisServer.stop();
-            }
-        }
-
-        @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-        @Override
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-    }
-}

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

@@ -1,7 +1,24 @@
+/*
+ * 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[]

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -25,10 +25,10 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 
 @EnableWebSecurity
 public class SecurityConfig {
-    @Autowired
-    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-        auth
-            .inMemoryAuthentication()
-                .withUser("user").password("password").roles("USER");
-    }
+	@Autowired
+	public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
+		auth
+			.inMemoryAuthentication()
+				.withUser("user").password("password").roles("USER");
+	}
 }

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

@@ -1,11 +1,28 @@
+/*
+ * 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 {
+		AbstractSecurityWebApplicationInitializer {
 
-    public SecurityInitializer() {
-        super(SecurityConfig.class, Config.class);
-    }
-}
+	public SecurityInitializer() {
+		super(SecurityConfig.class, Config.class);
+	}
+}
+// end::class[]

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

@@ -1,3 +1,18 @@
+/*
+ * 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;
@@ -10,13 +25,13 @@ 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() + "/");
-    }
+	@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;
+	private static final long serialVersionUID = 2878267318695777395L;
 }

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

@@ -2,31 +2,31 @@
 <!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>
+	<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 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>
+	<div class="container">
+		<h1>Description</h1>
+		<p>This demonstrates how Spring Session 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>
+		<h1>Logged in as</h1>
 
-        <p>You are currently logged in as <span id="un"><c:out value="${pageContext.request.remoteUser}"/></span>.</p>
+		<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>
+		<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>

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"
+}

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) {}
+			}
+		}
+	}
+}

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 {}

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 { }

samples/users/build.gradle

@@ -1,20 +1,20 @@
 apply from: JAVA_GRADLE
-apply from: TOMCAT_GRADLE
+apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 sonarRunner {
-    skipProject = true
+	skipProject = true
 }
 
 dependencies {
-    compile project(':spring-session-data-redis'),
-            "org.springframework:spring-web:$springVersion",
-            "redis.embedded:embedded-redis:0.2",
-            jstlDependencies
+	compile project(':spring-session-data-redis'),
+			project(':samples:spring-embedded-redis'),
+			"org.springframework:spring-web:$springVersion",
+			jstlDependencies
 
-    providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
+	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"
 
-    testCompile 'junit:junit:4.11'
+	testCompile "junit:junit:$junitVersion"
 
-    integrationTestCompile gebDependencies
+	integrationTestCompile gebDependencies
 }

samples/users/src/integration-test/groovy/sample/UserTests.groovy

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -13,112 +28,112 @@ import pages.*
  */
 @Stepwise
 class UserTests extends GebReportingSpec {
-    def 'first visit not authenticated'() {
-        when:
-        to HomePage
-        then:
-        form
-        !username
-    }
+	def 'first visit not authenticated'() {
+		when:
+		to HomePage
+		then:
+		form
+		!username
+	}
 
-    def 'invalid login'() {
-        setup:
-        def user = 'rob'
-        when:
-        login(user, user+'invalid')
-        then:
-        !username
-        error == 'Invalid username / password. Please ensure the username is the same as the password.'
-    }
+	def 'invalid login'() {
+		setup:
+		def user = 'rob'
+		when:
+		login(user, user+'invalid')
+		then:
+		!username
+		error == 'Invalid username / password. Please ensure the username is the same as the password.'
+	}
 
-    def 'empty username'() {
-        setup:
-        def user = ''
-        when:
-        login(user, user)
-        then:
-        !username
-        error == 'Invalid username / password. Please ensure the username is the same as the password.'
-    }
+	def 'empty username'() {
+		setup:
+		def user = ''
+		when:
+		login(user, user)
+		then:
+		!username
+		error == 'Invalid username / password. Please ensure the username is the same as the password.'
+	}
 
-    def 'login single user'() {
-        setup:
-        def user = 'rob'
-        when:
-        login(user, user)
-        then:
-        username == user
-    }
+	def 'login single user'() {
+		setup:
+		def user = 'rob'
+		when:
+		login(user, user)
+		then:
+		username == user
+	}
 
-    def 'add account'() {
-        when:
-        addAccount.click(HomePage)
-        then:
-        form
-        !username
-    }
+	def 'add account'() {
+		when:
+		addAccount.click(HomePage)
+		then:
+		form
+		!username
+	}
 
-    def 'log in second user'() {
-        setup:
-        def user = 'luke'
-        when:
-        login(user, user)
-        then:
-        username == user
-    }
+	def 'log in second user'() {
+		setup:
+		def user = 'luke'
+		when:
+		login(user, user)
+		then:
+		username == user
+	}
 
-    def 'following links keeps new session'() {
-        when:
-        navLink.click(LinkPage)
-        then:
-        username == 'luke'
-    }
+	def 'following links keeps new session'() {
+		when:
+		navLink.click(LinkPage)
+		then:
+		username == 'luke'
+	}
 
-    def 'switch account rob'() {
-        setup:
-        def user = 'rob'
-        when:
-        switchAccount(user)
-        then:
-        username == user
-    }
+	def 'switch account rob'() {
+		setup:
+		def user = 'rob'
+		when:
+		switchAccount(user)
+		then:
+		username == user
+	}
 
-    def 'following links keeps original session'() {
-        when:
-        navLink.click(LinkPage)
-        then:
-        username == 'rob'
-    }
+	def 'following links keeps original session'() {
+		when:
+		navLink.click(LinkPage)
+		then:
+		username == 'rob'
+	}
 
-    def 'switch account luke'() {
-        setup:
-        def user = 'luke'
-        when:
-        switchAccount(user)
-        then:
-        username == user
-    }
+	def 'switch account luke'() {
+		setup:
+		def user = 'luke'
+		when:
+		switchAccount(user)
+		then:
+		username == user
+	}
 
-    def 'logout luke'() {
-        when:
-        logout.click(HomePage)
-        then:
-        !username
-    }
+	def 'logout luke'() {
+		when:
+		logout.click(HomePage)
+		then:
+		!username
+	}
 
-    def 'switch back rob'() {
-        setup:
-        def user = 'rob'
-        when:
-        switchAccount(user)
-        then:
-        username == user
-    }
+	def 'switch back rob'() {
+		setup:
+		def user = 'rob'
+		when:
+		switchAccount(user)
+		then:
+		username == user
+	}
 
-    def 'logout rob'() {
-        when:
-        logout.click(HomePage)
-        then:
-        !username
-    }
+	def 'logout rob'() {
+		when:
+		logout.click(HomePage)
+		then:
+		!username
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -8,24 +23,24 @@ import geb.*
  * @author Rob Winch
  */
 class HomePage extends Page {
-    static url = ''
-    static at = { assert driver.title == 'Demonstrates Multi User Log In'; true}
-    static content = {
-        navLink { $('#navLink') }
-        error { $('#error').text() }
-        form { $('form') }
-        username(required:false) { $('#un').text() }
-        logout(required:false) { $('#logout') }
-        addAccount(required:false) { $('#addAccount') }
-        submit { $('input[type=submit]') }
-        login(required:false) { user, pass ->
-            form.username = user
-            form.password = pass
-            submit.click(HomePage)
-        }
-        switchAccount{ un ->
-            $("#switchAccount${un}").click(HomePage)
-        }
-        attributes { moduleList AttributeRow, $("table tr").tail() }
-    }
+	static url = ''
+	static at = { assert driver.title == 'Demonstrates Multi User Log In'; true}
+	static content = {
+		navLink { $('#navLink') }
+		error { $('#error').text() }
+		form { $('form') }
+		username(required:false) { $('#un').text() }
+		logout(required:false) { $('#logout') }
+		addAccount(required:false) { $('#addAccount') }
+		submit { $('input[type=submit]') }
+		login(required:false) { user, pass ->
+			form.username = user
+			form.password = pass
+			submit.click(HomePage)
+		}
+		switchAccount{ un ->
+			$("#switchAccount${un}").click(HomePage)
+		}
+		attributes { moduleList AttributeRow, $("table tr").tail() }
+	}
 }

samples/users/src/integration-test/groovy/sample/pages/LinkPage.groovy

@@ -1,3 +1,18 @@
+/*
+ * 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.*
@@ -8,13 +23,13 @@ import geb.*
  * @author Rob Winch
  */
 class LinkPage extends Page {
-    static url = ''
-    static at = { assert driver.title == 'Linked Page'; true}
-    static content = {
-        form { $('#navLinks') }
-        username(required:false) { $('#un').text() }
-        switchAccount{ un ->
-            $("#switchAccount${un}").click(HomePage)
-        }
-    }
+	static url = ''
+	static at = { assert driver.title == 'Linked Page'; true}
+	static content = {
+		form { $('#navLinks') }
+		username(required:false) { $('#un').text() }
+		switchAccount{ un ->
+			$("#switchAccount${un}").click(HomePage)
+		}
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -16,29 +16,29 @@
 package sample;
 
 public class Account {
-    private String username;
+	private String username;
 
-    private String logoutUrl;
+	private String logoutUrl;
 
-    private String switchAccountUrl;
+	private String switchAccountUrl;
 
-    public Account(String username, String logoutUrl, String switchAccountUrl) {
-        super();
-        this.username = username;
-        this.logoutUrl = logoutUrl;
-        this.switchAccountUrl = switchAccountUrl;
-    }
+	public Account(String username, String logoutUrl, String switchAccountUrl) {
+		super();
+		this.username = username;
+		this.logoutUrl = logoutUrl;
+		this.switchAccountUrl = switchAccountUrl;
+	}
 
-    public String getUsername() {
-        return username;
-    }
+	public String getUsername() {
+		return username;
+	}
 
-    public String getLogoutUrl() {
-        return logoutUrl;
-    }
+	public String getLogoutUrl() {
+		return logoutUrl;
+	}
 
-    public String getSwitchAccountUrl() {
-        return switchAccountUrl;
-    }
+	public String getSwitchAccountUrl() {
+		return switchAccountUrl;
+	}
 
 }

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

@@ -1,6 +1,5 @@
-package sample;
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -14,23 +13,30 @@ package sample;
  * 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.context.annotation.Import;
 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
  */
-@Import(EmbeddedRedisConfiguration.class)
+
+@EnableEmbeddedRedis
+// tag::class[]
 @Configuration
 @EnableRedisHttpSession
 public class Config {
 
-    @Bean
-    public JedisConnectionFactory connectionFactory() {
-        return new JedisConnectionFactory();
-    }
+	@Bean
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory();
+		connection.setPort(port);
+		return connection;
+	}
 }
+// end::class[]

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

@@ -1,71 +0,0 @@
-package sample;
-/*
- * Copyright 2002-2014 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.
- */
-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 redis.clients.jedis.Protocol;
-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
-public class EmbeddedRedisConfiguration {
-
-    @Bean
-    public RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
-
-    /**
-     * 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.
-     */
-    class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-        private RedisServer redisServer;
-
-
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-            redisServer.start();
-        }
-
-        public void destroy() throws Exception {
-            if(redisServer != null) {
-                redisServer.stop();
-            }
-        }
-
-        @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-        @Override
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-    }
-}

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

@@ -1,6 +1,5 @@
-package sample;
 /*
- * Copyright 2002-2014 the original author or authors.
+ * 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
@@ -14,7 +13,7 @@ package sample;
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-
+package sample;
 
 import javax.servlet.ServletContext;
 
@@ -25,12 +24,12 @@ import org.springframework.session.web.context.AbstractHttpSessionApplicationIni
  */
 public class Initializer extends AbstractHttpSessionApplicationInitializer {
 
-    public Initializer() {
-        super(Config.class);
-    }
+	public Initializer() {
+		super(Config.class);
+	}
 
-    @Override
-    protected void afterSessionRepositoryFilter(ServletContext servletContext) {
-        appendFilters(servletContext, new UserAccountsFilter());
-    }
+	@Override
+	protected void afterSessionRepositoryFilter(ServletContext servletContext) {
+		appendFilters(servletContext, new UserAccountsFilter());
+	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -26,21 +26,21 @@ import javax.servlet.http.HttpServletResponse;
 @WebServlet("/login")
 public class LoginServlet extends HttpServlet {
 
-    @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
-        String username = req.getParameter("username");
-        String password = req.getParameter("password");
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		String username = req.getParameter("username");
+		String password = req.getParameter("password");
 
-        if(username != null && !"".equals(username) && username.equals(password)) {
-            req.getSession().setAttribute("username", username);
-            String url = resp.encodeRedirectURL(req.getContextPath() + "/");
-            resp.sendRedirect(url);
-        } else {
-            String url = resp.encodeRedirectURL(req.getContextPath() + "/?error");
-            resp.sendRedirect(url);
-        }
-    }
+		if(username != null && !"".equals(username) && username.equals(password)) {
+			req.getSession().setAttribute("username", username);
+			String url = resp.encodeRedirectURL(req.getContextPath() + "/");
+			resp.sendRedirect(url);
+		} else {
+			String url = resp.encodeRedirectURL(req.getContextPath() + "/?error");
+			resp.sendRedirect(url);
+		}
+	}
 
-    private static final long serialVersionUID = -8157634860354132501L;
+	private static final long serialVersionUID = -8157634860354132501L;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -27,16 +27,16 @@ import javax.servlet.http.HttpSession;
 @WebServlet("/logout")
 public class LogoutServlet extends HttpServlet {
 
-    @Override
-    protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-            throws ServletException, IOException {
-        HttpSession session = req.getSession(false);
-        if(session != null) {
-            session.invalidate();
-        }
-        String url = resp.encodeRedirectURL(req.getContextPath() + "/");
-        resp.sendRedirect(url);
-    }
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		HttpSession session = req.getSession(false);
+		if(session != null) {
+			session.invalidate();
+		}
+		String url = resp.encodeRedirectURL(req.getContextPath() + "/");
+		resp.sendRedirect(url);
+	}
 
-    private static final long serialVersionUID = 4061762524521437433L;
+	private static final long serialVersionUID = 4061762524521437433L;
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -34,68 +34,68 @@ import org.springframework.session.web.http.HttpSessionManager;
 
 public class UserAccountsFilter implements Filter {
 
-    public void init(FilterConfig filterConfig) throws ServletException {
-    }
+	public void init(FilterConfig filterConfig) throws ServletException {
+	}
 
-    @SuppressWarnings("unchecked")
-    public void doFilter(ServletRequest request, ServletResponse response,
-            FilterChain chain) throws IOException, ServletException {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
+	@SuppressWarnings("unchecked")
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
 
-        // tag::HttpSessionManager[]
-        HttpSessionManager sessionManager =
-                (HttpSessionManager) httpRequest.getAttribute(HttpSessionManager.class.getName());
-        // end::HttpSessionManager[]
-        SessionRepository<Session> repo =
-                (SessionRepository<Session>) httpRequest.getAttribute(SessionRepository.class.getName());
+		// tag::HttpSessionManager[]
+		HttpSessionManager sessionManager =
+				(HttpSessionManager) httpRequest.getAttribute(HttpSessionManager.class.getName());
+		// end::HttpSessionManager[]
+		SessionRepository<Session> repo =
+				(SessionRepository<Session>) httpRequest.getAttribute(SessionRepository.class.getName());
 
-        String currentSessionAlias = sessionManager.getCurrentSessionAlias(httpRequest);
-        Map<String, String> sessionIds = sessionManager.getSessionIds(httpRequest);
-        String unauthenticatedAlias = null;
+		String currentSessionAlias = sessionManager.getCurrentSessionAlias(httpRequest);
+		Map<String, String> sessionIds = sessionManager.getSessionIds(httpRequest);
+		String unauthenticatedAlias = null;
 
-        String contextPath = httpRequest.getContextPath();
-        List<Account> accounts = new ArrayList<Account>();
-        Account currentAccount = null;
-        for(Map.Entry<String, String> entry : sessionIds.entrySet()) {
-            String alias = entry.getKey();
-            String sessionId = entry.getValue();
+		String contextPath = httpRequest.getContextPath();
+		List<Account> accounts = new ArrayList<Account>();
+		Account currentAccount = null;
+		for(Map.Entry<String, String> entry : sessionIds.entrySet()) {
+			String alias = entry.getKey();
+			String sessionId = entry.getValue();
 
-            Session session = repo.getSession(sessionId);
-            if(session == null) {
-                continue;
-            }
+			Session session = repo.getSession(sessionId);
+			if(session == null) {
+				continue;
+			}
 
-            String username = session.getAttribute("username");
-            if(username == null) {
-                unauthenticatedAlias = alias;
-                continue;
-            }
+			String username = session.getAttribute("username");
+			if(username == null) {
+				unauthenticatedAlias = alias;
+				continue;
+			}
 
-            String logoutUrl = sessionManager.encodeURL("./logout", alias);
-            String switchAccountUrl = sessionManager.encodeURL("./", alias);
-            Account account = new Account(username, logoutUrl, switchAccountUrl);
-            if(currentSessionAlias.equals(alias)) {
-                currentAccount = account;
-            } else {
-                accounts.add(account);
-            }
-        }
+			String logoutUrl = sessionManager.encodeURL("./logout", alias);
+			String switchAccountUrl = sessionManager.encodeURL("./", alias);
+			Account account = new Account(username, logoutUrl, switchAccountUrl);
+			if(currentSessionAlias.equals(alias)) {
+				currentAccount = account;
+			} else {
+				accounts.add(account);
+			}
+		}
 
-        // tag::addAccountUrl[]
-        String addAlias = unauthenticatedAlias == null ? // <1>
-                sessionManager.getNewSessionAlias(httpRequest) : // <2>
-                unauthenticatedAlias; // <3>
-        String addAccountUrl = sessionManager.encodeURL(contextPath, addAlias); // <4>
-        // end::addAccountUrl[]
+		// tag::addAccountUrl[]
+		String addAlias = unauthenticatedAlias == null ? // <1>
+				sessionManager.getNewSessionAlias(httpRequest) : // <2>
+				unauthenticatedAlias; // <3>
+		String addAccountUrl = sessionManager.encodeURL(contextPath, addAlias); // <4>
+		// end::addAccountUrl[]
 
-        httpRequest.setAttribute("currentAccount", currentAccount);
-        httpRequest.setAttribute("addAccountUrl", addAccountUrl);
-        httpRequest.setAttribute("accounts", accounts);
+		httpRequest.setAttribute("currentAccount", currentAccount);
+		httpRequest.setAttribute("addAccountUrl", addAccountUrl);
+		httpRequest.setAttribute("accounts", accounts);
 
-        chain.doFilter(request, response);
-    }
+		chain.doFilter(request, response);
+	}
 
-    public void destroy() {
-    }
+	public void destroy() {
+	}
 
 }

samples/websocket/build.gradle

@@ -1,39 +1,39 @@
 buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
-    }
+	repositories {
+		mavenCentral()
+	}
+	dependencies {
+		classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
+	}
 }
 
 apply plugin: 'spring-boot'
 
 apply from: JAVA_GRADLE
-apply from: TOMCAT_GRADLE
+apply from: TOMCAT_7_GRADLE
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
 group = 'samples'
 
 dependencies {
-    compile project(':spring-session-data-redis'),
-            "org.springframework.boot:spring-boot-starter-web",
-            "org.springframework.boot:spring-boot-starter-data-jpa",
-            "org.springframework.boot:spring-boot-starter-thymeleaf",
-            "org.springframework.boot:spring-boot-starter-websocket",
-            "org.springframework:spring-websocket:${springVersion}",
-            "org.springframework.data:spring-data-jpa:1.7.0.RELEASE",
-            "redis.embedded:embedded-redis:0.2",
-            "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-            "com.h2database:h2",
-            "org.springframework.security:spring-security-web:$springSecurityVersion",
-            "org.springframework.security:spring-security-config:$springSecurityVersion",
-            "org.springframework.security:spring-security-messaging:$springSecurityVersion",
-            "org.springframework.security:spring-security-data:$springSecurityVersion"
+	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",
+			"org.springframework.boot:spring-boot-starter-websocket",
+			"org.springframework:spring-websocket:${springVersion}",
+			"org.springframework.data:spring-data-jpa:1.7.0.RELEASE",
+			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
+			"com.h2database:h2",
+			"org.springframework.security:spring-security-web:$springSecurityVersion",
+			"org.springframework.security:spring-security-config:$springSecurityVersion",
+			"org.springframework.security:spring-security-messaging:$springSecurityVersion",
+			"org.springframework.security:spring-security-data:$springSecurityVersion"
 
 
-    testCompile "org.springframework.boot:spring-boot-starter-test",
-            "org.springframework.security:spring-security-test:$springSecurityVersion"
+	testCompile "org.springframework.boot:spring-boot-starter-test",
+			"org.springframework.security:spring-security-test:$springSecurityVersion"
 
 }

samples/websocket/src/main/java/sample/Application.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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
@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
 @EnableAutoConfiguration
 public class Application {
 
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(Application.class, args);
+	}
 }

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

@@ -1,3 +1,18 @@
+/*
+ * 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 javax.sql.DataSource;
@@ -7,18 +22,21 @@ 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 {
 
-    @Bean
-    public DataSource dataSource() {
-        EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
-        return builder.setType(EmbeddedDatabaseType.H2).build();
-    }
+	@Bean
+	public DataSource dataSource() {
+		EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
+		return builder.setType(EmbeddedDatabaseType.H2).build();
+	}
 
-    @Bean
-    public JedisConnectionFactory connectionFactory() throws Exception {
-        return new JedisConnectionFactory();
-    }
+	@Bean
+	public JedisConnectionFactory connectionFactory(@RedisServerPort int port) {
+		JedisConnectionFactory connection = new JedisConnectionFactory(); // <3>
+		connection.setPort(port);
+		return connection;
+	}
 }

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

@@ -1,68 +0,0 @@
-/*
- * Copyright 2002-2013 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.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 redis.clients.jedis.Protocol;
-import redis.embedded.RedisServer;
-
-/**
- * @author Rob Winch
- */
-@Configuration
-public class EmbeddedRedisConfig {
-
-    @Bean
-    public static RedisServerBean redisServer() {
-        return new RedisServerBean();
-    }
-
-    /**
-     * 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.
-     */
-    static class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-        private RedisServer redisServer;
-
-
-        public void afterPropertiesSet() throws Exception {
-            redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-            redisServer.start();
-        }
-
-        public void destroy() throws Exception {
-            if(redisServer != null) {
-                redisServer.stop();
-            }
-        }
-
-        @Override
-        public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-        @Override
-        public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-    }
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * 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.
@@ -32,7 +32,7 @@ public class H2Initializer {
 	@Bean
 	public ServletRegistrationBean h2Servlet() {
 		ServletRegistrationBean servletBean = new ServletRegistrationBean();
-		servletBean.addUrlMappings("/h2/*"); 
+		servletBean.addUrlMappings("/h2/*");
 		servletBean.setServlet(new WebServlet());
 		return servletBean;
 	}