Polish

docs/build.gradle

@@ -75,3 +75,5 @@ asciidoctor {
 			'docinfo1':'true',
 			'revnumber' : project.version
 }
+
+eclipse.project.name = 'spring-session-docs'

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

@@ -65,7 +65,7 @@ For example, our sample application includes the location and access type of the
 
 [source,java,indent=0]
 ----
-include::{samples-dir}boot/boot-findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/session/SessionDetails.java[tags=class]
 ----
 
 We then inject that information into the session on each HTTP request using a `SessionDetailsFilter`.
@@ -73,7 +73,7 @@ For example:
 
 [source,java,indent=0]
 ----
-include::{samples-dir}boot/boot-findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java[tags=dofilterinternal]
 ----
 
 We obtain the information we want and then set the `SessionDetails` as an attribute in the `Session`.
@@ -93,7 +93,7 @@ We can now find all the sessions for a specific user.
 
 [source,java,indent=0]
 ----
-include::{samples-dir}boot/boot-findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
+include::{samples-dir}boot/findbyusername/src/main/java/sample/mvc/IndexController.java[tags=findbyusername]
 ----
 
 In our instance, we find all sessions for the currently logged in user.

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

@@ -86,7 +86,7 @@ We start with the _Spring Boot_ application for configuring and bootstrapping a
 
 [source,java]
 ----
-include::{samples-dir}boot/boot-gemfire/src/main/java/sample/server/GemFireServer.java[tags=class]
+include::{samples-dir}boot/gemfire/src/main/java/sample/server/GemFireServer.java[tags=class]
 ----
 
 <1> The `@EnableGemFireHttpSession` annotation is used on the GemFire Server to mainly define the corresponding
@@ -113,7 +113,7 @@ to manage Session state in a clustered, replicated fashion.
 
 [source,java]
 ----
-include::{samples-dir}boot/boot-gemfire/src/main/java/sample/client/Application.java[tags=class]
+include::{samples-dir}boot/gemfire/src/main/java/sample/client/Application.java[tags=class]
 ----
 
 <1> Here, again, we use the `@EnableGemFireHttpSession` annotation to not only configure the GemFire cache client,

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

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

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

@@ -74,7 +74,7 @@ All you have to do is to add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}boot/boot-mongo/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
+include::{samples-dir}boot/mongo/src/main/java/sample/config/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableMongoHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.

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

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

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

@@ -38,7 +38,7 @@ For example:
 .src/main/java/samples/config/WebSocketConfig.java
 [source,java]
 ----
-include::{samples-dir}boot/boot-websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
+include::{samples-dir}boot/websocket/src/main/java/sample/config/WebSocketConfig.java[tags=class]
 ----
 
 To hook in the Spring Session support we only need to change two things:
@@ -78,7 +78,7 @@ For the purposes of testing session expiration, you may want to change the sessi
 .src/main/java/samples/config/WebSecurityConfig.java
 [source,java]
 ----
-include::{samples-dir}boot/boot-websocket/src/main/java/sample/config/WebSecurityConfig.java[tags=enable-redis-httpsession]
+include::{samples-dir}boot/websocket/src/main/java/sample/config/WebSecurityConfig.java[tags=enable-redis-httpsession]
 ----
 ====
 

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

@@ -17,7 +17,7 @@ You can find an example of customizing Spring Session's cookie below:
 
 [source,java]
 ----
-include::{samples-dir}java/java-custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
+include::{samples-dir}javaconfig/custom-cookie/src/main/java/sample/Config.java[tags=cookie-serializer]
 ----
 
 <1> We customize the name of the cookie to be JSESSIONID

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

@@ -80,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-clientserver/src/main/java/sample/ClientConfig.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java[tags=class]
 ----
 
 <1> The `@EnableGemFireHttpSession` annotation creates a Spring bean named `springSessionRepositoryFilter` that
@@ -144,7 +144,7 @@ In this sample, we will use the following GemFire Server Java Configuration:
 
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-clientserver/src/main/java/sample/ServerConfig.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java[tags=class]
 ----
 
 <1> On the server, we also configure Spring Session using the `@EnableGemFireHttpSession` annotation. This ensures
@@ -174,7 +174,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-clientserver/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-clientserver/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (`Initializer`) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -224,7 +224,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.

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

@@ -80,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-p2p/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-p2p/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableGemFireHttpSession` annotation creates a Spring bean named `springSessionRepositoryFilter` that
@@ -125,7 +125,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-p2p/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-p2p/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (`Initializer`) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.
@@ -166,7 +166,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}java/java-gemfire-p2p/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.

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

@@ -98,7 +98,7 @@ Since our application is already loading Spring configuration using our `Securit
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-hazelcast/src/main/java/sample/SecurityInitializer.java[tags=class]
+include::{samples-dir}javaconfig/hazelcast/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -110,7 +110,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-hazelcast/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/hazelcast/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.

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

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

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

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

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

@@ -80,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}java/java-rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/HttpSessionConfig.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements `Filter`.
@@ -101,7 +101,7 @@ In order for our `Filter` to do its magic, Spring needs to load our `Config` cla
 .src/main/java/sample/mvc/MvcInitializer.java
 [source,java,indent=0]
 ----
-include::{samples-dir}java/java-rest/src/main/java/sample/mvc/MvcInitializer.java[tags=config]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/mvc/MvcInitializer.java[tags=config]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -110,7 +110,7 @@ Fortunately, Spring Session provides a utility class named `AbstractHttpSessionA
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-rest/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/rest/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.

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

@@ -79,7 +79,7 @@ Add the following Spring Configuration:
 
 [source,java]
 ----
-include::{samples-dir}java/java-security/src/main/java/sample/Config.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/Config.java[tags=class]
 ----
 
 <1> The `@EnableRedisHttpSession` annotation creates a Spring Bean with the name of `springSessionRepositoryFilter` that implements Filter.
@@ -100,7 +100,7 @@ Since our application is already loading Spring configuration using our `Securit
 .src/main/java/sample/SecurityInitializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-security/src/main/java/sample/SecurityInitializer.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/SecurityInitializer.java[tags=class]
 ----
 
 Last we need to ensure that our Servlet Container (i.e. Tomcat) uses our `springSessionRepositoryFilter` for every request.
@@ -112,7 +112,7 @@ You can find an example below:
 .src/main/java/sample/Initializer.java
 [source,java]
 ----
-include::{samples-dir}java/java-security/src/main/java/sample/Initializer.java[tags=class]
+include::{samples-dir}javaconfig/security/src/main/java/sample/Initializer.java[tags=class]
 ----
 
 NOTE: The name of our class (Initializer) does not matter. What is important is that we extend `AbstractHttpSessionApplicationInitializer`.

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

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

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

@@ -80,7 +80,7 @@ Add the following Spring Configuration:
 
 [source,xml]
 ----
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
+include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml[tags=beans]
 ----
 
 <1> Spring annotation configuration support is enabled with `<context:annotation-config/>` element so that any
@@ -117,7 +117,7 @@ In this sample, we will use the following GemFire Server Java Configuration:
 
 [source,xml]
 ----
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml[tags=beans]
+include::{samples-dir}xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml[tags=beans]
 ----
 
 <1> First, we enable Spring annotation config support with the `<context:annotation-config>` element so that any
@@ -139,7 +139,7 @@ The GemFire Server configuration gets bootstrapped with the following:
 
 [source,java]
 ----
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/java/sample/Application.java[tags=class]
+include::{samples-dir}xml/gemfire-clientserver/src/main/java/sample/Application.java[tags=class]
 ----
 
 TIP: Instead of a simple Java class with a main method, you could also use _Spring Boot_.
@@ -163,8 +163,8 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
 The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener]
@@ -178,7 +178,7 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
 The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy]
@@ -225,7 +225,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}xml/xml-gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.

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

@@ -81,7 +81,7 @@ Add the following Spring Configuration:
 .src/main/webapp/WEB-INF/spring/session.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
+include::{samples-dir}xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml[tags=beans]
 ----
 
 <1> We use the combination of `<context:annotation-config/>` and `GemFireHttpSessionConfiguration` because Spring Session
@@ -114,8 +114,8 @@ We do this with the following configuration:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=context-param]
-include::{samples-dir}xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=listeners]
+include::{samples-dir}xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=context-param]
+include::{samples-dir}xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=listeners]
 ----
 
 The http://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#context-create[ContextLoaderListener]
@@ -129,7 +129,7 @@ The following snippet performs this last step for us:
 .src/main/webapp/WEB-INF/web.xml
 [source,xml,indent=0]
 ----
-include::{samples-dir}xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
+include::{samples-dir}xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml[tags=springSessionRepositoryFilter]
 ----
 
 The http://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/web/filter/DelegatingFilterProxy.html[DelegatingFilterProxy]
@@ -167,7 +167,7 @@ We interact with the standard `HttpSession` in the `SessionServlet` shown below:
 .src/main/java/sample/SessionServlet.java
 [source,java]
 ----
-include::{samples-dir}xml/xml-gemfire-p2p/src/main/java/sample/SessionServlet.java[tags=class]
+include::{samples-dir}xml/gemfire-p2p/src/main/java/sample/SessionServlet.java[tags=class]
 ----
 
 Instead of using Tomcat's `HttpSession`, we are actually persisting the values in GemFire.

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

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

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

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

docs/src/docs/asciidoc/index.adoc

@@ -48,31 +48,31 @@ If you are looking to get started with Spring Session, the best place to start i
 |===
 | Source | Description | Guide
 
-| {gh-samples-url}boot/boot-redis[HttpSession with Redis]
+| {gh-samples-url}boot/redis[HttpSession with Redis]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Redis.
 | link:guides/boot.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}boot/boot-gemfire[HttpSession with GemFire]
+| {gh-samples-url}boot/gemfire[HttpSession with GemFire]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology.
 | link:guides/boot-gemfire.html[HttpSession with GemFire Guide]
 
-| {gh-samples-url}boot/boot-mongo[HttpSession with Mongo]
+| {gh-samples-url}boot/mongo[HttpSession with Mongo]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Mongo.
 | link:guides/boot-mongo.html[HttpSession with Mongo Guide]
 
-| {gh-samples-url}boot/boot-jdbc[HttpSession with JDBC]
+| {gh-samples-url}boot/jdbc[HttpSession with JDBC]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
 | link:guides/boot-jdbc.html[HttpSession with JDBC Guide]
 
-| {gh-samples-url}boot/boot-findbyusername[Find by Username]
+| {gh-samples-url}boot/findbyusername[Find by Username]
 | Demonstrates how to use Spring Session to find sessions by username.
 | link:guides/boot-findbyusername.html[Find by Username Guide]
 
-| {gh-samples-url}boot/boot-websocket[WebSockets]
+| {gh-samples-url}boot/websocket[WebSockets]
 | Demonstrates how to use Spring Session with WebSockets.
 | link:guides/boot-websocket.html[WebSockets Guide]
 
-| {gh-samples-url}boot/boot-redis-json[HttpSession with Redis JSON serialization]
+| {gh-samples-url}boot/redis-json[HttpSession with Redis JSON serialization]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Redis using JSON serialization.
 | TBD
 
@@ -82,39 +82,39 @@ If you are looking to get started with Spring Session, the best place to start i
 |===
 | Source | Description | Guide
 
-| {gh-samples-url}java/java-redis[HttpSession with Redis]
+| {gh-samples-url}javaconfig/redis[HttpSession with Redis]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Redis.
 | link:guides/java-redis.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}java/java-gemfire-clientserver[HttpSession with GemFire (Client/Server)]
+| {gh-samples-url}javaconfig/gemfire-clientserver[HttpSession with GemFire (Client/Server)]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology.
 | link:guides/java-gemfire-clientserver.html[HttpSession with GemFire (Client/Server) Guide]
 
-| {gh-samples-url}java/java-gemfire-p2p[HttpSession with GemFire (P2P)]
+| {gh-samples-url}javaconfig/gemfire-p2p[HttpSession with GemFire (P2P)]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a P2P topology.
 | link:guides/java-gemfire-p2p.html[HttpSession with GemFire (P2P) Guide]
 
-| {gh-samples-url}java/java-jdbc[HttpSession with JDBC]
+| {gh-samples-url}javaconfig/jdbc[HttpSession with JDBC]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
 | link:guides/java-jdbc.html[HttpSession with JDBC Guide]
 
-| {gh-samples-url}java/java-hazelcast[HttpSession with Hazelcast]
+| {gh-samples-url}javaconfig/hazelcast[HttpSession with Hazelcast]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with Hazelcast.
 | link:guides/java-hazelcast.html[HttpSession with Hazelcast Guide]
 
-| {gh-samples-url}java/java-custom-cookie[Custom Cookie]
+| {gh-samples-url}javaconfig/custom-cookie[Custom Cookie]
 | Demonstrates how to use Spring Session and customize the cookie.
 | link:guides/custom-cookie.html[Custom Cookie Guide]
 
-| {gh-samples-url}java/java-security[Spring Security]
+| {gh-samples-url}javaconfig/security[Spring Security]
 | Demonstrates how to use Spring Session with an existing Spring Security application.
 | link:guides/java-security.html[Spring Security Guide]
 
-| {gh-samples-url}java/java-rest[REST]
+| {gh-samples-url}javaconfig/rest[REST]
 | Demonstrates how to use Spring Session in a REST application to support authenticating with a header.
 | link:guides/java-rest.html[REST Guide]
 
-| {gh-samples-url}java/java-users[Multiple Users]
+| {gh-samples-url}javaconfig/users[Multiple Users]
 | Demonstrates how to use Spring Session to manage multiple simultaneous browser sessions (i.e Google Accounts).
 | link:guides/java-users.html[Multiple Users Guide]
 
@@ -124,19 +124,19 @@ If you are looking to get started with Spring Session, the best place to start i
 |===
 | Source | Description | Guide
 
-| {gh-samples-url}xml/xml-redis[HttpSession with Redis]
+| {gh-samples-url}xml/redis[HttpSession with Redis]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a Redis store.
 | link:guides/xml-redis.html[HttpSession with Redis Guide]
 
-| {gh-samples-url}xml/xml-gemfire-clientserver[HttpSession with GemFire (Client/Server)]
+| {gh-samples-url}xml/gemfire-clientserver[HttpSession with GemFire (Client/Server)]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a Client/Server topology.
 | link:guides/xml-gemfire-clientserver.html[HttpSession with GemFire (Client/Server) Guide]
 
-| {gh-samples-url}xml/xml-gemfire-p2p[HttpSession with GemFire (P2P)]
+| {gh-samples-url}xml/gemfire-p2p[HttpSession with GemFire (P2P)]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with GemFire using a P2P topology.
 | link:guides/xml-gemfire-p2p.html[HttpSession with GemFire (P2P) Guide]
 
-| {gh-samples-url}xml/xml-jdbc[HttpSession with JDBC]
+| {gh-samples-url}xml/jdbc[HttpSession with JDBC]
 | Demonstrates how to use Spring Session to replace the `HttpSession` with a relational database store.
 | link:guides/xml-jdbc.html[HttpSession with JDBC Guide]