Merge branch 'master' of github.com:redisson/redisson

README.md

@@ -37,11 +37,12 @@ Features
     Lock, FairLock, MultiLock, RedLock, ReadWriteLock, Semaphore, PermitExpirableSemaphore, CountDownLatch
 * [Distributed services](https://github.com/redisson/redisson/wiki/9.-distributed-services)  
     Remote service, Live Object service, Executor service, Scheduler service, MapReduce service
-* [Spring Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#141-spring-cache) implementation   
-* [Hibernate Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#142-hibernate-cache) implementation 
-* [JCache API (JSR-107)](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#143-jcache-api-jsr-107-implementation) implementation  
-* [Tomcat Session Manager](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks#144-tomcat-redis-session-manager) implementation  
-* [Spring Session](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#145-spring-session) implementation  
+* [Spring Framework](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks#141-spring-framework)
+* [Spring Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#142-spring-cache) implementation
+* [Hibernate Cache](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#143-hibernate-cache) implementation
+* [JCache API (JSR-107)](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#144-jcache-api-jsr-107-implementation) implementation
+* [Tomcat Session Manager](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks#145-tomcat-redis-session-manager) implementation
+* [Spring Session](https://github.com/redisson/redisson/wiki/14.-Integration%20with%20frameworks/#146-spring-session) implementation
 * [Redis pipelining](https://github.com/redisson/redisson/wiki/10.-additional-features#102-execution-batches-of-commands) (command batches)
 * Supports Android platform  
 * Supports auto-reconnection  

redisson-tomcat/redisson-tomcat-6/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -54,6 +54,7 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
     private String configPath;
     private ReadMode readMode = ReadMode.MEMORY;
     private UpdateMode updateMode = UpdateMode.DEFAULT;
+    private String keyPrefix = "";
     
     public String getUpdateMode() {
         return updateMode.toString();
@@ -78,7 +79,15 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
     public String getConfigPath() {
         return configPath;
     }
-    
+
+    public String getKeyPrefix() {
+        return keyPrefix;
+    }
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
     @Override
     public int getRejectedSessions() {
         return 0;
@@ -131,7 +140,7 @@ public class RedissonSessionManager extends ManagerBase implements Lifecycle {
     }
 
     public RMap<String, Object> getMap(String sessionId) {
-        return redisson.getMap("redisson_tomcat_session:" + sessionId);
+        return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId);
     }
     
     @Override

redisson-tomcat/redisson-tomcat-7/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -52,6 +52,8 @@ public class RedissonSessionManager extends ManagerBase {
     
     private ReadMode readMode = ReadMode.MEMORY;
     private UpdateMode updateMode = UpdateMode.DEFAULT;
+
+    private String keyPrefix = "";
     
     public String getUpdateMode() {
         return updateMode.toString();
@@ -76,7 +78,15 @@ public class RedissonSessionManager extends ManagerBase {
     public String getConfigPath() {
         return configPath;
     }
-    
+
+    public String getKeyPrefix() {
+        return keyPrefix;
+    }
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
     @Override
     public String getName() {
         return RedissonSessionManager.class.getSimpleName();
@@ -110,7 +120,7 @@ public class RedissonSessionManager extends ManagerBase {
     }
 
     public RMap<String, Object> getMap(String sessionId) {
-        return redisson.getMap("redisson_tomcat_session:" + sessionId);
+        return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId);
     }
     
     @Override

redisson-tomcat/redisson-tomcat-8/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -51,6 +51,8 @@ public class RedissonSessionManager extends ManagerBase {
     
     private ReadMode readMode = ReadMode.MEMORY;
     private UpdateMode updateMode = UpdateMode.DEFAULT;
+
+    private String keyPrefix = "";
     
     public String getUpdateMode() {
         return updateMode.toString();
@@ -75,7 +77,15 @@ public class RedissonSessionManager extends ManagerBase {
     public String getConfigPath() {
         return configPath;
     }
-    
+
+    public String getKeyPrefix() {
+        return keyPrefix;
+    }
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
     @Override
     public String getName() {
         return RedissonSessionManager.class.getSimpleName();
@@ -109,7 +119,7 @@ public class RedissonSessionManager extends ManagerBase {
     }
 
     public RMap<String, Object> getMap(String sessionId) {
-        return redisson.getMap("redisson_tomcat_session:" + sessionId);
+        return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId);
     }
     
     @Override

redisson-tomcat/redisson-tomcat-9/src/main/java/org/redisson/tomcat/RedissonSessionManager.java

@@ -51,6 +51,8 @@ public class RedissonSessionManager extends ManagerBase {
     
     private ReadMode readMode = ReadMode.MEMORY;
     private UpdateMode updateMode = UpdateMode.DEFAULT;
+
+    private String keyPrefix = "";
     
     public String getUpdateMode() {
         return updateMode.toString();
@@ -75,7 +77,15 @@ public class RedissonSessionManager extends ManagerBase {
     public String getConfigPath() {
         return configPath;
     }
-    
+
+    public String getKeyPrefix() {
+        return keyPrefix;
+    }
+
+    public void setKeyPrefix(String keyPrefix) {
+        this.keyPrefix = keyPrefix;
+    }
+
     @Override
     public String getName() {
         return RedissonSessionManager.class.getSimpleName();
@@ -109,7 +119,7 @@ public class RedissonSessionManager extends ManagerBase {
     }
 
     public RMap<String, Object> getMap(String sessionId) {
-        return redisson.getMap("redisson_tomcat_session:" + sessionId);
+        return redisson.getMap(keyPrefix + "redisson_tomcat_session:" + sessionId);
     }
     
     @Override