From c00795f5be9b6ad855e481a2dc6d34132a253460 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mark.pollack@springsource.com>
Date: Mon, 1 Nov 2010 13:21:17 -0400
Subject: [PATCH] DATAKV-3 - Update to use Jedis 1.3.0

---
 spring-datastore-redis/pom.xml                           | 2 +-
 .../datastore/redis/core/jedis/JedisClientFactory.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/spring-datastore-redis/pom.xml b/spring-datastore-redis/pom.xml
index acb62366e..dee93ba27 100644
--- a/spring-datastore-redis/pom.xml
+++ b/spring-datastore-redis/pom.xml
@@ -88,7 +88,7 @@
 	    <dependency>
 	      <groupId>redis.clients</groupId>
 	      <artifactId>jedis</artifactId>
-	      <version>1.1.1</version>
+	      <version>1.3.0</version>
 	      <scope>compile</scope>
 	    </dependency>
 
diff --git a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/jedis/JedisClientFactory.java b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/jedis/JedisClientFactory.java
index fba7c8304..edcadd191 100644
--- a/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/jedis/JedisClientFactory.java
+++ b/spring-datastore-redis/src/main/java/org/springframework/datastore/redis/core/jedis/JedisClientFactory.java
@@ -27,6 +27,7 @@ import org.springframework.datastore.redis.core.jredis.JRedisPersistenceExceptio
 import org.springframework.datastore.redis.support.RedisPersistenceExceptionTranslator;
 
 import redis.clients.jedis.Jedis;
+import redis.clients.jedis.JedisShardInfo;
 import redis.clients.util.ShardInfo;
 
 /**
@@ -38,7 +39,7 @@ import redis.clients.util.ShardInfo;
  */
 public class JedisClientFactory extends AbstractRedisClientFactory {
 
-	private ShardInfo shardInfo;
+	private JedisShardInfo shardInfo;
 	
 	private int timeout;
 	
@@ -65,11 +66,11 @@ public class JedisClientFactory extends AbstractRedisClientFactory {
 		setTimeout(timeout);
 	}
 	
-	public JedisClientFactory(ShardInfo shardInfo) {
+	public JedisClientFactory(JedisShardInfo shardInfo) {
 		this.shardInfo = shardInfo;
 	}
 	
-	protected ShardInfo getShardInfo() {
+	protected JedisShardInfo getShardInfo() {
 		return this.shardInfo;
 	}
 	
@@ -83,7 +84,7 @@ public class JedisClientFactory extends AbstractRedisClientFactory {
 	
 	@Override
 	public RedisClient doGetClient() {
-		Jedis jedis;
+		Jedis jedis;		
 		if (getShardInfo() != null) {
 			jedis = new Jedis(getShardInfo());
 		}