diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd index 8c5ad68e3..442a21e23 100644 --- a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd +++ b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd @@ -6,11 +6,11 @@ elementFormDefault="qualified" attributeFormDefault="unqualified"> + schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd"/> @@ -31,12 +31,12 @@ Defines a Cassandra cluster. - + @@ -45,13 +45,12 @@ Defines a Cassandra session. - + @@ -68,59 +67,42 @@ Defines a CassandraTemplate. - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -171,119 +208,13 @@ AuthInfoProvider implementation. - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="com.datastax.driver.core.policies.LoadBalancingPolicy"/> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="com.datastax.driver.core.policies.ReconnectionPolicy"/> - + @@ -398,37 +262,13 @@ RetryPolicy implementation. - - - - - - - - - - - - - - - + type="com.datastax.driver.core.policies.RetryPolicy"/> - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + - - - - - - + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -627,13 +385,6 @@ Sets read timeout for client socket in milliseconds. ]]> - - - - - - - - - - + + + + + + + + + + - - - - + - + + + + + + + + - + + - + + + + + + @@ -699,17 +472,112 @@ The replication factor; default is 1. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd index b89f0a674..9b8b0352f 100644 --- a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd +++ b/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd @@ -1,19 +1,4 @@ - @@ -60,13 +45,13 @@ Defines a Cassandra session. + type="org.springframework.cassandra.core.CqlTemplate" /> @@ -136,7 +121,6 @@ Provides the ability to define a keyspace. - - - - + schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd"/> + schemaLocation="http://www.springframework.org/schema/tool/spring-tool.xsd"/> + schemaLocation="http://www.springframework.org/schema/context/spring-context.xsd"/> + schemaLocation="http://www.springframework.org/schema/data/repository/spring-repository.xsd"/> - - - - - - - - - - - - - - - - - - - - - - @@ -151,22 +129,68 @@ The name of the Cassandra Cluster definition; default is "cassandra-cluster". ]]> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - @@ -178,119 +202,13 @@ AuthInfoProvider implementation. - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="com.datastax.driver.core.policies.LoadBalancingPolicy"/> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="com.datastax.driver.core.policies.ReconnectionPolicy"/> - + @@ -405,37 +256,13 @@ RetryPolicy implementation. - - - - - - - - - - - - - - - + type="com.datastax.driver.core.policies.RetryPolicy"/> - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + - - - - - - + + - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -679,13 +379,6 @@ Sets read timeout for client socket in milliseconds. ]]> - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -724,13 +486,6 @@ The name of the template; default is "cassandraTemplate". ]]> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -754,47 +698,13 @@ The reference to a cassandraTemplate. Will default to 'cassandraTemplate'. - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + type="org.springframework.data.cassandra.mapping.CassandraMappingContext"/> - - + - + - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd index 3388f4c8a..9ac6ce276 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd @@ -1,19 +1,4 @@ - @@ -67,7 +52,7 @@ Defines a Cassandra session. @@ -143,7 +128,6 @@ Provides the ability to define a keyspace. - - - - -