diff --git a/docs/src/info/readme.txt b/docs/src/info/readme.txt
index e8de9ab3db..8a2895f26d 100644
--- a/docs/src/info/readme.txt
+++ b/docs/src/info/readme.txt
@@ -22,7 +22,7 @@ The Spring Data Redis jars files can be found in the 'dist' directory.
Please see the reference documentation.
Additionally the blog at https://spring.io/blog as well as sections of interest in the reference documentation.
-ADDITIONAL RESOURCES
+5. ADDITIONAL RESOURCES
Spring Data Homepage: http://projects.spring.io/spring-data-redis/
Spring Data Forum : http://forum.spring.io/forum/spring-projects/data/nosql
Redis Homepage : http://redis.io
\ No newline at end of file
diff --git a/docs/src/reference/docbook/appendix/appendix-command-reference.xml b/docs/src/reference/docbook/appendix/appendix-command-reference.xml
new file mode 100644
index 0000000000..bef5d3879e
--- /dev/null
+++ b/docs/src/reference/docbook/appendix/appendix-command-reference.xml
@@ -0,0 +1,180 @@
+
+
+ Spring Data Redis Supported Commands
+
+
+
\ No newline at end of file
diff --git a/docs/src/reference/docbook/appendix/appendix-schema.xml b/docs/src/reference/docbook/appendix/appendix-schema.xml
index d83c8d3503..af9a27bcfe 100644
--- a/docs/src/reference/docbook/appendix/appendix-schema.xml
+++ b/docs/src/reference/docbook/appendix/appendix-schema.xml
@@ -3,10 +3,8 @@
Spring Data Redis Schema(s)Core schema
-
-
- FIXME: REDIS SCHEMA LOCATION/NAME CHANGED
-
+
+
diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml
index 9b3e4e3f2a..7680ec1478 100644
--- a/docs/src/reference/docbook/index.xml
+++ b/docs/src/reference/docbook/index.xml
@@ -40,7 +40,13 @@
further provided that each copy contains this Copyright Notice, whether
distributed in print or electronically.
-
+
+
+
+ 2011-2014
+ The original authors.
+
+
@@ -67,20 +73,7 @@
+
-
-
\ No newline at end of file
+
+
diff --git a/docs/src/reference/docbook/reference/redis-messaging.xml b/docs/src/reference/docbook/reference/redis-messaging.xml
index f2db782e18..f89983dbf7 100644
--- a/docs/src/reference/docbook/reference/redis-messaging.xml
+++ b/docs/src/reference/docbook/reference/redis-messaging.xml
@@ -56,7 +56,7 @@ template.convertAndSend("hello!", "world");
whether it is listening or not, RedisConnection
provides getSubscription and isSubscribed method.
- When using Jedis or JRedis connectors, subscribing commands are synchronous and thus blocking. That is, calling subscribe on a connection will cause
+ Subscription commands in Spring Data Redis are blocking. That is, calling subscribe on a connection will cause
the current thread to block as it will start waiting for messages - the thread will be released only if the subscription
is canceled, that is an additional thread invokes unsubscribe or pUnsubscribe
on the same connection. See message listener container below
diff --git a/docs/src/reference/docbook/reference/redis-scripting.xml b/docs/src/reference/docbook/reference/redis-scripting.xml
index 8a5c02e12e..363297cb62 100644
--- a/docs/src/reference/docbook/reference/redis-scripting.xml
+++ b/docs/src/reference/docbook/reference/redis-scripting.xml
@@ -17,17 +17,13 @@
Here's an example that executes a common "check-and-set" scenario using a Lua script. This is an ideal use case for a Redis script, as
it requires that we execute a set of commands atomically and the behavior of one command is influenced by the result of another.
-
-
-
-
-
-
-
- ...
-]]>
+ @Bean
+public RedisScript<Boolean> script() {
+ DefaultRedisScript<Boolean> redisScript = new DefaultRedisScript<Boolean>();
+ redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("META-INF/scripts/checkandset.lua")));
+ redisScript.setResultType(Boolean.class);
+}
+The XML above configures a DefaultRedisScript pointing to a file called checkandset.lua, which is
expected to return a boolean value. The script resultType should be one of Long, Boolean, List, or deserialized value type. It can also be null if the
script returns a throw-away status (i.e "OK"). It is ideal to configure a single instance of DefaultRedisScript in your application context to avoid
- re-calcuation of the script's SHA1 on every script execution.
+ re-calculation of the script's SHA1 on every script execution.
The checkAndSet method above then executes the configured RedisScript with the provided key and arguments and returns the result.
diff --git a/docs/src/reference/docbook/reference/redis.xml b/docs/src/reference/docbook/reference/redis.xml
index a798e5c852..e1f6fd03e4 100644
--- a/docs/src/reference/docbook/reference/redis.xml
+++ b/docs/src/reference/docbook/reference/redis.xml
@@ -134,7 +134,7 @@
p:host-name="server" p:port="6379"/>
]]>
- The configuration is quite similar to Jedis, with one notable exception. By default, the JedisConnectionFactory pools connections.
+ The configuration is quite similar to Jedis, with one notable exception. By default, the JredisConnectionFactory pools connections.
In order to use a connection pool with JRedis, configure the JredisConnectionFactory with an instance of JredisPool. For example:
diff --git a/gradle.properties b/gradle.properties
index 79b9f667dc..b778c367c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ jredisVersion=06052013
jedisVersion=2.4.1
springVersion=3.2.8.RELEASE
log4jVersion=1.2.17
-version=1.2.0.BUILD-SNAPSHOT
+version=1.2.0.DATAREDIS-279-SNAPSHOT
srpVersion=0.7
jacksonVersion=1.8.8
fasterXmlJacksonVersion=2.2.0