From 43d83f639802745980c952a965b25b6d728283d8 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 16 Jan 2017 16:05:36 -0600 Subject: [PATCH] Polish --- docs/build.gradle | 2 + .../asciidoc/guides/boot-findbyusername.adoc | 6 +-- .../docs/asciidoc/guides/boot-gemfire.adoc | 4 +- docs/src/docs/asciidoc/guides/boot-jdbc.adoc | 2 +- docs/src/docs/asciidoc/guides/boot-mongo.adoc | 2 +- docs/src/docs/asciidoc/guides/boot-redis.adoc | 2 +- .../docs/asciidoc/guides/boot-websocket.adoc | 4 +- .../asciidoc/guides/java-custom-cookie.adoc | 2 +- .../guides/java-gemfire-clientserver.adoc | 8 +-- .../asciidoc/guides/java-gemfire-p2p.adoc | 6 +-- .../docs/asciidoc/guides/java-hazelcast.adoc | 4 +- docs/src/docs/asciidoc/guides/java-jdbc.adoc | 6 +-- docs/src/docs/asciidoc/guides/java-redis.adoc | 6 +-- docs/src/docs/asciidoc/guides/java-rest.adoc | 6 +-- .../docs/asciidoc/guides/java-security.adoc | 6 +-- docs/src/docs/asciidoc/guides/java-users.adoc | 6 +-- .../guides/xml-gemfire-clientserver.adoc | 14 ++--- .../docs/asciidoc/guides/xml-gemfire-p2p.adoc | 10 ++-- docs/src/docs/asciidoc/guides/xml-jdbc.adoc | 10 ++-- docs/src/docs/asciidoc/guides/xml-redis.adoc | 10 ++-- docs/src/docs/asciidoc/index.adoc | 40 +++++++------- .../README.adoc | 0 .../build.gradle | 0 .../java/sample/FindByUsernameTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../sample/FindByUsernameApplication.java | 0 .../main/java/sample/config/GeoConfig.java | 0 .../java/sample/config/HttpSessionConfig.java | 0 .../java/sample/config/SecurityConfig.java | 0 .../main/java/sample/mvc/IndexController.java | 0 .../main/java/sample/mvc/LoginController.java | 0 .../java/sample/session/SessionDetails.java | 0 .../sample/session/SessionDetailsFilter.java | 0 .../src/main/resources/GeoLite2-City.mmdb | Bin .../src/main/resources/application.properties | 0 .../static/resources/img/favicon.ico | Bin .../resources/static/resources/img/logo.png | Bin .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/layout.html | 0 .../src/main/resources/templates/login.html | 0 .../session/SessionDetailsFilterTests.java | 0 .../{boot-gemfire => gemfire}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../main/java/sample/client/Application.java | 0 .../java/sample/server/GemFireServer.java | 0 .../src/main/resources/templates/index.html | 0 samples/boot/{boot-jdbc => jdbc}/README.adoc | 0 samples/boot/{boot-jdbc => jdbc}/build.gradle | 0 .../java/sample/BootTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../src/main/java/sample/Application.java | 0 .../java/sample/config/HttpSessionConfig.java | 0 .../java/sample/config/SecurityConfig.java | 0 .../main/java/sample/mvc/IndexController.java | 0 .../src/main/resources/application.properties | 0 .../static/resources/img/favicon.ico | Bin .../resources/static/resources/img/logo.png | Bin .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/layout.html | 0 .../boot/{boot-mongo => mongo}/README.adoc | 0 .../boot/{boot-mongo => mongo}/build.gradle | 0 .../java/sample/BootTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../src/main/java/sample/Application.java | 0 .../java/sample/EmbeddedMongoPortLogger.java | 0 .../java/sample/config/HttpSessionConfig.java | 0 .../java/sample/config/SecurityConfig.java | 0 .../main/java/sample/mvc/IndexController.java | 0 .../src/main/resources/application.properties | 0 .../static/resources/img/favicon.ico | Bin .../resources/static/resources/img/logo.png | Bin .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/layout.html | 0 .../build.gradle | 0 .../java/sample/HttpRedisJsonTest.java | 0 .../java/sample/RedisSerializerTest.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../src/main/java/sample/Application.java | 0 .../java/sample/config/SecurityConfig.java | 0 .../java/sample/config/SessionConfig.java | 0 .../main/java/sample/web/HomeController.java | 0 .../main/java/sample/web/LoginController.java | 0 .../src/main/resources/application.properties | 0 .../resources/css/bootstrap-responsive.css | 0 .../static/resources/css/bootstrap.css | 0 .../static/resources/img/favicon.ico | Bin .../resources/static/resources/img/logo.png | Bin .../src/main/resources/templates/home.html | 0 .../src/main/resources/templates/layout.html | 0 .../src/main/resources/templates/login.html | 0 .../boot/{boot-redis => redis}/README.adoc | 0 .../boot/{boot-redis => redis}/build.gradle | 0 .../java/sample/BootTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../src/main/java/sample/Application.java | 0 .../java/sample/config/HttpSessionConfig.java | 0 .../java/sample/config/SecurityConfig.java | 0 .../main/java/sample/mvc/IndexController.java | 0 .../src/main/resources/application.properties | 0 .../static/resources/img/favicon.ico | Bin .../resources/static/resources/img/logo.png | Bin .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/layout.html | 0 .../build.gradle | 0 .../src/main/java/sample/Application.java | 0 .../java/sample/config/DataSourceConfig.java | 0 .../java/sample/config/WebSecurityConfig.java | 0 .../java/sample/config/WebSocketConfig.java | 0 .../config/WebSocketHandlersConfig.java | 0 .../config/WebSocketSecurityConfig.java | 0 .../java/sample/data/ActiveWebSocketUser.java | 0 .../data/ActiveWebSocketUserRepository.java | 0 .../main/java/sample/data/InstantMessage.java | 0 .../src/main/java/sample/data/User.java | 0 .../main/java/sample/data/UserRepository.java | 0 .../main/java/sample/mvc/CsrfController.java | 0 .../java/sample/mvc/MessageController.java | 0 .../java/sample/security/CurrentUser.java | 0 .../UserRepositoryUserDetailsService.java | 0 .../websocket/WebSocketConnectHandler.java | 0 .../websocket/WebSocketDisconnectHandler.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/data.sql | 0 .../static/resources/img/favicon.ico | Bin .../resources/static/resources/img/logo.png | Bin .../resources/static/resources/js/message.js | 0 .../src/main/resources/templates/index.html | 0 .../src/main/resources/templates/layout.html | 0 .../test/java/sample/ApplicationTests.java | 0 .../custom-cookie}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/Config.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../custom-cookie}/src/main/webapp/index.jsp | 0 .../gemfire-clientserver}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/ClientConfig.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/ServerConfig.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../src/main/webapp/index.jsp | 0 .../gemfire-p2p}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/Config.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../gemfire-p2p}/src/main/webapp/index.jsp | 0 .../hazelcast}/build.gradle | 0 .../java/sample/HazelcastSpringTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../src/main/java/sample/Initializer.java | 0 .../java/sample/ObjectStreamSerializer.java | 0 .../src/main/java/sample/SecurityConfig.java | 0 .../main/java/sample/SecurityInitializer.java | 0 .../src/main/java/sample/SessionConfig.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../hazelcast}/src/main/webapp/index.jsp | 0 .../jdbc}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../jdbc}/src/main/java/sample/Config.java | 0 .../java/sample/H2ConsoleInitializer.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../jdbc}/src/main/webapp/index.jsp | 0 .../redis}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../redis}/src/main/java/sample/Config.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../redis}/src/main/webapp/index.jsp | 0 .../rest}/build.gradle | 0 .../java/rest/RestMockMvcTests.java | 0 .../java/sample/RestTests.java | 0 .../integration-test/java/sample/User.java | 0 .../main/java/sample/HttpSessionConfig.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/SecurityConfig.java | 0 .../main/java/sample/SecurityInitializer.java | 0 .../src/main/java/sample/mvc/MvcConfig.java | 0 .../main/java/sample/mvc/MvcInitializer.java | 0 .../java/sample/mvc/RestDemoController.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../security}/build.gradle | 0 .../java/sample/SecurityTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LoginPage.java | 0 .../src/main/java/sample/Config.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/SecurityConfig.java | 0 .../main/java/sample/SecurityInitializer.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../security}/src/main/webapp/index.jsp | 0 .../users}/build.gradle | 0 .../java/sample/UserTests.java | 0 .../java/sample/pages/BasePage.java | 0 .../java/sample/pages/HomePage.java | 0 .../java/sample/pages/LinkPage.java | 0 .../users}/src/main/java/sample/Account.java | 0 .../users}/src/main/java/sample/Config.java | 0 .../src/main/java/sample/Initializer.java | 0 .../src/main/java/sample/LoginServlet.java | 0 .../src/main/java/sample/LogoutServlet.java | 0 .../main/java/sample/UserAccountsFilter.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../assets/js/ie10-viewport-bug-workaround.js | 0 .../users}/src/main/webapp/index.jsp | 0 .../users}/src/main/webapp/link.jsp | 0 .../build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/Application.java | 0 ...FireCacheServerReadyBeanPostProcessor.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../META-INF/spring/application.properties | 0 .../META-INF/spring/session-server.xml | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../webapp/WEB-INF/spring/session-client.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.jsp | 0 .../build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../main/webapp/WEB-INF/spring/session.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.jsp | 0 samples/xml/{xml-jdbc => jdbc}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../main/webapp/WEB-INF/spring/session.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.jsp | 0 samples/xml/{xml-redis => redis}/build.gradle | 0 .../java/sample/AttributeTests.java | 0 .../java/sample/pages/HomePage.java | 0 .../src/main/java/sample/SessionServlet.java | 0 .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../main/webapp/WEB-INF/spring/session.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.jsp | 0 settings.gradle | 51 ++++++++++-------- 271 files changed, 107 insertions(+), 100 deletions(-) rename samples/boot/{boot-findbyusername => findbyusername}/README.adoc (100%) rename samples/boot/{boot-findbyusername => findbyusername}/build.gradle (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/integration-test/java/sample/FindByUsernameTests.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/FindByUsernameApplication.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/config/GeoConfig.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/config/HttpSessionConfig.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/config/SecurityConfig.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/mvc/IndexController.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/mvc/LoginController.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/session/SessionDetails.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/java/sample/session/SessionDetailsFilter.java (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/GeoLite2-City.mmdb (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/application.properties (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/static/resources/img/favicon.ico (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/static/resources/img/logo.png (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/templates/index.html (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/templates/layout.html (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/main/resources/templates/login.html (100%) rename samples/boot/{boot-findbyusername => findbyusername}/src/test/java/sample/session/SessionDetailsFilterTests.java (100%) rename samples/boot/{boot-gemfire => gemfire}/build.gradle (100%) rename samples/boot/{boot-gemfire => gemfire}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/boot/{boot-gemfire => gemfire}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/boot/{boot-gemfire => gemfire}/src/main/java/sample/client/Application.java (100%) rename samples/boot/{boot-gemfire => gemfire}/src/main/java/sample/server/GemFireServer.java (100%) rename samples/boot/{boot-gemfire => gemfire}/src/main/resources/templates/index.html (100%) rename samples/boot/{boot-jdbc => jdbc}/README.adoc (100%) rename samples/boot/{boot-jdbc => jdbc}/build.gradle (100%) rename samples/boot/{boot-jdbc => jdbc}/src/integration-test/java/sample/BootTests.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/java/sample/Application.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/java/sample/config/HttpSessionConfig.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/java/sample/config/SecurityConfig.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/java/sample/mvc/IndexController.java (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/resources/application.properties (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/resources/static/resources/img/favicon.ico (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/resources/static/resources/img/logo.png (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/resources/templates/index.html (100%) rename samples/boot/{boot-jdbc => jdbc}/src/main/resources/templates/layout.html (100%) rename samples/boot/{boot-mongo => mongo}/README.adoc (100%) rename samples/boot/{boot-mongo => mongo}/build.gradle (100%) rename samples/boot/{boot-mongo => mongo}/src/integration-test/java/sample/BootTests.java (100%) rename samples/boot/{boot-mongo => mongo}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/boot/{boot-mongo => mongo}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/boot/{boot-mongo => mongo}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/boot/{boot-mongo => mongo}/src/main/java/sample/Application.java (100%) rename samples/boot/{boot-mongo => mongo}/src/main/java/sample/EmbeddedMongoPortLogger.java (100%) rename samples/boot/{boot-mongo => mongo}/src/main/java/sample/config/HttpSessionConfig.java (100%) rename samples/boot/{boot-mongo => mongo}/src/main/java/sample/config/SecurityConfig.java (100%) rename samples/boot/{boot-mongo => mongo}/src/main/java/sample/mvc/IndexController.java (100%) rename samples/boot/{boot-mongo => mongo}/src/main/resources/application.properties (100%) rename samples/boot/{boot-mongo => mongo}/src/main/resources/static/resources/img/favicon.ico (100%) rename samples/boot/{boot-mongo => mongo}/src/main/resources/static/resources/img/logo.png (100%) rename samples/boot/{boot-mongo => mongo}/src/main/resources/templates/index.html (100%) rename samples/boot/{boot-mongo => mongo}/src/main/resources/templates/layout.html (100%) rename samples/boot/{boot-redis-json => redis-json}/build.gradle (100%) rename samples/boot/{boot-redis-json => redis-json}/src/integration-test/java/sample/HttpRedisJsonTest.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/integration-test/java/sample/RedisSerializerTest.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/java/sample/Application.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/java/sample/config/SecurityConfig.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/java/sample/config/SessionConfig.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/java/sample/web/HomeController.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/java/sample/web/LoginController.java (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/application.properties (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/static/resources/css/bootstrap-responsive.css (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/static/resources/css/bootstrap.css (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/static/resources/img/favicon.ico (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/static/resources/img/logo.png (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/templates/home.html (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/templates/layout.html (100%) rename samples/boot/{boot-redis-json => redis-json}/src/main/resources/templates/login.html (100%) rename samples/boot/{boot-redis => redis}/README.adoc (100%) rename samples/boot/{boot-redis => redis}/build.gradle (100%) rename samples/boot/{boot-redis => redis}/src/integration-test/java/sample/BootTests.java (100%) rename samples/boot/{boot-redis => redis}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/boot/{boot-redis => redis}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/boot/{boot-redis => redis}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/boot/{boot-redis => redis}/src/main/java/sample/Application.java (100%) rename samples/boot/{boot-redis => redis}/src/main/java/sample/config/HttpSessionConfig.java (100%) rename samples/boot/{boot-redis => redis}/src/main/java/sample/config/SecurityConfig.java (100%) rename samples/boot/{boot-redis => redis}/src/main/java/sample/mvc/IndexController.java (100%) rename samples/boot/{boot-redis => redis}/src/main/resources/application.properties (100%) rename samples/boot/{boot-redis => redis}/src/main/resources/static/resources/img/favicon.ico (100%) rename samples/boot/{boot-redis => redis}/src/main/resources/static/resources/img/logo.png (100%) rename samples/boot/{boot-redis => redis}/src/main/resources/templates/index.html (100%) rename samples/boot/{boot-redis => redis}/src/main/resources/templates/layout.html (100%) rename samples/boot/{boot-websocket => websocket}/build.gradle (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/Application.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/config/DataSourceConfig.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/config/WebSecurityConfig.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/config/WebSocketConfig.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/config/WebSocketHandlersConfig.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/config/WebSocketSecurityConfig.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/data/ActiveWebSocketUser.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/data/ActiveWebSocketUserRepository.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/data/InstantMessage.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/data/User.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/data/UserRepository.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/mvc/CsrfController.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/mvc/MessageController.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/security/CurrentUser.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/security/UserRepositoryUserDetailsService.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/websocket/WebSocketConnectHandler.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/java/sample/websocket/WebSocketDisconnectHandler.java (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/application.properties (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/data.sql (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/static/resources/img/favicon.ico (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/static/resources/img/logo.png (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/static/resources/js/message.js (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/templates/index.html (100%) rename samples/boot/{boot-websocket => websocket}/src/main/resources/templates/layout.html (100%) rename samples/boot/{boot-websocket => websocket}/src/test/java/sample/ApplicationTests.java (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/build.gradle (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/main/java/sample/Config.java (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-custom-cookie => javaconfig/custom-cookie}/src/main/webapp/index.jsp (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/build.gradle (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/main/java/sample/ClientConfig.java (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/main/java/sample/ServerConfig.java (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-gemfire-clientserver => javaconfig/gemfire-clientserver}/src/main/webapp/index.jsp (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/build.gradle (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/main/java/sample/Config.java (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-gemfire-p2p => javaconfig/gemfire-p2p}/src/main/webapp/index.jsp (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/build.gradle (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/integration-test/java/sample/HazelcastSpringTests.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/java/sample/ObjectStreamSerializer.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/java/sample/SecurityConfig.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/java/sample/SecurityInitializer.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/java/sample/SessionConfig.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-hazelcast => javaconfig/hazelcast}/src/main/webapp/index.jsp (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/build.gradle (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/main/java/sample/Config.java (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/main/java/sample/H2ConsoleInitializer.java (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-jdbc => javaconfig/jdbc}/src/main/webapp/index.jsp (100%) rename samples/{java/java-redis => javaconfig/redis}/build.gradle (100%) rename samples/{java/java-redis => javaconfig/redis}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/{java/java-redis => javaconfig/redis}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-redis => javaconfig/redis}/src/main/java/sample/Config.java (100%) rename samples/{java/java-redis => javaconfig/redis}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-redis => javaconfig/redis}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-redis => javaconfig/redis}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-redis => javaconfig/redis}/src/main/webapp/index.jsp (100%) rename samples/{java/java-rest => javaconfig/rest}/build.gradle (100%) rename samples/{java/java-rest => javaconfig/rest}/src/integration-test/java/rest/RestMockMvcTests.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/integration-test/java/sample/RestTests.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/integration-test/java/sample/User.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/HttpSessionConfig.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/SecurityConfig.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/SecurityInitializer.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/mvc/MvcConfig.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/mvc/MvcInitializer.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/java/sample/mvc/RestDemoController.java (100%) rename samples/{java/java-rest => javaconfig/rest}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-security => javaconfig/security}/build.gradle (100%) rename samples/{java/java-security => javaconfig/security}/src/integration-test/java/sample/SecurityTests.java (100%) rename samples/{java/java-security => javaconfig/security}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/{java/java-security => javaconfig/security}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-security => javaconfig/security}/src/integration-test/java/sample/pages/LoginPage.java (100%) rename samples/{java/java-security => javaconfig/security}/src/main/java/sample/Config.java (100%) rename samples/{java/java-security => javaconfig/security}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-security => javaconfig/security}/src/main/java/sample/SecurityConfig.java (100%) rename samples/{java/java-security => javaconfig/security}/src/main/java/sample/SecurityInitializer.java (100%) rename samples/{java/java-security => javaconfig/security}/src/main/java/sample/SessionServlet.java (100%) rename samples/{java/java-security => javaconfig/security}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-security => javaconfig/security}/src/main/webapp/index.jsp (100%) rename samples/{java/java-users => javaconfig/users}/build.gradle (100%) rename samples/{java/java-users => javaconfig/users}/src/integration-test/java/sample/UserTests.java (100%) rename samples/{java/java-users => javaconfig/users}/src/integration-test/java/sample/pages/BasePage.java (100%) rename samples/{java/java-users => javaconfig/users}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/{java/java-users => javaconfig/users}/src/integration-test/java/sample/pages/LinkPage.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/java/sample/Account.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/java/sample/Config.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/java/sample/Initializer.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/java/sample/LoginServlet.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/java/sample/LogoutServlet.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/java/sample/UserAccountsFilter.java (100%) rename samples/{java/java-users => javaconfig/users}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{java/java-users => javaconfig/users}/src/main/webapp/assets/js/ie10-viewport-bug-workaround.js (100%) rename samples/{java/java-users => javaconfig/users}/src/main/webapp/index.jsp (100%) rename samples/{java/java-users => javaconfig/users}/src/main/webapp/link.jsp (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/build.gradle (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/java/sample/Application.java (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/java/sample/SessionServlet.java (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/resources/META-INF/spring/application.properties (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/resources/META-INF/spring/session-server.xml (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/webapp/WEB-INF/spring/session-client.xml (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/webapp/WEB-INF/web.xml (100%) rename samples/xml/{xml-gemfire-clientserver => gemfire-clientserver}/src/main/webapp/index.jsp (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/build.gradle (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/main/java/sample/SessionServlet.java (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/main/webapp/WEB-INF/spring/session.xml (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/main/webapp/WEB-INF/web.xml (100%) rename samples/xml/{xml-gemfire-p2p => gemfire-p2p}/src/main/webapp/index.jsp (100%) rename samples/xml/{xml-jdbc => jdbc}/build.gradle (100%) rename samples/xml/{xml-jdbc => jdbc}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/xml/{xml-jdbc => jdbc}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/xml/{xml-jdbc => jdbc}/src/main/java/sample/SessionServlet.java (100%) rename samples/xml/{xml-jdbc => jdbc}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/xml/{xml-jdbc => jdbc}/src/main/webapp/WEB-INF/spring/session.xml (100%) rename samples/xml/{xml-jdbc => jdbc}/src/main/webapp/WEB-INF/web.xml (100%) rename samples/xml/{xml-jdbc => jdbc}/src/main/webapp/index.jsp (100%) rename samples/xml/{xml-redis => redis}/build.gradle (100%) rename samples/xml/{xml-redis => redis}/src/integration-test/java/sample/AttributeTests.java (100%) rename samples/xml/{xml-redis => redis}/src/integration-test/java/sample/pages/HomePage.java (100%) rename samples/xml/{xml-redis => redis}/src/main/java/sample/SessionServlet.java (100%) rename samples/xml/{xml-redis => redis}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/xml/{xml-redis => redis}/src/main/webapp/WEB-INF/spring/session.xml (100%) rename samples/xml/{xml-redis => redis}/src/main/webapp/WEB-INF/web.xml (100%) rename samples/xml/{xml-redis => redis}/src/main/webapp/index.jsp (100%) diff --git a/docs/build.gradle b/docs/build.gradle index 27dbdf79..9eec151e 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -75,3 +75,5 @@ asciidoctor { 'docinfo1':'true', 'revnumber' : project.version } + +eclipse.project.name = 'spring-session-docs' \ No newline at end of file diff --git a/docs/src/docs/asciidoc/guides/boot-findbyusername.adoc b/docs/src/docs/asciidoc/guides/boot-findbyusername.adoc index bc1d2964..b233e5e6 100644 --- a/docs/src/docs/asciidoc/guides/boot-findbyusername.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/boot-gemfire.adoc b/docs/src/docs/asciidoc/guides/boot-gemfire.adoc index 84c1ea6d..06829fca 100644 --- a/docs/src/docs/asciidoc/guides/boot-gemfire.adoc +++ b/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, diff --git a/docs/src/docs/asciidoc/guides/boot-jdbc.adoc b/docs/src/docs/asciidoc/guides/boot-jdbc.adoc index 5de43546..2755f142 100644 --- a/docs/src/docs/asciidoc/guides/boot-jdbc.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/boot-mongo.adoc b/docs/src/docs/asciidoc/guides/boot-mongo.adoc index 1e965821..b9a63c5b 100644 --- a/docs/src/docs/asciidoc/guides/boot-mongo.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/boot-redis.adoc b/docs/src/docs/asciidoc/guides/boot-redis.adoc index 15fef253..a80c0045 100644 --- a/docs/src/docs/asciidoc/guides/boot-redis.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/boot-websocket.adoc b/docs/src/docs/asciidoc/guides/boot-websocket.adoc index a3786eff..cef009c7 100644 --- a/docs/src/docs/asciidoc/guides/boot-websocket.adoc +++ b/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] ---- ==== diff --git a/docs/src/docs/asciidoc/guides/java-custom-cookie.adoc b/docs/src/docs/asciidoc/guides/java-custom-cookie.adoc index 69c87aff..ddca7f0e 100644 --- a/docs/src/docs/asciidoc/guides/java-custom-cookie.adoc +++ b/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 diff --git a/docs/src/docs/asciidoc/guides/java-gemfire-clientserver.adoc b/docs/src/docs/asciidoc/guides/java-gemfire-clientserver.adoc index ec92b201..5625fa15 100644 --- a/docs/src/docs/asciidoc/guides/java-gemfire-clientserver.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/java-gemfire-p2p.adoc b/docs/src/docs/asciidoc/guides/java-gemfire-p2p.adoc index b6bb53a0..d3c4d7ab 100644 --- a/docs/src/docs/asciidoc/guides/java-gemfire-p2p.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/java-hazelcast.adoc b/docs/src/docs/asciidoc/guides/java-hazelcast.adoc index 92b22194..22e4504d 100644 --- a/docs/src/docs/asciidoc/guides/java-hazelcast.adoc +++ b/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`. diff --git a/docs/src/docs/asciidoc/guides/java-jdbc.adoc b/docs/src/docs/asciidoc/guides/java-jdbc.adoc index 64fa3a3a..8fcac962 100644 --- a/docs/src/docs/asciidoc/guides/java-jdbc.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/java-redis.adoc b/docs/src/docs/asciidoc/guides/java-redis.adoc index 71255f88..a67a952a 100644 --- a/docs/src/docs/asciidoc/guides/java-redis.adoc +++ b/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. diff --git a/docs/src/docs/asciidoc/guides/java-rest.adoc b/docs/src/docs/asciidoc/guides/java-rest.adoc index b7759c56..b8e73109 100644 --- a/docs/src/docs/asciidoc/guides/java-rest.adoc +++ b/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`. diff --git a/docs/src/docs/asciidoc/guides/java-security.adoc b/docs/src/docs/asciidoc/guides/java-security.adoc index 2a019e55..44b6fc04 100644 --- a/docs/src/docs/asciidoc/guides/java-security.adoc +++ b/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`. diff --git a/docs/src/docs/asciidoc/guides/java-users.adoc b/docs/src/docs/asciidoc/guides/java-users.adoc index 651b1c21..334ce19f 100644 --- a/docs/src/docs/asciidoc/guides/java-users.adoc +++ b/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: diff --git a/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc b/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc index a9e599c8..cf0b10ce 100644 --- a/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc +++ b/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 `` 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 `` 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. diff --git a/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc b/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc index a49e5767..e4b09593 100644 --- a/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc +++ b/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 `` 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. diff --git a/docs/src/docs/asciidoc/guides/xml-jdbc.adoc b/docs/src/docs/asciidoc/guides/xml-jdbc.adoc index 00aea9bd..3931d723 100644 --- a/docs/src/docs/asciidoc/guides/xml-jdbc.adoc +++ b/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 `` 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. diff --git a/docs/src/docs/asciidoc/guides/xml-redis.adoc b/docs/src/docs/asciidoc/guides/xml-redis.adoc index 751f7fe5..86134e27 100644 --- a/docs/src/docs/asciidoc/guides/xml-redis.adoc +++ b/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 `` 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. diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc index 14cf31bb..8f0abec8 100644 --- a/docs/src/docs/asciidoc/index.adoc +++ b/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] diff --git a/samples/boot/boot-findbyusername/README.adoc b/samples/boot/findbyusername/README.adoc similarity index 100% rename from samples/boot/boot-findbyusername/README.adoc rename to samples/boot/findbyusername/README.adoc diff --git a/samples/boot/boot-findbyusername/build.gradle b/samples/boot/findbyusername/build.gradle similarity index 100% rename from samples/boot/boot-findbyusername/build.gradle rename to samples/boot/findbyusername/build.gradle diff --git a/samples/boot/boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java b/samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java similarity index 100% rename from samples/boot/boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java rename to samples/boot/findbyusername/src/integration-test/java/sample/FindByUsernameTests.java diff --git a/samples/boot/boot-findbyusername/src/integration-test/java/sample/pages/BasePage.java b/samples/boot/findbyusername/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/boot/boot-findbyusername/src/integration-test/java/sample/pages/BasePage.java rename to samples/boot/findbyusername/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/boot/boot-findbyusername/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/findbyusername/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/boot/boot-findbyusername/src/integration-test/java/sample/pages/HomePage.java rename to samples/boot/findbyusername/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/boot/boot-findbyusername/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/findbyusername/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/boot/boot-findbyusername/src/integration-test/java/sample/pages/LoginPage.java rename to samples/boot/findbyusername/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/FindByUsernameApplication.java b/samples/boot/findbyusername/src/main/java/sample/FindByUsernameApplication.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/FindByUsernameApplication.java rename to samples/boot/findbyusername/src/main/java/sample/FindByUsernameApplication.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/config/GeoConfig.java b/samples/boot/findbyusername/src/main/java/sample/config/GeoConfig.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/config/GeoConfig.java rename to samples/boot/findbyusername/src/main/java/sample/config/GeoConfig.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/config/HttpSessionConfig.java b/samples/boot/findbyusername/src/main/java/sample/config/HttpSessionConfig.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/config/HttpSessionConfig.java rename to samples/boot/findbyusername/src/main/java/sample/config/HttpSessionConfig.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/config/SecurityConfig.java b/samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/config/SecurityConfig.java rename to samples/boot/findbyusername/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/mvc/IndexController.java b/samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/mvc/IndexController.java rename to samples/boot/findbyusername/src/main/java/sample/mvc/IndexController.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/mvc/LoginController.java b/samples/boot/findbyusername/src/main/java/sample/mvc/LoginController.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/mvc/LoginController.java rename to samples/boot/findbyusername/src/main/java/sample/mvc/LoginController.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/session/SessionDetails.java b/samples/boot/findbyusername/src/main/java/sample/session/SessionDetails.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/session/SessionDetails.java rename to samples/boot/findbyusername/src/main/java/sample/session/SessionDetails.java diff --git a/samples/boot/boot-findbyusername/src/main/java/sample/session/SessionDetailsFilter.java b/samples/boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java similarity index 100% rename from samples/boot/boot-findbyusername/src/main/java/sample/session/SessionDetailsFilter.java rename to samples/boot/findbyusername/src/main/java/sample/session/SessionDetailsFilter.java diff --git a/samples/boot/boot-findbyusername/src/main/resources/GeoLite2-City.mmdb b/samples/boot/findbyusername/src/main/resources/GeoLite2-City.mmdb similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/GeoLite2-City.mmdb rename to samples/boot/findbyusername/src/main/resources/GeoLite2-City.mmdb diff --git a/samples/boot/boot-findbyusername/src/main/resources/application.properties b/samples/boot/findbyusername/src/main/resources/application.properties similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/application.properties rename to samples/boot/findbyusername/src/main/resources/application.properties diff --git a/samples/boot/boot-findbyusername/src/main/resources/static/resources/img/favicon.ico b/samples/boot/findbyusername/src/main/resources/static/resources/img/favicon.ico similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/static/resources/img/favicon.ico rename to samples/boot/findbyusername/src/main/resources/static/resources/img/favicon.ico diff --git a/samples/boot/boot-findbyusername/src/main/resources/static/resources/img/logo.png b/samples/boot/findbyusername/src/main/resources/static/resources/img/logo.png similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/static/resources/img/logo.png rename to samples/boot/findbyusername/src/main/resources/static/resources/img/logo.png diff --git a/samples/boot/boot-findbyusername/src/main/resources/templates/index.html b/samples/boot/findbyusername/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/templates/index.html rename to samples/boot/findbyusername/src/main/resources/templates/index.html diff --git a/samples/boot/boot-findbyusername/src/main/resources/templates/layout.html b/samples/boot/findbyusername/src/main/resources/templates/layout.html similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/templates/layout.html rename to samples/boot/findbyusername/src/main/resources/templates/layout.html diff --git a/samples/boot/boot-findbyusername/src/main/resources/templates/login.html b/samples/boot/findbyusername/src/main/resources/templates/login.html similarity index 100% rename from samples/boot/boot-findbyusername/src/main/resources/templates/login.html rename to samples/boot/findbyusername/src/main/resources/templates/login.html diff --git a/samples/boot/boot-findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java b/samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java similarity index 100% rename from samples/boot/boot-findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java rename to samples/boot/findbyusername/src/test/java/sample/session/SessionDetailsFilterTests.java diff --git a/samples/boot/boot-gemfire/build.gradle b/samples/boot/gemfire/build.gradle similarity index 100% rename from samples/boot/boot-gemfire/build.gradle rename to samples/boot/gemfire/build.gradle diff --git a/samples/boot/boot-gemfire/src/integration-test/java/sample/AttributeTests.java b/samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/boot/boot-gemfire/src/integration-test/java/sample/AttributeTests.java rename to samples/boot/gemfire/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/boot/boot-gemfire/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/boot/boot-gemfire/src/integration-test/java/sample/pages/HomePage.java rename to samples/boot/gemfire/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/boot/boot-gemfire/src/main/java/sample/client/Application.java b/samples/boot/gemfire/src/main/java/sample/client/Application.java similarity index 100% rename from samples/boot/boot-gemfire/src/main/java/sample/client/Application.java rename to samples/boot/gemfire/src/main/java/sample/client/Application.java diff --git a/samples/boot/boot-gemfire/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java similarity index 100% rename from samples/boot/boot-gemfire/src/main/java/sample/server/GemFireServer.java rename to samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java diff --git a/samples/boot/boot-gemfire/src/main/resources/templates/index.html b/samples/boot/gemfire/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/boot-gemfire/src/main/resources/templates/index.html rename to samples/boot/gemfire/src/main/resources/templates/index.html diff --git a/samples/boot/boot-jdbc/README.adoc b/samples/boot/jdbc/README.adoc similarity index 100% rename from samples/boot/boot-jdbc/README.adoc rename to samples/boot/jdbc/README.adoc diff --git a/samples/boot/boot-jdbc/build.gradle b/samples/boot/jdbc/build.gradle similarity index 100% rename from samples/boot/boot-jdbc/build.gradle rename to samples/boot/jdbc/build.gradle diff --git a/samples/boot/boot-jdbc/src/integration-test/java/sample/BootTests.java b/samples/boot/jdbc/src/integration-test/java/sample/BootTests.java similarity index 100% rename from samples/boot/boot-jdbc/src/integration-test/java/sample/BootTests.java rename to samples/boot/jdbc/src/integration-test/java/sample/BootTests.java diff --git a/samples/boot/boot-jdbc/src/integration-test/java/sample/pages/BasePage.java b/samples/boot/jdbc/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/boot/boot-jdbc/src/integration-test/java/sample/pages/BasePage.java rename to samples/boot/jdbc/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/boot/boot-jdbc/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/jdbc/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/boot/boot-jdbc/src/integration-test/java/sample/pages/HomePage.java rename to samples/boot/jdbc/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/boot/boot-jdbc/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/jdbc/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/boot/boot-jdbc/src/integration-test/java/sample/pages/LoginPage.java rename to samples/boot/jdbc/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/boot/boot-jdbc/src/main/java/sample/Application.java b/samples/boot/jdbc/src/main/java/sample/Application.java similarity index 100% rename from samples/boot/boot-jdbc/src/main/java/sample/Application.java rename to samples/boot/jdbc/src/main/java/sample/Application.java diff --git a/samples/boot/boot-jdbc/src/main/java/sample/config/HttpSessionConfig.java b/samples/boot/jdbc/src/main/java/sample/config/HttpSessionConfig.java similarity index 100% rename from samples/boot/boot-jdbc/src/main/java/sample/config/HttpSessionConfig.java rename to samples/boot/jdbc/src/main/java/sample/config/HttpSessionConfig.java diff --git a/samples/boot/boot-jdbc/src/main/java/sample/config/SecurityConfig.java b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/boot-jdbc/src/main/java/sample/config/SecurityConfig.java rename to samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/boot-jdbc/src/main/java/sample/mvc/IndexController.java b/samples/boot/jdbc/src/main/java/sample/mvc/IndexController.java similarity index 100% rename from samples/boot/boot-jdbc/src/main/java/sample/mvc/IndexController.java rename to samples/boot/jdbc/src/main/java/sample/mvc/IndexController.java diff --git a/samples/boot/boot-jdbc/src/main/resources/application.properties b/samples/boot/jdbc/src/main/resources/application.properties similarity index 100% rename from samples/boot/boot-jdbc/src/main/resources/application.properties rename to samples/boot/jdbc/src/main/resources/application.properties diff --git a/samples/boot/boot-jdbc/src/main/resources/static/resources/img/favicon.ico b/samples/boot/jdbc/src/main/resources/static/resources/img/favicon.ico similarity index 100% rename from samples/boot/boot-jdbc/src/main/resources/static/resources/img/favicon.ico rename to samples/boot/jdbc/src/main/resources/static/resources/img/favicon.ico diff --git a/samples/boot/boot-jdbc/src/main/resources/static/resources/img/logo.png b/samples/boot/jdbc/src/main/resources/static/resources/img/logo.png similarity index 100% rename from samples/boot/boot-jdbc/src/main/resources/static/resources/img/logo.png rename to samples/boot/jdbc/src/main/resources/static/resources/img/logo.png diff --git a/samples/boot/boot-jdbc/src/main/resources/templates/index.html b/samples/boot/jdbc/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/boot-jdbc/src/main/resources/templates/index.html rename to samples/boot/jdbc/src/main/resources/templates/index.html diff --git a/samples/boot/boot-jdbc/src/main/resources/templates/layout.html b/samples/boot/jdbc/src/main/resources/templates/layout.html similarity index 100% rename from samples/boot/boot-jdbc/src/main/resources/templates/layout.html rename to samples/boot/jdbc/src/main/resources/templates/layout.html diff --git a/samples/boot/boot-mongo/README.adoc b/samples/boot/mongo/README.adoc similarity index 100% rename from samples/boot/boot-mongo/README.adoc rename to samples/boot/mongo/README.adoc diff --git a/samples/boot/boot-mongo/build.gradle b/samples/boot/mongo/build.gradle similarity index 100% rename from samples/boot/boot-mongo/build.gradle rename to samples/boot/mongo/build.gradle diff --git a/samples/boot/boot-mongo/src/integration-test/java/sample/BootTests.java b/samples/boot/mongo/src/integration-test/java/sample/BootTests.java similarity index 100% rename from samples/boot/boot-mongo/src/integration-test/java/sample/BootTests.java rename to samples/boot/mongo/src/integration-test/java/sample/BootTests.java diff --git a/samples/boot/boot-mongo/src/integration-test/java/sample/pages/BasePage.java b/samples/boot/mongo/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/boot/boot-mongo/src/integration-test/java/sample/pages/BasePage.java rename to samples/boot/mongo/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/boot/boot-mongo/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/mongo/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/boot/boot-mongo/src/integration-test/java/sample/pages/HomePage.java rename to samples/boot/mongo/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/boot/boot-mongo/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/mongo/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/boot/boot-mongo/src/integration-test/java/sample/pages/LoginPage.java rename to samples/boot/mongo/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/boot/boot-mongo/src/main/java/sample/Application.java b/samples/boot/mongo/src/main/java/sample/Application.java similarity index 100% rename from samples/boot/boot-mongo/src/main/java/sample/Application.java rename to samples/boot/mongo/src/main/java/sample/Application.java diff --git a/samples/boot/boot-mongo/src/main/java/sample/EmbeddedMongoPortLogger.java b/samples/boot/mongo/src/main/java/sample/EmbeddedMongoPortLogger.java similarity index 100% rename from samples/boot/boot-mongo/src/main/java/sample/EmbeddedMongoPortLogger.java rename to samples/boot/mongo/src/main/java/sample/EmbeddedMongoPortLogger.java diff --git a/samples/boot/boot-mongo/src/main/java/sample/config/HttpSessionConfig.java b/samples/boot/mongo/src/main/java/sample/config/HttpSessionConfig.java similarity index 100% rename from samples/boot/boot-mongo/src/main/java/sample/config/HttpSessionConfig.java rename to samples/boot/mongo/src/main/java/sample/config/HttpSessionConfig.java diff --git a/samples/boot/boot-mongo/src/main/java/sample/config/SecurityConfig.java b/samples/boot/mongo/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/boot-mongo/src/main/java/sample/config/SecurityConfig.java rename to samples/boot/mongo/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/boot-mongo/src/main/java/sample/mvc/IndexController.java b/samples/boot/mongo/src/main/java/sample/mvc/IndexController.java similarity index 100% rename from samples/boot/boot-mongo/src/main/java/sample/mvc/IndexController.java rename to samples/boot/mongo/src/main/java/sample/mvc/IndexController.java diff --git a/samples/boot/boot-mongo/src/main/resources/application.properties b/samples/boot/mongo/src/main/resources/application.properties similarity index 100% rename from samples/boot/boot-mongo/src/main/resources/application.properties rename to samples/boot/mongo/src/main/resources/application.properties diff --git a/samples/boot/boot-mongo/src/main/resources/static/resources/img/favicon.ico b/samples/boot/mongo/src/main/resources/static/resources/img/favicon.ico similarity index 100% rename from samples/boot/boot-mongo/src/main/resources/static/resources/img/favicon.ico rename to samples/boot/mongo/src/main/resources/static/resources/img/favicon.ico diff --git a/samples/boot/boot-mongo/src/main/resources/static/resources/img/logo.png b/samples/boot/mongo/src/main/resources/static/resources/img/logo.png similarity index 100% rename from samples/boot/boot-mongo/src/main/resources/static/resources/img/logo.png rename to samples/boot/mongo/src/main/resources/static/resources/img/logo.png diff --git a/samples/boot/boot-mongo/src/main/resources/templates/index.html b/samples/boot/mongo/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/boot-mongo/src/main/resources/templates/index.html rename to samples/boot/mongo/src/main/resources/templates/index.html diff --git a/samples/boot/boot-mongo/src/main/resources/templates/layout.html b/samples/boot/mongo/src/main/resources/templates/layout.html similarity index 100% rename from samples/boot/boot-mongo/src/main/resources/templates/layout.html rename to samples/boot/mongo/src/main/resources/templates/layout.html diff --git a/samples/boot/boot-redis-json/build.gradle b/samples/boot/redis-json/build.gradle similarity index 100% rename from samples/boot/boot-redis-json/build.gradle rename to samples/boot/redis-json/build.gradle diff --git a/samples/boot/boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java b/samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java similarity index 100% rename from samples/boot/boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java rename to samples/boot/redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java diff --git a/samples/boot/boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java b/samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java similarity index 100% rename from samples/boot/boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java rename to samples/boot/redis-json/src/integration-test/java/sample/RedisSerializerTest.java diff --git a/samples/boot/boot-redis-json/src/integration-test/java/sample/pages/BasePage.java b/samples/boot/redis-json/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/boot/boot-redis-json/src/integration-test/java/sample/pages/BasePage.java rename to samples/boot/redis-json/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/boot/boot-redis-json/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/redis-json/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/boot/boot-redis-json/src/integration-test/java/sample/pages/HomePage.java rename to samples/boot/redis-json/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/boot/boot-redis-json/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/redis-json/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/boot/boot-redis-json/src/integration-test/java/sample/pages/LoginPage.java rename to samples/boot/redis-json/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/boot/boot-redis-json/src/main/java/sample/Application.java b/samples/boot/redis-json/src/main/java/sample/Application.java similarity index 100% rename from samples/boot/boot-redis-json/src/main/java/sample/Application.java rename to samples/boot/redis-json/src/main/java/sample/Application.java diff --git a/samples/boot/boot-redis-json/src/main/java/sample/config/SecurityConfig.java b/samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/boot-redis-json/src/main/java/sample/config/SecurityConfig.java rename to samples/boot/redis-json/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/boot-redis-json/src/main/java/sample/config/SessionConfig.java b/samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java similarity index 100% rename from samples/boot/boot-redis-json/src/main/java/sample/config/SessionConfig.java rename to samples/boot/redis-json/src/main/java/sample/config/SessionConfig.java diff --git a/samples/boot/boot-redis-json/src/main/java/sample/web/HomeController.java b/samples/boot/redis-json/src/main/java/sample/web/HomeController.java similarity index 100% rename from samples/boot/boot-redis-json/src/main/java/sample/web/HomeController.java rename to samples/boot/redis-json/src/main/java/sample/web/HomeController.java diff --git a/samples/boot/boot-redis-json/src/main/java/sample/web/LoginController.java b/samples/boot/redis-json/src/main/java/sample/web/LoginController.java similarity index 100% rename from samples/boot/boot-redis-json/src/main/java/sample/web/LoginController.java rename to samples/boot/redis-json/src/main/java/sample/web/LoginController.java diff --git a/samples/boot/boot-redis-json/src/main/resources/application.properties b/samples/boot/redis-json/src/main/resources/application.properties similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/application.properties rename to samples/boot/redis-json/src/main/resources/application.properties diff --git a/samples/boot/boot-redis-json/src/main/resources/static/resources/css/bootstrap-responsive.css b/samples/boot/redis-json/src/main/resources/static/resources/css/bootstrap-responsive.css similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/static/resources/css/bootstrap-responsive.css rename to samples/boot/redis-json/src/main/resources/static/resources/css/bootstrap-responsive.css diff --git a/samples/boot/boot-redis-json/src/main/resources/static/resources/css/bootstrap.css b/samples/boot/redis-json/src/main/resources/static/resources/css/bootstrap.css similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/static/resources/css/bootstrap.css rename to samples/boot/redis-json/src/main/resources/static/resources/css/bootstrap.css diff --git a/samples/boot/boot-redis-json/src/main/resources/static/resources/img/favicon.ico b/samples/boot/redis-json/src/main/resources/static/resources/img/favicon.ico similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/static/resources/img/favicon.ico rename to samples/boot/redis-json/src/main/resources/static/resources/img/favicon.ico diff --git a/samples/boot/boot-redis-json/src/main/resources/static/resources/img/logo.png b/samples/boot/redis-json/src/main/resources/static/resources/img/logo.png similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/static/resources/img/logo.png rename to samples/boot/redis-json/src/main/resources/static/resources/img/logo.png diff --git a/samples/boot/boot-redis-json/src/main/resources/templates/home.html b/samples/boot/redis-json/src/main/resources/templates/home.html similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/templates/home.html rename to samples/boot/redis-json/src/main/resources/templates/home.html diff --git a/samples/boot/boot-redis-json/src/main/resources/templates/layout.html b/samples/boot/redis-json/src/main/resources/templates/layout.html similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/templates/layout.html rename to samples/boot/redis-json/src/main/resources/templates/layout.html diff --git a/samples/boot/boot-redis-json/src/main/resources/templates/login.html b/samples/boot/redis-json/src/main/resources/templates/login.html similarity index 100% rename from samples/boot/boot-redis-json/src/main/resources/templates/login.html rename to samples/boot/redis-json/src/main/resources/templates/login.html diff --git a/samples/boot/boot-redis/README.adoc b/samples/boot/redis/README.adoc similarity index 100% rename from samples/boot/boot-redis/README.adoc rename to samples/boot/redis/README.adoc diff --git a/samples/boot/boot-redis/build.gradle b/samples/boot/redis/build.gradle similarity index 100% rename from samples/boot/boot-redis/build.gradle rename to samples/boot/redis/build.gradle diff --git a/samples/boot/boot-redis/src/integration-test/java/sample/BootTests.java b/samples/boot/redis/src/integration-test/java/sample/BootTests.java similarity index 100% rename from samples/boot/boot-redis/src/integration-test/java/sample/BootTests.java rename to samples/boot/redis/src/integration-test/java/sample/BootTests.java diff --git a/samples/boot/boot-redis/src/integration-test/java/sample/pages/BasePage.java b/samples/boot/redis/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/boot/boot-redis/src/integration-test/java/sample/pages/BasePage.java rename to samples/boot/redis/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/boot/boot-redis/src/integration-test/java/sample/pages/HomePage.java b/samples/boot/redis/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/boot/boot-redis/src/integration-test/java/sample/pages/HomePage.java rename to samples/boot/redis/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/boot/boot-redis/src/integration-test/java/sample/pages/LoginPage.java b/samples/boot/redis/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/boot/boot-redis/src/integration-test/java/sample/pages/LoginPage.java rename to samples/boot/redis/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/boot/boot-redis/src/main/java/sample/Application.java b/samples/boot/redis/src/main/java/sample/Application.java similarity index 100% rename from samples/boot/boot-redis/src/main/java/sample/Application.java rename to samples/boot/redis/src/main/java/sample/Application.java diff --git a/samples/boot/boot-redis/src/main/java/sample/config/HttpSessionConfig.java b/samples/boot/redis/src/main/java/sample/config/HttpSessionConfig.java similarity index 100% rename from samples/boot/boot-redis/src/main/java/sample/config/HttpSessionConfig.java rename to samples/boot/redis/src/main/java/sample/config/HttpSessionConfig.java diff --git a/samples/boot/boot-redis/src/main/java/sample/config/SecurityConfig.java b/samples/boot/redis/src/main/java/sample/config/SecurityConfig.java similarity index 100% rename from samples/boot/boot-redis/src/main/java/sample/config/SecurityConfig.java rename to samples/boot/redis/src/main/java/sample/config/SecurityConfig.java diff --git a/samples/boot/boot-redis/src/main/java/sample/mvc/IndexController.java b/samples/boot/redis/src/main/java/sample/mvc/IndexController.java similarity index 100% rename from samples/boot/boot-redis/src/main/java/sample/mvc/IndexController.java rename to samples/boot/redis/src/main/java/sample/mvc/IndexController.java diff --git a/samples/boot/boot-redis/src/main/resources/application.properties b/samples/boot/redis/src/main/resources/application.properties similarity index 100% rename from samples/boot/boot-redis/src/main/resources/application.properties rename to samples/boot/redis/src/main/resources/application.properties diff --git a/samples/boot/boot-redis/src/main/resources/static/resources/img/favicon.ico b/samples/boot/redis/src/main/resources/static/resources/img/favicon.ico similarity index 100% rename from samples/boot/boot-redis/src/main/resources/static/resources/img/favicon.ico rename to samples/boot/redis/src/main/resources/static/resources/img/favicon.ico diff --git a/samples/boot/boot-redis/src/main/resources/static/resources/img/logo.png b/samples/boot/redis/src/main/resources/static/resources/img/logo.png similarity index 100% rename from samples/boot/boot-redis/src/main/resources/static/resources/img/logo.png rename to samples/boot/redis/src/main/resources/static/resources/img/logo.png diff --git a/samples/boot/boot-redis/src/main/resources/templates/index.html b/samples/boot/redis/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/boot-redis/src/main/resources/templates/index.html rename to samples/boot/redis/src/main/resources/templates/index.html diff --git a/samples/boot/boot-redis/src/main/resources/templates/layout.html b/samples/boot/redis/src/main/resources/templates/layout.html similarity index 100% rename from samples/boot/boot-redis/src/main/resources/templates/layout.html rename to samples/boot/redis/src/main/resources/templates/layout.html diff --git a/samples/boot/boot-websocket/build.gradle b/samples/boot/websocket/build.gradle similarity index 100% rename from samples/boot/boot-websocket/build.gradle rename to samples/boot/websocket/build.gradle diff --git a/samples/boot/boot-websocket/src/main/java/sample/Application.java b/samples/boot/websocket/src/main/java/sample/Application.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/Application.java rename to samples/boot/websocket/src/main/java/sample/Application.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/config/DataSourceConfig.java b/samples/boot/websocket/src/main/java/sample/config/DataSourceConfig.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/config/DataSourceConfig.java rename to samples/boot/websocket/src/main/java/sample/config/DataSourceConfig.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/config/WebSecurityConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/config/WebSecurityConfig.java rename to samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/config/WebSocketConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSocketConfig.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/config/WebSocketConfig.java rename to samples/boot/websocket/src/main/java/sample/config/WebSocketConfig.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/config/WebSocketHandlersConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSocketHandlersConfig.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/config/WebSocketHandlersConfig.java rename to samples/boot/websocket/src/main/java/sample/config/WebSocketHandlersConfig.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/config/WebSocketSecurityConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSocketSecurityConfig.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/config/WebSocketSecurityConfig.java rename to samples/boot/websocket/src/main/java/sample/config/WebSocketSecurityConfig.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/data/ActiveWebSocketUser.java b/samples/boot/websocket/src/main/java/sample/data/ActiveWebSocketUser.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/data/ActiveWebSocketUser.java rename to samples/boot/websocket/src/main/java/sample/data/ActiveWebSocketUser.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/data/ActiveWebSocketUserRepository.java b/samples/boot/websocket/src/main/java/sample/data/ActiveWebSocketUserRepository.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/data/ActiveWebSocketUserRepository.java rename to samples/boot/websocket/src/main/java/sample/data/ActiveWebSocketUserRepository.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/data/InstantMessage.java b/samples/boot/websocket/src/main/java/sample/data/InstantMessage.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/data/InstantMessage.java rename to samples/boot/websocket/src/main/java/sample/data/InstantMessage.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/data/User.java b/samples/boot/websocket/src/main/java/sample/data/User.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/data/User.java rename to samples/boot/websocket/src/main/java/sample/data/User.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/data/UserRepository.java b/samples/boot/websocket/src/main/java/sample/data/UserRepository.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/data/UserRepository.java rename to samples/boot/websocket/src/main/java/sample/data/UserRepository.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/mvc/CsrfController.java b/samples/boot/websocket/src/main/java/sample/mvc/CsrfController.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/mvc/CsrfController.java rename to samples/boot/websocket/src/main/java/sample/mvc/CsrfController.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/mvc/MessageController.java b/samples/boot/websocket/src/main/java/sample/mvc/MessageController.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/mvc/MessageController.java rename to samples/boot/websocket/src/main/java/sample/mvc/MessageController.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/security/CurrentUser.java b/samples/boot/websocket/src/main/java/sample/security/CurrentUser.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/security/CurrentUser.java rename to samples/boot/websocket/src/main/java/sample/security/CurrentUser.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java b/samples/boot/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java rename to samples/boot/websocket/src/main/java/sample/security/UserRepositoryUserDetailsService.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java b/samples/boot/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java rename to samples/boot/websocket/src/main/java/sample/websocket/WebSocketConnectHandler.java diff --git a/samples/boot/boot-websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java b/samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java similarity index 100% rename from samples/boot/boot-websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java rename to samples/boot/websocket/src/main/java/sample/websocket/WebSocketDisconnectHandler.java diff --git a/samples/boot/boot-websocket/src/main/resources/application.properties b/samples/boot/websocket/src/main/resources/application.properties similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/application.properties rename to samples/boot/websocket/src/main/resources/application.properties diff --git a/samples/boot/boot-websocket/src/main/resources/data.sql b/samples/boot/websocket/src/main/resources/data.sql similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/data.sql rename to samples/boot/websocket/src/main/resources/data.sql diff --git a/samples/boot/boot-websocket/src/main/resources/static/resources/img/favicon.ico b/samples/boot/websocket/src/main/resources/static/resources/img/favicon.ico similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/static/resources/img/favicon.ico rename to samples/boot/websocket/src/main/resources/static/resources/img/favicon.ico diff --git a/samples/boot/boot-websocket/src/main/resources/static/resources/img/logo.png b/samples/boot/websocket/src/main/resources/static/resources/img/logo.png similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/static/resources/img/logo.png rename to samples/boot/websocket/src/main/resources/static/resources/img/logo.png diff --git a/samples/boot/boot-websocket/src/main/resources/static/resources/js/message.js b/samples/boot/websocket/src/main/resources/static/resources/js/message.js similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/static/resources/js/message.js rename to samples/boot/websocket/src/main/resources/static/resources/js/message.js diff --git a/samples/boot/boot-websocket/src/main/resources/templates/index.html b/samples/boot/websocket/src/main/resources/templates/index.html similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/templates/index.html rename to samples/boot/websocket/src/main/resources/templates/index.html diff --git a/samples/boot/boot-websocket/src/main/resources/templates/layout.html b/samples/boot/websocket/src/main/resources/templates/layout.html similarity index 100% rename from samples/boot/boot-websocket/src/main/resources/templates/layout.html rename to samples/boot/websocket/src/main/resources/templates/layout.html diff --git a/samples/boot/boot-websocket/src/test/java/sample/ApplicationTests.java b/samples/boot/websocket/src/test/java/sample/ApplicationTests.java similarity index 100% rename from samples/boot/boot-websocket/src/test/java/sample/ApplicationTests.java rename to samples/boot/websocket/src/test/java/sample/ApplicationTests.java diff --git a/samples/java/java-custom-cookie/build.gradle b/samples/javaconfig/custom-cookie/build.gradle similarity index 100% rename from samples/java/java-custom-cookie/build.gradle rename to samples/javaconfig/custom-cookie/build.gradle diff --git a/samples/java/java-custom-cookie/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/custom-cookie/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/java/java-custom-cookie/src/integration-test/java/sample/AttributeTests.java rename to samples/javaconfig/custom-cookie/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/java/java-custom-cookie/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/custom-cookie/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-custom-cookie/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/custom-cookie/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-custom-cookie/src/main/java/sample/Config.java b/samples/javaconfig/custom-cookie/src/main/java/sample/Config.java similarity index 100% rename from samples/java/java-custom-cookie/src/main/java/sample/Config.java rename to samples/javaconfig/custom-cookie/src/main/java/sample/Config.java diff --git a/samples/java/java-custom-cookie/src/main/java/sample/Initializer.java b/samples/javaconfig/custom-cookie/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-custom-cookie/src/main/java/sample/Initializer.java rename to samples/javaconfig/custom-cookie/src/main/java/sample/Initializer.java diff --git a/samples/java/java-custom-cookie/src/main/java/sample/SessionServlet.java b/samples/javaconfig/custom-cookie/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-custom-cookie/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/custom-cookie/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-custom-cookie/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/custom-cookie/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-custom-cookie/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/custom-cookie/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-custom-cookie/src/main/webapp/index.jsp b/samples/javaconfig/custom-cookie/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-custom-cookie/src/main/webapp/index.jsp rename to samples/javaconfig/custom-cookie/src/main/webapp/index.jsp diff --git a/samples/java/java-gemfire-clientserver/build.gradle b/samples/javaconfig/gemfire-clientserver/build.gradle similarity index 100% rename from samples/java/java-gemfire-clientserver/build.gradle rename to samples/javaconfig/gemfire-clientserver/build.gradle diff --git a/samples/java/java-gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/java/java-gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java rename to samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/java/java-gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-gemfire-clientserver/src/main/java/sample/ClientConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java similarity index 100% rename from samples/java/java-gemfire-clientserver/src/main/java/sample/ClientConfig.java rename to samples/javaconfig/gemfire-clientserver/src/main/java/sample/ClientConfig.java diff --git a/samples/java/java-gemfire-clientserver/src/main/java/sample/Initializer.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-gemfire-clientserver/src/main/java/sample/Initializer.java rename to samples/javaconfig/gemfire-clientserver/src/main/java/sample/Initializer.java diff --git a/samples/java/java-gemfire-clientserver/src/main/java/sample/ServerConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java similarity index 100% rename from samples/java/java-gemfire-clientserver/src/main/java/sample/ServerConfig.java rename to samples/javaconfig/gemfire-clientserver/src/main/java/sample/ServerConfig.java diff --git a/samples/java/java-gemfire-clientserver/src/main/java/sample/SessionServlet.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-gemfire-clientserver/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/gemfire-clientserver/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-gemfire-clientserver/src/main/webapp/index.jsp b/samples/javaconfig/gemfire-clientserver/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-gemfire-clientserver/src/main/webapp/index.jsp rename to samples/javaconfig/gemfire-clientserver/src/main/webapp/index.jsp diff --git a/samples/java/java-gemfire-p2p/build.gradle b/samples/javaconfig/gemfire-p2p/build.gradle similarity index 100% rename from samples/java/java-gemfire-p2p/build.gradle rename to samples/javaconfig/gemfire-p2p/build.gradle diff --git a/samples/java/java-gemfire-p2p/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/java/java-gemfire-p2p/src/integration-test/java/sample/AttributeTests.java rename to samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/java/java-gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-gemfire-p2p/src/main/java/sample/Config.java b/samples/javaconfig/gemfire-p2p/src/main/java/sample/Config.java similarity index 100% rename from samples/java/java-gemfire-p2p/src/main/java/sample/Config.java rename to samples/javaconfig/gemfire-p2p/src/main/java/sample/Config.java diff --git a/samples/java/java-gemfire-p2p/src/main/java/sample/Initializer.java b/samples/javaconfig/gemfire-p2p/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-gemfire-p2p/src/main/java/sample/Initializer.java rename to samples/javaconfig/gemfire-p2p/src/main/java/sample/Initializer.java diff --git a/samples/java/java-gemfire-p2p/src/main/java/sample/SessionServlet.java b/samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-gemfire-p2p/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/gemfire-p2p/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-gemfire-p2p/src/main/webapp/index.jsp b/samples/javaconfig/gemfire-p2p/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-gemfire-p2p/src/main/webapp/index.jsp rename to samples/javaconfig/gemfire-p2p/src/main/webapp/index.jsp diff --git a/samples/java/java-hazelcast/build.gradle b/samples/javaconfig/hazelcast/build.gradle similarity index 100% rename from samples/java/java-hazelcast/build.gradle rename to samples/javaconfig/hazelcast/build.gradle diff --git a/samples/java/java-hazelcast/src/integration-test/java/sample/HazelcastSpringTests.java b/samples/javaconfig/hazelcast/src/integration-test/java/sample/HazelcastSpringTests.java similarity index 100% rename from samples/java/java-hazelcast/src/integration-test/java/sample/HazelcastSpringTests.java rename to samples/javaconfig/hazelcast/src/integration-test/java/sample/HazelcastSpringTests.java diff --git a/samples/java/java-hazelcast/src/integration-test/java/sample/pages/BasePage.java b/samples/javaconfig/hazelcast/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/java/java-hazelcast/src/integration-test/java/sample/pages/BasePage.java rename to samples/javaconfig/hazelcast/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/java/java-hazelcast/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/hazelcast/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-hazelcast/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/hazelcast/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-hazelcast/src/integration-test/java/sample/pages/LoginPage.java b/samples/javaconfig/hazelcast/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/java/java-hazelcast/src/integration-test/java/sample/pages/LoginPage.java rename to samples/javaconfig/hazelcast/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/java/java-hazelcast/src/main/java/sample/Initializer.java b/samples/javaconfig/hazelcast/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-hazelcast/src/main/java/sample/Initializer.java rename to samples/javaconfig/hazelcast/src/main/java/sample/Initializer.java diff --git a/samples/java/java-hazelcast/src/main/java/sample/ObjectStreamSerializer.java b/samples/javaconfig/hazelcast/src/main/java/sample/ObjectStreamSerializer.java similarity index 100% rename from samples/java/java-hazelcast/src/main/java/sample/ObjectStreamSerializer.java rename to samples/javaconfig/hazelcast/src/main/java/sample/ObjectStreamSerializer.java diff --git a/samples/java/java-hazelcast/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java similarity index 100% rename from samples/java/java-hazelcast/src/main/java/sample/SecurityConfig.java rename to samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java diff --git a/samples/java/java-hazelcast/src/main/java/sample/SecurityInitializer.java b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityInitializer.java similarity index 100% rename from samples/java/java-hazelcast/src/main/java/sample/SecurityInitializer.java rename to samples/javaconfig/hazelcast/src/main/java/sample/SecurityInitializer.java diff --git a/samples/java/java-hazelcast/src/main/java/sample/SessionConfig.java b/samples/javaconfig/hazelcast/src/main/java/sample/SessionConfig.java similarity index 100% rename from samples/java/java-hazelcast/src/main/java/sample/SessionConfig.java rename to samples/javaconfig/hazelcast/src/main/java/sample/SessionConfig.java diff --git a/samples/java/java-hazelcast/src/main/java/sample/SessionServlet.java b/samples/javaconfig/hazelcast/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-hazelcast/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/hazelcast/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-hazelcast/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/hazelcast/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-hazelcast/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/hazelcast/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-hazelcast/src/main/webapp/index.jsp b/samples/javaconfig/hazelcast/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-hazelcast/src/main/webapp/index.jsp rename to samples/javaconfig/hazelcast/src/main/webapp/index.jsp diff --git a/samples/java/java-jdbc/build.gradle b/samples/javaconfig/jdbc/build.gradle similarity index 100% rename from samples/java/java-jdbc/build.gradle rename to samples/javaconfig/jdbc/build.gradle diff --git a/samples/java/java-jdbc/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/jdbc/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/java/java-jdbc/src/integration-test/java/sample/AttributeTests.java rename to samples/javaconfig/jdbc/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/java/java-jdbc/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/jdbc/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-jdbc/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/jdbc/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-jdbc/src/main/java/sample/Config.java b/samples/javaconfig/jdbc/src/main/java/sample/Config.java similarity index 100% rename from samples/java/java-jdbc/src/main/java/sample/Config.java rename to samples/javaconfig/jdbc/src/main/java/sample/Config.java diff --git a/samples/java/java-jdbc/src/main/java/sample/H2ConsoleInitializer.java b/samples/javaconfig/jdbc/src/main/java/sample/H2ConsoleInitializer.java similarity index 100% rename from samples/java/java-jdbc/src/main/java/sample/H2ConsoleInitializer.java rename to samples/javaconfig/jdbc/src/main/java/sample/H2ConsoleInitializer.java diff --git a/samples/java/java-jdbc/src/main/java/sample/Initializer.java b/samples/javaconfig/jdbc/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-jdbc/src/main/java/sample/Initializer.java rename to samples/javaconfig/jdbc/src/main/java/sample/Initializer.java diff --git a/samples/java/java-jdbc/src/main/java/sample/SessionServlet.java b/samples/javaconfig/jdbc/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-jdbc/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/jdbc/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-jdbc/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-jdbc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/jdbc/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-jdbc/src/main/webapp/index.jsp b/samples/javaconfig/jdbc/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-jdbc/src/main/webapp/index.jsp rename to samples/javaconfig/jdbc/src/main/webapp/index.jsp diff --git a/samples/java/java-redis/build.gradle b/samples/javaconfig/redis/build.gradle similarity index 100% rename from samples/java/java-redis/build.gradle rename to samples/javaconfig/redis/build.gradle diff --git a/samples/java/java-redis/src/integration-test/java/sample/AttributeTests.java b/samples/javaconfig/redis/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/java/java-redis/src/integration-test/java/sample/AttributeTests.java rename to samples/javaconfig/redis/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/java/java-redis/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/redis/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-redis/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/redis/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-redis/src/main/java/sample/Config.java b/samples/javaconfig/redis/src/main/java/sample/Config.java similarity index 100% rename from samples/java/java-redis/src/main/java/sample/Config.java rename to samples/javaconfig/redis/src/main/java/sample/Config.java diff --git a/samples/java/java-redis/src/main/java/sample/Initializer.java b/samples/javaconfig/redis/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-redis/src/main/java/sample/Initializer.java rename to samples/javaconfig/redis/src/main/java/sample/Initializer.java diff --git a/samples/java/java-redis/src/main/java/sample/SessionServlet.java b/samples/javaconfig/redis/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-redis/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/redis/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-redis/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/redis/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-redis/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/redis/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-redis/src/main/webapp/index.jsp b/samples/javaconfig/redis/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-redis/src/main/webapp/index.jsp rename to samples/javaconfig/redis/src/main/webapp/index.jsp diff --git a/samples/java/java-rest/build.gradle b/samples/javaconfig/rest/build.gradle similarity index 100% rename from samples/java/java-rest/build.gradle rename to samples/javaconfig/rest/build.gradle diff --git a/samples/java/java-rest/src/integration-test/java/rest/RestMockMvcTests.java b/samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java similarity index 100% rename from samples/java/java-rest/src/integration-test/java/rest/RestMockMvcTests.java rename to samples/javaconfig/rest/src/integration-test/java/rest/RestMockMvcTests.java diff --git a/samples/java/java-rest/src/integration-test/java/sample/RestTests.java b/samples/javaconfig/rest/src/integration-test/java/sample/RestTests.java similarity index 100% rename from samples/java/java-rest/src/integration-test/java/sample/RestTests.java rename to samples/javaconfig/rest/src/integration-test/java/sample/RestTests.java diff --git a/samples/java/java-rest/src/integration-test/java/sample/User.java b/samples/javaconfig/rest/src/integration-test/java/sample/User.java similarity index 100% rename from samples/java/java-rest/src/integration-test/java/sample/User.java rename to samples/javaconfig/rest/src/integration-test/java/sample/User.java diff --git a/samples/java/java-rest/src/main/java/sample/HttpSessionConfig.java b/samples/javaconfig/rest/src/main/java/sample/HttpSessionConfig.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/HttpSessionConfig.java rename to samples/javaconfig/rest/src/main/java/sample/HttpSessionConfig.java diff --git a/samples/java/java-rest/src/main/java/sample/Initializer.java b/samples/javaconfig/rest/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/Initializer.java rename to samples/javaconfig/rest/src/main/java/sample/Initializer.java diff --git a/samples/java/java-rest/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/SecurityConfig.java rename to samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java diff --git a/samples/java/java-rest/src/main/java/sample/SecurityInitializer.java b/samples/javaconfig/rest/src/main/java/sample/SecurityInitializer.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/SecurityInitializer.java rename to samples/javaconfig/rest/src/main/java/sample/SecurityInitializer.java diff --git a/samples/java/java-rest/src/main/java/sample/mvc/MvcConfig.java b/samples/javaconfig/rest/src/main/java/sample/mvc/MvcConfig.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/mvc/MvcConfig.java rename to samples/javaconfig/rest/src/main/java/sample/mvc/MvcConfig.java diff --git a/samples/java/java-rest/src/main/java/sample/mvc/MvcInitializer.java b/samples/javaconfig/rest/src/main/java/sample/mvc/MvcInitializer.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/mvc/MvcInitializer.java rename to samples/javaconfig/rest/src/main/java/sample/mvc/MvcInitializer.java diff --git a/samples/java/java-rest/src/main/java/sample/mvc/RestDemoController.java b/samples/javaconfig/rest/src/main/java/sample/mvc/RestDemoController.java similarity index 100% rename from samples/java/java-rest/src/main/java/sample/mvc/RestDemoController.java rename to samples/javaconfig/rest/src/main/java/sample/mvc/RestDemoController.java diff --git a/samples/java/java-rest/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/rest/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-rest/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/rest/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-security/build.gradle b/samples/javaconfig/security/build.gradle similarity index 100% rename from samples/java/java-security/build.gradle rename to samples/javaconfig/security/build.gradle diff --git a/samples/java/java-security/src/integration-test/java/sample/SecurityTests.java b/samples/javaconfig/security/src/integration-test/java/sample/SecurityTests.java similarity index 100% rename from samples/java/java-security/src/integration-test/java/sample/SecurityTests.java rename to samples/javaconfig/security/src/integration-test/java/sample/SecurityTests.java diff --git a/samples/java/java-security/src/integration-test/java/sample/pages/BasePage.java b/samples/javaconfig/security/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/java/java-security/src/integration-test/java/sample/pages/BasePage.java rename to samples/javaconfig/security/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/java/java-security/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/security/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-security/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/security/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-security/src/integration-test/java/sample/pages/LoginPage.java b/samples/javaconfig/security/src/integration-test/java/sample/pages/LoginPage.java similarity index 100% rename from samples/java/java-security/src/integration-test/java/sample/pages/LoginPage.java rename to samples/javaconfig/security/src/integration-test/java/sample/pages/LoginPage.java diff --git a/samples/java/java-security/src/main/java/sample/Config.java b/samples/javaconfig/security/src/main/java/sample/Config.java similarity index 100% rename from samples/java/java-security/src/main/java/sample/Config.java rename to samples/javaconfig/security/src/main/java/sample/Config.java diff --git a/samples/java/java-security/src/main/java/sample/Initializer.java b/samples/javaconfig/security/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-security/src/main/java/sample/Initializer.java rename to samples/javaconfig/security/src/main/java/sample/Initializer.java diff --git a/samples/java/java-security/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java similarity index 100% rename from samples/java/java-security/src/main/java/sample/SecurityConfig.java rename to samples/javaconfig/security/src/main/java/sample/SecurityConfig.java diff --git a/samples/java/java-security/src/main/java/sample/SecurityInitializer.java b/samples/javaconfig/security/src/main/java/sample/SecurityInitializer.java similarity index 100% rename from samples/java/java-security/src/main/java/sample/SecurityInitializer.java rename to samples/javaconfig/security/src/main/java/sample/SecurityInitializer.java diff --git a/samples/java/java-security/src/main/java/sample/SessionServlet.java b/samples/javaconfig/security/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/java/java-security/src/main/java/sample/SessionServlet.java rename to samples/javaconfig/security/src/main/java/sample/SessionServlet.java diff --git a/samples/java/java-security/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/security/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-security/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/security/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-security/src/main/webapp/index.jsp b/samples/javaconfig/security/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-security/src/main/webapp/index.jsp rename to samples/javaconfig/security/src/main/webapp/index.jsp diff --git a/samples/java/java-users/build.gradle b/samples/javaconfig/users/build.gradle similarity index 100% rename from samples/java/java-users/build.gradle rename to samples/javaconfig/users/build.gradle diff --git a/samples/java/java-users/src/integration-test/java/sample/UserTests.java b/samples/javaconfig/users/src/integration-test/java/sample/UserTests.java similarity index 100% rename from samples/java/java-users/src/integration-test/java/sample/UserTests.java rename to samples/javaconfig/users/src/integration-test/java/sample/UserTests.java diff --git a/samples/java/java-users/src/integration-test/java/sample/pages/BasePage.java b/samples/javaconfig/users/src/integration-test/java/sample/pages/BasePage.java similarity index 100% rename from samples/java/java-users/src/integration-test/java/sample/pages/BasePage.java rename to samples/javaconfig/users/src/integration-test/java/sample/pages/BasePage.java diff --git a/samples/java/java-users/src/integration-test/java/sample/pages/HomePage.java b/samples/javaconfig/users/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/java/java-users/src/integration-test/java/sample/pages/HomePage.java rename to samples/javaconfig/users/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/java/java-users/src/integration-test/java/sample/pages/LinkPage.java b/samples/javaconfig/users/src/integration-test/java/sample/pages/LinkPage.java similarity index 100% rename from samples/java/java-users/src/integration-test/java/sample/pages/LinkPage.java rename to samples/javaconfig/users/src/integration-test/java/sample/pages/LinkPage.java diff --git a/samples/java/java-users/src/main/java/sample/Account.java b/samples/javaconfig/users/src/main/java/sample/Account.java similarity index 100% rename from samples/java/java-users/src/main/java/sample/Account.java rename to samples/javaconfig/users/src/main/java/sample/Account.java diff --git a/samples/java/java-users/src/main/java/sample/Config.java b/samples/javaconfig/users/src/main/java/sample/Config.java similarity index 100% rename from samples/java/java-users/src/main/java/sample/Config.java rename to samples/javaconfig/users/src/main/java/sample/Config.java diff --git a/samples/java/java-users/src/main/java/sample/Initializer.java b/samples/javaconfig/users/src/main/java/sample/Initializer.java similarity index 100% rename from samples/java/java-users/src/main/java/sample/Initializer.java rename to samples/javaconfig/users/src/main/java/sample/Initializer.java diff --git a/samples/java/java-users/src/main/java/sample/LoginServlet.java b/samples/javaconfig/users/src/main/java/sample/LoginServlet.java similarity index 100% rename from samples/java/java-users/src/main/java/sample/LoginServlet.java rename to samples/javaconfig/users/src/main/java/sample/LoginServlet.java diff --git a/samples/java/java-users/src/main/java/sample/LogoutServlet.java b/samples/javaconfig/users/src/main/java/sample/LogoutServlet.java similarity index 100% rename from samples/java/java-users/src/main/java/sample/LogoutServlet.java rename to samples/javaconfig/users/src/main/java/sample/LogoutServlet.java diff --git a/samples/java/java-users/src/main/java/sample/UserAccountsFilter.java b/samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java similarity index 100% rename from samples/java/java-users/src/main/java/sample/UserAccountsFilter.java rename to samples/javaconfig/users/src/main/java/sample/UserAccountsFilter.java diff --git a/samples/java/java-users/src/main/webapp/META-INF/MANIFEST.MF b/samples/javaconfig/users/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/java/java-users/src/main/webapp/META-INF/MANIFEST.MF rename to samples/javaconfig/users/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/java/java-users/src/main/webapp/assets/js/ie10-viewport-bug-workaround.js b/samples/javaconfig/users/src/main/webapp/assets/js/ie10-viewport-bug-workaround.js similarity index 100% rename from samples/java/java-users/src/main/webapp/assets/js/ie10-viewport-bug-workaround.js rename to samples/javaconfig/users/src/main/webapp/assets/js/ie10-viewport-bug-workaround.js diff --git a/samples/java/java-users/src/main/webapp/index.jsp b/samples/javaconfig/users/src/main/webapp/index.jsp similarity index 100% rename from samples/java/java-users/src/main/webapp/index.jsp rename to samples/javaconfig/users/src/main/webapp/index.jsp diff --git a/samples/java/java-users/src/main/webapp/link.jsp b/samples/javaconfig/users/src/main/webapp/link.jsp similarity index 100% rename from samples/java/java-users/src/main/webapp/link.jsp rename to samples/javaconfig/users/src/main/webapp/link.jsp diff --git a/samples/xml/xml-gemfire-clientserver/build.gradle b/samples/xml/gemfire-clientserver/build.gradle similarity index 100% rename from samples/xml/xml-gemfire-clientserver/build.gradle rename to samples/xml/gemfire-clientserver/build.gradle diff --git a/samples/xml/xml-gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java b/samples/xml/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java rename to samples/xml/gemfire-clientserver/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/xml/xml-gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java b/samples/xml/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java rename to samples/xml/gemfire-clientserver/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/xml/xml-gemfire-clientserver/src/main/java/sample/Application.java b/samples/xml/gemfire-clientserver/src/main/java/sample/Application.java similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/java/sample/Application.java rename to samples/xml/gemfire-clientserver/src/main/java/sample/Application.java diff --git a/samples/xml/xml-gemfire-clientserver/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java b/samples/xml/gemfire-clientserver/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java rename to samples/xml/gemfire-clientserver/src/main/java/sample/GemFireCacheServerReadyBeanPostProcessor.java diff --git a/samples/xml/xml-gemfire-clientserver/src/main/java/sample/SessionServlet.java b/samples/xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/java/sample/SessionServlet.java rename to samples/xml/gemfire-clientserver/src/main/java/sample/SessionServlet.java diff --git a/samples/xml/xml-gemfire-clientserver/src/main/resources/META-INF/spring/application.properties b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/application.properties similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/resources/META-INF/spring/application.properties rename to samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/application.properties diff --git a/samples/xml/xml-gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml b/samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml rename to samples/xml/gemfire-clientserver/src/main/resources/META-INF/spring/session-server.xml diff --git a/samples/xml/xml-gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF rename to samples/xml/gemfire-clientserver/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml b/samples/xml/gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml rename to samples/xml/gemfire-clientserver/src/main/webapp/WEB-INF/spring/session-client.xml diff --git a/samples/xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/web.xml b/samples/xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/webapp/WEB-INF/web.xml rename to samples/xml/gemfire-clientserver/src/main/webapp/WEB-INF/web.xml diff --git a/samples/xml/xml-gemfire-clientserver/src/main/webapp/index.jsp b/samples/xml/gemfire-clientserver/src/main/webapp/index.jsp similarity index 100% rename from samples/xml/xml-gemfire-clientserver/src/main/webapp/index.jsp rename to samples/xml/gemfire-clientserver/src/main/webapp/index.jsp diff --git a/samples/xml/xml-gemfire-p2p/build.gradle b/samples/xml/gemfire-p2p/build.gradle similarity index 100% rename from samples/xml/xml-gemfire-p2p/build.gradle rename to samples/xml/gemfire-p2p/build.gradle diff --git a/samples/xml/xml-gemfire-p2p/src/integration-test/java/sample/AttributeTests.java b/samples/xml/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/integration-test/java/sample/AttributeTests.java rename to samples/xml/gemfire-p2p/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/xml/xml-gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java b/samples/xml/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java rename to samples/xml/gemfire-p2p/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/xml/xml-gemfire-p2p/src/main/java/sample/SessionServlet.java b/samples/xml/gemfire-p2p/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/main/java/sample/SessionServlet.java rename to samples/xml/gemfire-p2p/src/main/java/sample/SessionServlet.java diff --git a/samples/xml/xml-gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF rename to samples/xml/gemfire-p2p/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml b/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml rename to samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml diff --git a/samples/xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/web.xml b/samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/main/webapp/WEB-INF/web.xml rename to samples/xml/gemfire-p2p/src/main/webapp/WEB-INF/web.xml diff --git a/samples/xml/xml-gemfire-p2p/src/main/webapp/index.jsp b/samples/xml/gemfire-p2p/src/main/webapp/index.jsp similarity index 100% rename from samples/xml/xml-gemfire-p2p/src/main/webapp/index.jsp rename to samples/xml/gemfire-p2p/src/main/webapp/index.jsp diff --git a/samples/xml/xml-jdbc/build.gradle b/samples/xml/jdbc/build.gradle similarity index 100% rename from samples/xml/xml-jdbc/build.gradle rename to samples/xml/jdbc/build.gradle diff --git a/samples/xml/xml-jdbc/src/integration-test/java/sample/AttributeTests.java b/samples/xml/jdbc/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/xml/xml-jdbc/src/integration-test/java/sample/AttributeTests.java rename to samples/xml/jdbc/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/xml/xml-jdbc/src/integration-test/java/sample/pages/HomePage.java b/samples/xml/jdbc/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/xml/xml-jdbc/src/integration-test/java/sample/pages/HomePage.java rename to samples/xml/jdbc/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/xml/xml-jdbc/src/main/java/sample/SessionServlet.java b/samples/xml/jdbc/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/xml/xml-jdbc/src/main/java/sample/SessionServlet.java rename to samples/xml/jdbc/src/main/java/sample/SessionServlet.java diff --git a/samples/xml/xml-jdbc/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/jdbc/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/xml/xml-jdbc/src/main/webapp/META-INF/MANIFEST.MF rename to samples/xml/jdbc/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/xml/xml-jdbc/src/main/webapp/WEB-INF/spring/session.xml b/samples/xml/jdbc/src/main/webapp/WEB-INF/spring/session.xml similarity index 100% rename from samples/xml/xml-jdbc/src/main/webapp/WEB-INF/spring/session.xml rename to samples/xml/jdbc/src/main/webapp/WEB-INF/spring/session.xml diff --git a/samples/xml/xml-jdbc/src/main/webapp/WEB-INF/web.xml b/samples/xml/jdbc/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/xml/xml-jdbc/src/main/webapp/WEB-INF/web.xml rename to samples/xml/jdbc/src/main/webapp/WEB-INF/web.xml diff --git a/samples/xml/xml-jdbc/src/main/webapp/index.jsp b/samples/xml/jdbc/src/main/webapp/index.jsp similarity index 100% rename from samples/xml/xml-jdbc/src/main/webapp/index.jsp rename to samples/xml/jdbc/src/main/webapp/index.jsp diff --git a/samples/xml/xml-redis/build.gradle b/samples/xml/redis/build.gradle similarity index 100% rename from samples/xml/xml-redis/build.gradle rename to samples/xml/redis/build.gradle diff --git a/samples/xml/xml-redis/src/integration-test/java/sample/AttributeTests.java b/samples/xml/redis/src/integration-test/java/sample/AttributeTests.java similarity index 100% rename from samples/xml/xml-redis/src/integration-test/java/sample/AttributeTests.java rename to samples/xml/redis/src/integration-test/java/sample/AttributeTests.java diff --git a/samples/xml/xml-redis/src/integration-test/java/sample/pages/HomePage.java b/samples/xml/redis/src/integration-test/java/sample/pages/HomePage.java similarity index 100% rename from samples/xml/xml-redis/src/integration-test/java/sample/pages/HomePage.java rename to samples/xml/redis/src/integration-test/java/sample/pages/HomePage.java diff --git a/samples/xml/xml-redis/src/main/java/sample/SessionServlet.java b/samples/xml/redis/src/main/java/sample/SessionServlet.java similarity index 100% rename from samples/xml/xml-redis/src/main/java/sample/SessionServlet.java rename to samples/xml/redis/src/main/java/sample/SessionServlet.java diff --git a/samples/xml/xml-redis/src/main/webapp/META-INF/MANIFEST.MF b/samples/xml/redis/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/xml/xml-redis/src/main/webapp/META-INF/MANIFEST.MF rename to samples/xml/redis/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/xml/xml-redis/src/main/webapp/WEB-INF/spring/session.xml b/samples/xml/redis/src/main/webapp/WEB-INF/spring/session.xml similarity index 100% rename from samples/xml/xml-redis/src/main/webapp/WEB-INF/spring/session.xml rename to samples/xml/redis/src/main/webapp/WEB-INF/spring/session.xml diff --git a/samples/xml/xml-redis/src/main/webapp/WEB-INF/web.xml b/samples/xml/redis/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/xml/xml-redis/src/main/webapp/WEB-INF/web.xml rename to samples/xml/redis/src/main/webapp/WEB-INF/web.xml diff --git a/samples/xml/xml-redis/src/main/webapp/index.jsp b/samples/xml/redis/src/main/webapp/index.jsp similarity index 100% rename from samples/xml/xml-redis/src/main/webapp/index.jsp rename to samples/xml/redis/src/main/webapp/index.jsp diff --git a/settings.gradle b/settings.gradle index 4553eb22..5862aaa1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,32 +2,37 @@ rootProject.name = 'spring-session-build' include 'docs' -include 'samples:boot:boot-findbyusername' -include 'samples:boot:boot-gemfire' -include 'samples:boot:boot-jdbc' -include 'samples:boot:boot-mongo' -include 'samples:boot:boot-redis' -include 'samples:boot:boot-redis-json' -include 'samples:boot:boot-websocket' -include 'samples:java:java-custom-cookie' -include 'samples:java:java-gemfire-clientserver' -include 'samples:java:java-gemfire-p2p' -include 'samples:java:java-hazelcast' -include 'samples:java:java-jdbc' -include 'samples:java:java-redis' -include 'samples:java:java-rest' -include 'samples:java:java-security' -include 'samples:java:java-users' -//include 'samples:misc:grails3' -include 'samples:misc:hazelcast' -include 'samples:xml:xml-gemfire-clientserver' -include 'samples:xml:xml-gemfire-p2p' -include 'samples:xml:xml-jdbc' -include 'samples:xml:xml-redis' - include 'spring-session' include 'spring-session-data-gemfire' include 'spring-session-data-mongo' include 'spring-session-data-redis' include 'spring-session-hazelcast' include 'spring-session-jdbc' + +includeSamples("samples" + File.separator + "boot") +includeSamples("samples" + File.separator + "javaconfig") +includeSamples("samples" + File.separator + "misc") +includeSamples("samples" + File.separator + "xml") + +void includeSamples(String samplesDir) { + FileTree tree = fileTree(samplesDir) { + include '**' + File.separator + '*.gradle' + exclude 'grails3' + } + tree.each {File file -> + String projectDir = file.path.substring(file.path.indexOf(samplesDir), file.path.lastIndexOf(File.separator)) + String projectPath = projectDir.substring(projectDir.lastIndexOf(File.separator) + 1) + String projectNamePrefix = samplesDir.substring(samplesDir.lastIndexOf(File.separator) + 1).toLowerCase(); + + include projectPath + + def project = findProject(":${projectPath}") + + project.name = "spring-session-samples-${projectNamePrefix}-${project.name}" + project.projectDir = new File(settingsDir, projectDir) + + if (!project.buildFile.exists()) { + project.buildFileName = file.path.substring(file.path.lastIndexOf(File.separator) + 1) + } + } +} \ No newline at end of file