From 5ffff41fc9dbb9f57b02a28381acc1caac7fe4af Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Tue, 26 Nov 2013 12:29:43 -0600 Subject: [PATCH 1/4] updated readme --- readme.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e2cc10081..fd230f805 100644 --- a/readme.md +++ b/readme.md @@ -2,6 +2,19 @@ Spring Data Cassandra ===================== This is a Spring Data subproject for Cassandra that uses the binary CQL3 protocol via -the official DataStax 1.x Java driver (https://github.com/datastax/java-driver). +the official DataStax 1.x Java driver (https://github.com/datastax/java-driver) against Cassandra 1.2. Supports native CQL3 queries in Spring Repositories. + +Cloning +------- +When cloning this repo, it's a good idea to also clone two others from Spring Data that this project depends on. Assuming your current working directory is the root of this repository, issue the following commands: + + cd .. + git clone git@github.com:spring-projects/spring-data-build.git + git clone git@github.com:spring-projects/spring-data-commons.git + + +Building +-------- +This is a standard Maven multimodule project. Just issue the command `mvn clean install` from the repo root. \ No newline at end of file From d6b5c0b227a0118e9fec55e3d55882c6301b5a9f Mon Sep 17 00:00:00 2001 From: Alex Shvid Date: Tue, 26 Nov 2013 12:56:59 -0800 Subject: [PATCH 2/4] changed links to spring-data-build.git and spring-data-commons.git projects --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index fd230f805..cf950a1f9 100644 --- a/readme.md +++ b/readme.md @@ -11,10 +11,10 @@ Cloning When cloning this repo, it's a good idea to also clone two others from Spring Data that this project depends on. Assuming your current working directory is the root of this repository, issue the following commands: cd .. - git clone git@github.com:spring-projects/spring-data-build.git - git clone git@github.com:spring-projects/spring-data-commons.git + git clone https://github.com/spring-projects/spring-data-build.git + git clone https://github.com/spring-projects/spring-data-commons.git Building -------- -This is a standard Maven multimodule project. Just issue the command `mvn clean install` from the repo root. \ No newline at end of file +This is a standard Maven multimodule project. Just issue the command `mvn clean install` from the repo root. From 88730e73a30aeb66160122d6cbd3e95f30000cc0 Mon Sep 17 00:00:00 2001 From: Alex Shvid Date: Tue, 26 Nov 2013 13:34:28 -0800 Subject: [PATCH 3/4] change Error to IllegalArgumentException in AlterTableCqlGenerator --- .../cassandra/core/cql/generator/AlterTableCqlGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java index 64ed9e5b7..42ec89f19 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java @@ -64,7 +64,7 @@ public class AlterTableCqlGenerator extends TableOptionsCqlGenerator Date: Tue, 26 Nov 2013 13:38:03 -0800 Subject: [PATCH 4/4] log4j configuration for embedded cassandra unit --- .../src/test/resources/log4j-embedded-cassandra.properties | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties diff --git a/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties b/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties new file mode 100644 index 000000000..6e2ec3286 --- /dev/null +++ b/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties @@ -0,0 +1,6 @@ +log4j.rootLogger=WARN, stdout +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.logger.org.springframework.data.cassandra=INFO +