From 8f3600c49a01d9f990a5da95b32624f2ceb9bb32 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 17 Dec 2014 16:14:57 -0600 Subject: [PATCH] samples/web->samples/httpsession --- samples/{web => httpsession}/build.gradle | 0 .../groovy/sample/AttributeTests.groovy | 0 .../groovy/sample/pages/HomePage.groovy | 0 .../src/main/java/sample/Config.java | 13 ++++++------- .../java/sample/EmbeddedRedisConfiguration.java | 0 .../src/main/java/sample/Initializer.java | 8 ++++---- .../src/main/java/sample/SessionServlet.java | 10 ++++------ .../src/main/webapp/META-INF/MANIFEST.MF | 0 .../src/main/webapp/assets/bootstrap.min.css | 0 .../{web => httpsession}/src/main/webapp/index.jsp | 0 settings.gradle | 4 +++- 11 files changed, 17 insertions(+), 18 deletions(-) rename samples/{web => httpsession}/build.gradle (100%) rename samples/{web => httpsession}/src/integration-test/groovy/sample/AttributeTests.groovy (100%) rename samples/{web => httpsession}/src/integration-test/groovy/sample/pages/HomePage.groovy (100%) rename samples/{web => httpsession}/src/main/java/sample/Config.java (80%) rename samples/{web => httpsession}/src/main/java/sample/EmbeddedRedisConfiguration.java (100%) rename samples/{web => httpsession}/src/main/java/sample/Initializer.java (86%) rename samples/{web => httpsession}/src/main/java/sample/SessionServlet.java (85%) rename samples/{web => httpsession}/src/main/webapp/META-INF/MANIFEST.MF (100%) rename samples/{web => httpsession}/src/main/webapp/assets/bootstrap.min.css (100%) rename samples/{web => httpsession}/src/main/webapp/index.jsp (100%) diff --git a/samples/web/build.gradle b/samples/httpsession/build.gradle similarity index 100% rename from samples/web/build.gradle rename to samples/httpsession/build.gradle diff --git a/samples/web/src/integration-test/groovy/sample/AttributeTests.groovy b/samples/httpsession/src/integration-test/groovy/sample/AttributeTests.groovy similarity index 100% rename from samples/web/src/integration-test/groovy/sample/AttributeTests.groovy rename to samples/httpsession/src/integration-test/groovy/sample/AttributeTests.groovy diff --git a/samples/web/src/integration-test/groovy/sample/pages/HomePage.groovy b/samples/httpsession/src/integration-test/groovy/sample/pages/HomePage.groovy similarity index 100% rename from samples/web/src/integration-test/groovy/sample/pages/HomePage.groovy rename to samples/httpsession/src/integration-test/groovy/sample/pages/HomePage.groovy diff --git a/samples/web/src/main/java/sample/Config.java b/samples/httpsession/src/main/java/sample/Config.java similarity index 80% rename from samples/web/src/main/java/sample/Config.java rename to samples/httpsession/src/main/java/sample/Config.java index 8bc170b4..ade8eaab 100644 --- a/samples/web/src/main/java/sample/Config.java +++ b/samples/httpsession/src/main/java/sample/Config.java @@ -1,4 +1,3 @@ -package sample; /* * Copyright 2002-2014 the original author or authors. * @@ -14,23 +13,23 @@ package sample; * License for the specific language governing permissions and limitations under * the License. */ +package sample; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; +import org.springframework.data.redis.connection.jedis.*; +import org.springframework.session.data.redis.config.annotation.web.http.*; /** * @author Rob Winch */ -@Import(EmbeddedRedisConfiguration.class) -@Configuration -@EnableRedisHttpSession +@Import(EmbeddedRedisConfiguration.class) // <1> +@EnableRedisHttpSession // <2> public class Config { @Bean public JedisConnectionFactory connectionFactory() { - return new JedisConnectionFactory(); + return new JedisConnectionFactory(); // <3> } } diff --git a/samples/web/src/main/java/sample/EmbeddedRedisConfiguration.java b/samples/httpsession/src/main/java/sample/EmbeddedRedisConfiguration.java similarity index 100% rename from samples/web/src/main/java/sample/EmbeddedRedisConfiguration.java rename to samples/httpsession/src/main/java/sample/EmbeddedRedisConfiguration.java diff --git a/samples/web/src/main/java/sample/Initializer.java b/samples/httpsession/src/main/java/sample/Initializer.java similarity index 86% rename from samples/web/src/main/java/sample/Initializer.java rename to samples/httpsession/src/main/java/sample/Initializer.java index 426a9c6e..0903467c 100644 --- a/samples/web/src/main/java/sample/Initializer.java +++ b/samples/httpsession/src/main/java/sample/Initializer.java @@ -1,4 +1,3 @@ -package sample; /* * Copyright 2002-2014 the original author or authors. * @@ -14,16 +13,17 @@ package sample; * License for the specific language governing permissions and limitations under * the License. */ - +package sample; import org.springframework.session.web.context.AbstractHttpSessionApplicationInitializer; /** * @author Rob Winch */ -public class Initializer extends AbstractHttpSessionApplicationInitializer { +public class Initializer + extends AbstractHttpSessionApplicationInitializer { // <1> public Initializer() { - super(Config.class); + super(Config.class); // <2> } } diff --git a/samples/web/src/main/java/sample/SessionServlet.java b/samples/httpsession/src/main/java/sample/SessionServlet.java similarity index 85% rename from samples/web/src/main/java/sample/SessionServlet.java rename to samples/httpsession/src/main/java/sample/SessionServlet.java index 683ecd46..f888b63d 100644 --- a/samples/web/src/main/java/sample/SessionServlet.java +++ b/samples/httpsession/src/main/java/sample/SessionServlet.java @@ -1,4 +1,3 @@ -package sample; /* * Copyright 2002-2014 the original author or authors. * @@ -14,12 +13,11 @@ package sample; * License for the specific language governing permissions and limitations under * the License. */ +package sample; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import javax.servlet.*; +import javax.servlet.annotation.*; +import javax.servlet.http.*; import java.io.IOException; /** diff --git a/samples/web/src/main/webapp/META-INF/MANIFEST.MF b/samples/httpsession/src/main/webapp/META-INF/MANIFEST.MF similarity index 100% rename from samples/web/src/main/webapp/META-INF/MANIFEST.MF rename to samples/httpsession/src/main/webapp/META-INF/MANIFEST.MF diff --git a/samples/web/src/main/webapp/assets/bootstrap.min.css b/samples/httpsession/src/main/webapp/assets/bootstrap.min.css similarity index 100% rename from samples/web/src/main/webapp/assets/bootstrap.min.css rename to samples/httpsession/src/main/webapp/assets/bootstrap.min.css diff --git a/samples/web/src/main/webapp/index.jsp b/samples/httpsession/src/main/webapp/index.jsp similarity index 100% rename from samples/web/src/main/webapp/index.jsp rename to samples/httpsession/src/main/webapp/index.jsp diff --git a/settings.gradle b/settings.gradle index 7199d6e6..f5eed1f2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,12 @@ rootProject.name = 'spring-session-build' +include 'docs' + include 'samples:boot' include 'samples:hazelcast' +include 'samples:httpsession' include 'samples:security' include 'samples:users' -include 'samples:web' include 'samples:websocket' include 'spring-session'