Skip to content

Commit b04ebfd

Browse files
author
Costin Leau
committed
+ update sample to Spring Redis 1.0 M4 and Spring 3.1 M2
1 parent 60e184d commit b04ebfd

File tree

8 files changed

+34
-34
lines changed

8 files changed

+34
-34
lines changed

‎retwisj/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Spring Data - Key Value - Redis Twitter Example
2-
===============================================
1+
Spring Data - Redis Twitter Example
2+
===================================
33

44
An improved Java implementation of the [Redis Twitter Clone](http://redis.io/topics/twitter-clone) using Spring Data. Tutorial available [here](http://static.springsource.org/spring-data/data-keyvalue/examples/retwisj/current/)
55

‎retwisj/build.gradle‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,14 @@ repositories {
4949
dependencies {
5050
compile "org.slf4j:slf4j-api:$slf4jVersion"
5151
compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
52+
runtime "org.slf4j:slf4j-log4j12:$slf4jVersion"
5253
runtime "log4j:log4j:$log4jVersion"
5354
compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
5455
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
5556
compile "javax.servlet:com.springsource.javax.servlet.jsp.jstl:1.2.0"
56-
compile "org.springframework.data:spring-data-redis:$springDataKVVersion"
57+
compile ("org.springframework.data:spring-data-redis:$springRedisVersion") {
58+
exclude group: 'commons-logging'
59+
}
5760
compile "org.springframework:spring-webmvc:$springVersion"
5861
compile "javax.inject:com.springsource.javax.inject:1.0.0"
5962
providedCompile "javax.servlet:com.springsource.javax.servlet:2.4.0"
@@ -73,7 +76,7 @@ ideaProject {
7376
}
7477

7578
task wrapper(type: Wrapper) {
76-
gradleVersion = '0.9.2'
79+
gradleVersion = '1.0-milestone-3'
7780
}
7881

7982
war {

‎retwisj/gradle.properties‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@ log4jVersion = 1.2.16
55
slf4jVersion = 1.6.1
66

77
# Common libraries
8-
springVersion = 3.0.5.RELEASE
9-
springDataKVVersion = 1.0.0.M3
10-
jacksonVersion = 1.7.4
8+
springVersion = 3.1.0.M2
9+
springRedisVersion = 1.0.0.M4
10+
jacksonVersion = 1.8.3
1111

1212
# Testing
1313
junitVersion = 4.8.1
1414
mockitoVersion = 1.8.5
1515

16-
17-
# ------------------------------------------------------------------------------
18-
# version to be applied to all projects in this multi-project build. this is
19-
# the one and only location version changes need to be made.
20-
# ------------------------------------------------------------------------------
21-
springDataKeyValueRedisTwitterVersion=1.0.0.BUILD-SNAPSHOT
16+
springDataKRedisTwitterVersion=1.0.0.BUILD-SNAPSHOT

‎retwisj/gradle/wrapper/gradle-wrapper.jar‎

434 Bytes
Binary file not shown.

‎retwisj/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Mar 03 13:18:23 EET 2011
1+
#Fri Jul 22 14:48:24 EEST 2011
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://gradle.artifactoryonline.com/gradle/distributions/gradle-0.9.2-bin.zip
6+
distributionUrl=http\://repo.gradle.org/gradle/distributions/gradle-1.0-milestone-3-bin.zip

‎retwisj/src/main/java/org/springframework/data/redis/samples/retwisj/redis/RetwisRepository.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,26 @@
3131
import javax.inject.Inject;
3232
import javax.inject.Named;
3333

34-
import org.springframework.data.keyvalue.redis.core.BoundHashOperations;
35-
import org.springframework.data.keyvalue.redis.core.BulkMapper;
36-
import org.springframework.data.keyvalue.redis.core.StringRedisTemplate;
37-
import org.springframework.data.keyvalue.redis.core.ValueOperations;
38-
import org.springframework.data.keyvalue.redis.core.query.SortQuery;
39-
import org.springframework.data.keyvalue.redis.core.query.SortQueryBuilder;
40-
import org.springframework.data.keyvalue.redis.hash.DecoratingStringHashMapper;
41-
import org.springframework.data.keyvalue.redis.hash.HashMapper;
42-
import org.springframework.data.keyvalue.redis.hash.JacksonHashMapper;
43-
import org.springframework.data.keyvalue.redis.support.atomic.RedisAtomicLong;
44-
import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisList;
45-
import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisMap;
46-
import org.springframework.data.keyvalue.redis.support.collections.DefaultRedisSet;
47-
import org.springframework.data.keyvalue.redis.support.collections.RedisList;
48-
import org.springframework.data.keyvalue.redis.support.collections.RedisMap;
49-
import org.springframework.data.keyvalue.redis.support.collections.RedisSet;
34+
import org.springframework.data.redis.core.BoundHashOperations;
35+
import org.springframework.data.redis.core.BulkMapper;
36+
import org.springframework.data.redis.core.StringRedisTemplate;
37+
import org.springframework.data.redis.core.ValueOperations;
38+
import org.springframework.data.redis.core.query.SortQuery;
39+
import org.springframework.data.redis.core.query.SortQueryBuilder;
40+
import org.springframework.data.redis.hash.DecoratingStringHashMapper;
41+
import org.springframework.data.redis.hash.HashMapper;
42+
import org.springframework.data.redis.hash.JacksonHashMapper;
5043
import org.springframework.data.redis.samples.retwisj.Post;
5144
import org.springframework.data.redis.samples.retwisj.Range;
5245
import org.springframework.data.redis.samples.retwisj.RetwisSecurity;
5346
import org.springframework.data.redis.samples.retwisj.web.WebPost;
47+
import org.springframework.data.redis.support.atomic.RedisAtomicLong;
48+
import org.springframework.data.redis.support.collections.DefaultRedisList;
49+
import org.springframework.data.redis.support.collections.DefaultRedisMap;
50+
import org.springframework.data.redis.support.collections.DefaultRedisSet;
51+
import org.springframework.data.redis.support.collections.RedisList;
52+
import org.springframework.data.redis.support.collections.RedisMap;
53+
import org.springframework.data.redis.support.collections.RedisSet;
5454
import org.springframework.util.StringUtils;
5555

5656
/**

‎retwisj/src/main/java/org/springframework/data/redis/samples/retwisj/web/RetwisController.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public String signUp(String name, String pass, String pass2, Model model, HttpSe
7676
}
7777

7878
@RequestMapping("/signIn")
79-
public String signIn(String name, String pass, Model model, HttpServletResponse response) {
79+
public String signIn(@RequestParam(required = false) String name, @RequestParam(required = false) String pass, Model model, HttpServletResponse response) {
80+
System.out.println("name is " + name);
81+
System.out.println("pass is " + name);
8082
// add tracing cookie
8183
if (retwis.auth(name, pass)) {
8284
addAuthCookie(retwis.addAuth(name), name, response);

‎retwisj/src/main/webapp/WEB-INF/spring/applicationContext-redis.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
77
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
88

9-
<bean id="connectionFactory" class="org.springframework.data.keyvalue.redis.connection.jedis.JedisConnectionFactory"
9+
<bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory"
1010
p:host-name="${redis.host}" p:port="${redis.port}" p:password="${redis.pass}"/>
1111
<!-- Configurer that replaces ${...} placeholders with values from a properties file -->
1212
<context:property-placeholder location="classpath:redis.properties"/>
@@ -15,7 +15,7 @@
1515

1616
<context:component-scan base-package="org.springframework.data.redis.samples"/>
1717

18-
<bean id="redisTemplate" class="org.springframework.data.keyvalue.redis.core.StringRedisTemplate"
18+
<bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate"
1919
p:connection-factory-ref="connectionFactory"/>
2020

2121
</beans>

0 commit comments

Comments
 (0)