Merge branch 'master' of https://github.com/shvid/spring-data-cassandra.git

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 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.

spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java

@@ -64,7 +64,7 @@ public class AlterTableCqlGenerator extends TableOptionsCqlGenerator<AlterTableS
 		if (change instanceof AlterColumnSpecification) {
 			return new AlterColumnCqlGenerator((AlterColumnSpecification) change);
 		}
-		throw new Error("unknown ColumnChangeSpecification type: " + change.getClass().getName());
+		throw new IllegalArgumentException("unknown ColumnChangeSpecification type: " + change.getClass().getName());
 	}
 
 	@SuppressWarnings("unchecked")

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
+