Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into DATACASS-14

Browse Source
This commit is contained in:
Matthew Adams
2013-12-09 16:43:48 -06:00
parent f46a7ef991 fd46046255
commit 9bf80488c1
11 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@@ -27,11 +27,14 @@
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.type>multi</project.type>
<dist.id>spring-data-cassandra</dist.id>
<springdata.commons>1.6.2.RELEASE</springdata.commons>
<cassandra-unit.version>1.2.0.1</cassandra-unit.version>
<cassandra-driver-core.version>1.0.4-dse</cassandra-driver-core.version>
<failsafe.version>2.16</failsafe.version>
</properties>
<developers>
@@ -123,10 +126,19 @@
<version>${spring}</version>
</dependency>
<!-- Logging Dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.4</version>
<artifactId>log4j-over-slf4j</artifactId>
<version>${slf4j}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<version>${slf4j}</version>
<scope>test</scope>
</dependency>
<!-- CDI -->
@@ -246,6 +258,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${failsafe.version}</version>
<configuration>
<forkMode>always</forkMode>
<argLine>-Xmx2048m -XX:MaxPermSize=512m</argLine>

6
spring-cassandra/pom.xml
View File

@@ -44,6 +44,12 @@
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<exclusions>
<exclusion>
<artifactId>log4j</artifactId>
<groupId>log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>

2
spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java
View File

@@ -16,7 +16,7 @@ import com.datastax.driver.core.Session;
public abstract class AbstractEmbeddedCassandraIntegrationTest {
protected final static String CASSANDRA_CONFIG = "cassandra.yaml";
protected final static String CASSANDRA_CONFIG = "spring-cassandra.yaml";
protected final static String CASSANDRA_HOST = "localhost";
protected final static int CASSANDRA_NATIVE_PORT = 9042;

3
spring-cassandra/src/test/resources/cassandra-keyspace.yaml
View File

@@ -1,3 +0,0 @@
name: test
replicationFactor: 1
strategy: org.apache.cassandra.locator.SimpleStrategy

3
spring-cassandra/src/test/resources/cql-dataload.cql
View File

@@ -1,3 +0,0 @@
create table book (isbn text, title text, author text, pages int, PRIMARY KEY (isbn));
create table book_alt (isbn text, title text, author text, pages int, PRIMARY KEY (isbn));
/*insert into book (isbn, title, author, pages) values ('999999999', 'Book of Nines', 'Nine Nine', 999);*/

6
spring-cassandra/src/test/resources/log4j.properties
View File

@@ -1,6 +0,0 @@
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

0
spring-cassandra/src/test/resources/logback.xml → spring-cassandra/src/test/resources/logback-test.xml
View File

1
spring-cassandra/src/test/resources/logging.properties
View File

@@ -1 +0,0 @@
handlers = org.slf4j.bridge.SLF4JBridgeHandler

0
spring-cassandra/src/test/resources/cassandra.yaml → spring-cassandra/src/test/resources/spring-cassandra.yaml
View File

3
spring-data-cassandra-distribution/pom.xml
View File

@@ -21,6 +21,7 @@
<properties>
<project.root>${basedir}/..</project.root>
<dist.key>SDCASS</dist.key>
<wagon.version>1.0.3</wagon.version>
</properties>
<build>
@@ -28,10 +29,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>${wagon.version}</version>
</plugin>
</plugins>
</build>

3
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/CassandraPropertyValueProvider.java
View File

@@ -20,7 +20,6 @@ import java.nio.ByteBuffer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.cassandra.mapping.CassandraPersistentProperty;
import org.springframework.data.cassandra.util.CqlUtils;
import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
import org.springframework.data.mapping.model.PropertyValueProvider;
import org.springframework.data.mapping.model.SpELExpressionEvaluator;
@@ -74,7 +73,7 @@ public class CassandraPropertyValueProvider implements PropertyValueProvider<Cas
}
DataType columnType = source.getColumnDefinitions().getType(columnName);
log.info(columnType.getName().name());
log.debug(columnType.getName().name());
/*
* Dave Webb - Added handler for text since getBytes was throwing