Add EnableEmbeddedRedis

Fixes gh-184

samples/httpsession-xml/build.gradle

@@ -8,8 +8,8 @@ sonarRunner {
 
 dependencies {
 	compile project(':spring-session-data-redis'),
+		project(':samples:spring-embedded-redis'),
 			"org.springframework:spring-web:$springVersion",
-			"redis.embedded:embedded-redis:$embeddedRedisVersion",
 			jstlDependencies
 
 	providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"

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

@@ -1,53 +0,0 @@
-/*
- * Copyright 2002-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package sample;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
-
-import redis.clients.jedis.Protocol;
-import redis.embedded.RedisServer;
-
-/**
- * Runs an embedded Redis instance. This is only necessary since we do not want
- * users to have to setup a Redis instance. In a production environment, this
- * would not be used since a Redis Server would be setup.
- *
- * @author Rob Winch
- */
-public class RedisServerBean implements InitializingBean, DisposableBean, BeanDefinitionRegistryPostProcessor {
-	private RedisServer redisServer;
-
-
-	public void afterPropertiesSet() throws Exception {
-		redisServer = new RedisServer(Protocol.DEFAULT_PORT);
-		redisServer.start();
-	}
-
-	public void destroy() throws Exception {
-		if(redisServer != null) {
-			redisServer.stop();
-		}
-	}
-
-	public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {}
-
-	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {}
-}

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

@@ -2,15 +2,17 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
 
 
-	<bean class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"/>
+	<bean class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
+		p:port="${spring.redis.port}"/>
 
 	<context:annotation-config/>
 	<bean class="org.springframework.session.data.redis.config.annotation.web.http.RedisHttpSessionConfiguration"/>
 
 
-	<bean class="sample.RedisServerBean"/>
+	<bean class="sample.EmbeddedRedisConfiguration"/>
 </beans>