From e02728d5fc1f61a488c8df57bd30e12e3a7e6399 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Wed, 20 Mar 2019 12:51:20 -0700
Subject: [PATCH] DATACASS-640 - Polish.

Resolves gh-149.
---
 pom.xml                                       |  4 +-
 spring-data-cassandra-distribution/pom.xml    |  4 +-
 .../config/spring-data-cassandra-basic.xml    |  8 +--
 ...andraNamespaceIntegrationTests-context.xml | 35 +++++-----
 ...atingXmlConfigIntegrationTests-context.xml | 70 ++++++++++---------
 ...atingXmlConfigIntegrationTests-context.xml | 24 ++++---
 ...nimalXmlConfigIntegrationTests-context.xml | 21 +++---
 .../config/cluster-and-mock-session.xml       | 11 +--
 .../config/mock-session-converter.xml         | 12 ++--
 .../config/mock-session-mapping-converter.xml | 14 ++--
 .../cassandra/config/multiple-converters.xml  | 15 ++--
 .../config/multiple-mapping-contexts.xml      | 15 ++--
 .../config/multiple-session-factories.xml     | 15 ++--
 .../cassandra/config/multiple-sessions.xml    | 10 +--
 .../config/two-keyspaces-namespace.xml        | 28 ++++----
 ...itoryXmlConfigIntegrationTests-context.xml | 49 ++++++-------
 ...itoryXmlConfigIntegrationTests-context.xml | 56 +++++++--------
 17 files changed, 202 insertions(+), 189 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5f708cdaf..a2aecd136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-data-cassandra-distribution/pom.xml b/spring-data-cassandra-distribution/pom.xml
index 6465f7568..5b86792e7 100644
--- a/spring-data-cassandra-distribution/pom.xml
+++ b/spring-data-cassandra-distribution/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
diff --git a/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml b/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml
index 4773870ae..bf7f9b791 100644
--- a/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml
+++ b/spring-data-cassandra/src/test/resources/config/spring-data-cassandra-basic.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:cass="http://www.springframework.org/schema/data/cassandra"
+       xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-		http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
 		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
 ">
 
@@ -17,8 +17,8 @@
 
 	<context:property-placeholder location="classpath:/config/cassandra-connection.properties"/>
 
-	<cass:converter mapping-ref="cassandraMapping"/>
+	<cassandra:converter mapping-ref="cassandraMapping"/>
 
-	<cass:template/>
+	<cassandra:template/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml
index 64da0ba70..c53d285b6 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/CassandraNamespaceIntegrationTests-context.xml
@@ -1,43 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:context="http://www.springframework.org/schema/context"
 	   xmlns:cql="http://www.springframework.org/schema/cql"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd">
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
+">
 
 	<bean id="nettyOptions" class="org.springframework.data.cassandra.support.IntegrationTestNettyOptions"/>
 
 	<context:property-placeholder
 			location="classpath:/config/cassandra-connection.properties,classpath:/org/springframework/data/cassandra/config/cassandra.properties"/>
 
-	<cass:cluster contact-points="${build.cassandra.host}"
+	<cassandra:cluster contact-points="${build.cassandra.host}"
 				  port="${build.cassandra.native_transport_port}" compression="SNAPPY" netty-options-ref="nettyOptions">
-		<cass:local-pooling-options
+		<cassandra:local-pooling-options
 				min-simultaneous-requests="26" max-simultaneous-requests="101"
 				core-connections="3" max-connections="9"/>
-		<cass:remote-pooling-options
+		<cassandra:remote-pooling-options
 				min-simultaneous-requests="25" max-simultaneous-requests="100"
 				core-connections="1" max-connections="2"/>
-		<cass:socket-options connect-timeout-millis="5000"
+		<cassandra:socket-options connect-timeout-millis="5000"
 							 keep-alive="true" reuse-address="true" so-linger="60" tcp-no-delay="true"
 							 receive-buffer-size="65536" send-buffer-size="65536"/>
-		<cass:keyspace name="${cassandra.keyspace}" action="CREATE_DROP"
+		<cassandra:keyspace name="${cassandra.keyspace}" action="CREATE_DROP"
 					   durable-writes="true"/>
-	</cass:cluster>
+	</cassandra:cluster>
 
-	<cass:mapping>
-		<cass:user-type-resolver keyspace-name="${cassandra.keyspace}"/>
-	</cass:mapping>
+	<cassandra:mapping>
+		<cassandra:user-type-resolver keyspace-name="${cassandra.keyspace}"/>
+	</cassandra:mapping>
 
-	<cass:converter/>
+	<cassandra:converter/>
 
-	<cass:session keyspace-name="${cassandra.keyspace}"
+	<cassandra:session keyspace-name="${cassandra.keyspace}"
 				  schema-action="NONE"/>
 
 	<cql:template id="foo-template"/>
-	<cass:template cql-template-ref="foo-template"/>
+	<cassandra:template cql-template-ref="foo-template"/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml
index 5c4241442..5c0b758a9 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml
@@ -1,49 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cql"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
-	http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	   xmlns:cassandra="http://www.springframework.org/schema/cql"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+	   	http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
+">
 
 	<context:property-placeholder
-			location="classpath:/config/cassandra-connection.properties,classpath:/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties"/>
+		location="classpath:/config/cassandra-connection.properties,classpath:/org/springframework/data/cassandra/config/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties"/>
 
 	<bean id="nettyOptions" class="org.springframework.data.cassandra.support.IntegrationTestNettyOptions"/>
 
-	<cass:cluster port="${build.cassandra.native_transport_port}" compression="LZ4" netty-options-ref="nettyOptions">
-		<cass:keyspace action="CREATE_DROP" durable-writes="true"
-			name="full1">
-			<cass:replication class="SIMPLE_STRATEGY">
-				<cass:data-center name="foo" replication-factor="1" />
-				<cass:data-center name="bar" replication-factor="2" />
-			</cass:replication>
-		</cass:keyspace>
-		<cass:keyspace action="CREATE_DROP" durable-writes="false"
+	<cassandra:cluster port="${build.cassandra.native_transport_port}" compression="LZ4" netty-options-ref="nettyOptions">
+		<cassandra:keyspace action="CREATE_DROP" durable-writes="true" name="full1">
+			<cassandra:replication class="SIMPLE_STRATEGY">
+				<cassandra:data-center name="foo" replication-factor="1"/>
+				<cassandra:data-center name="bar" replication-factor="2"/>
+			</cassandra:replication>
+		</cassandra:keyspace>
+		<cassandra:keyspace action="CREATE_DROP" durable-writes="false"
 					   name="full2">
-			<cass:replication class="SIMPLE_STRATEGY" replication-factor="2"/>
-		</cass:keyspace>
-		<cass:keyspace action="ALTER" durable-writes="true"
+			<cassandra:replication class="SIMPLE_STRATEGY" replication-factor="2"/>
+		</cassandra:keyspace>
+		<cassandra:keyspace action="ALTER" durable-writes="true"
 					   name="full2">
-			<cass:replication class="NETWORK_TOPOLOGY_STRATEGY">
-				<cass:data-center name="foo" replication-factor="4"/>
-				<cass:data-center name="bar" replication-factor="4"/>
-			</cass:replication>
-		</cass:keyspace>
-		<cass:startup-cql><![CDATA[
+			<cassandra:replication class="NETWORK_TOPOLOGY_STRATEGY">
+				<cassandra:data-center name="foo" replication-factor="4"/>
+				<cassandra:data-center name="bar" replication-factor="4"/>
+			</cassandra:replication>
+		</cassandra:keyspace>
+		<cassandra:startup-cql><![CDATA[
 CREATE KEYSPACE IF NOT EXISTS script1 WITH durable_writes = true AND replication = { 'replication_factor' : 1, 'class' : 'SimpleStrategy' };
-		]]></cass:startup-cql>
-		<cass:startup-cql><![CDATA[
+		]]></cassandra:startup-cql>
+		<cassandra:startup-cql><![CDATA[
 ${script2}
-		]]></cass:startup-cql>
-		<cass:shutdown-cql><![CDATA[
+		]]></cassandra:startup-cql>
+		<cassandra:shutdown-cql><![CDATA[
 DROP KEYSPACE script1;
-		]]></cass:shutdown-cql>
-		<cass:shutdown-cql><![CDATA[
+		]]></cassandra:shutdown-cql>
+		<cassandra:shutdown-cql><![CDATA[
 DROP KEYSPACE script2;
-		]]></cass:shutdown-cql>
-	</cass:cluster>
+		]]></cassandra:shutdown-cql>
+	</cassandra:cluster>
+
+	<cassandra:session keyspace-name="full1"/>
 
-	<cass:session keyspace-name="full1" />
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml
index a2af2502d..91d4c9684 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cql"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="
-	http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
-	http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-	http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	   xmlns:cassandra="http://www.springframework.org/schema/cql"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+	   	http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
+">
 
 	<context:property-placeholder
-		location="classpath:/config/cassandra-connection.properties" />
+		location="classpath:/config/cassandra-connection.properties"/>
 
-	<cass:cluster port="${build.cassandra.native_transport_port}">
-		<cass:keyspace action="CREATE_DROP" name="minimal" />
-	</cass:cluster>
+	<cassandra:cluster port="${build.cassandra.native_transport_port}">
+		<cassandra:keyspace action="CREATE_DROP" name="minimal"/>
+	</cassandra:cluster>
 
-	<cass:session keyspace-name="minimal" />
+	<cassandra:session keyspace-name="minimal"/>
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests-context.xml
index 5935bd4fa..b9ae24c90 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/MinimalXmlConfigIntegrationTests-context.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cass="http://www.springframework.org/schema/cql"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
-                         http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-                         http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	   xmlns:cassandra="http://www.springframework.org/schema/cql"
+	   xmlns:context="http://www.springframework.org/schema/context"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="
+	   	http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd
+	   	http://www.springframework.org/schema/cql https://www.springframework.org/schema/cql/spring-cql.xsd
+">
 
 	<context:property-placeholder
-		location="classpath:/config/cassandra-connection.properties" />
+		location="classpath:/config/cassandra-connection.properties"/>
 
-	<cass:cluster port="${build.cassandra.native_transport_port}" />
+	<cassandra:cluster port="${build.cassandra.native_transport_port}"/>
 
-	<cass:session keyspace-name="minimalxmlconfigtest" />
+	<cassandra:session keyspace-name="minimalxmlconfigtest"/>
 
-	<cass:template />
+	<cassandra:template/>
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/cluster-and-mock-session.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/cluster-and-mock-session.xml
index 7d768df17..1baf4340d 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/cluster-and-mock-session.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/cluster-and-mock-session.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<cass:cluster/>
+	<cassandra:cluster/>
 	<bean class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-converter.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-converter.xml
index 5b67446f6..d51f2138a 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-converter.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-converter.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd
-
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
 	<bean class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
-	<cass:converter />
+
+	<cassandra:converter/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-mapping-converter.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-mapping-converter.xml
index fcb820d58..c16d34fac 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-mapping-converter.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/mock-session-mapping-converter.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd
-
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
 	<bean class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
-	<cass:mapping/>
-	<cass:converter/>
+
+	<cassandra:converter/>
+	<cassandra:mapping/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml
index 60a6ca487..b3c48cbdc 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-converters.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<cass:cluster/>
+	<cassandra:cluster/>
 
 	<bean class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
 
-	<cass:mapping/>
-	<cass:converter/>
+	<cassandra:converter/>
+	<cassandra:mapping/>
 
 	<bean class="org.springframework.data.cassandra.core.convert.MappingCassandraConverter">
 		<constructor-arg index="0" ref="cassandraMapping"/>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml
index cd0bec892..6fc561235 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-mapping-contexts.xml
@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
+
+	<cassandra:cluster/>
 
-	<cass:cluster/>
 	<bean class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
-	<cass:mapping/>
+
+	<cassandra:mapping/>
+
 	<bean class="org.springframework.data.cassandra.core.mapping.CassandraMappingContext"/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-session-factories.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-session-factories.xml
index 34a0f299d..0b7e040cb 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-session-factories.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-session-factories.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-	<cass:cluster/>
-	<cass:session id="session-1" keyspace-name="system"/>
-	<cass:session id="session-2" keyspace-name="system"/>
+	<cassandra:cluster/>
+	<cassandra:session id="session-1" keyspace-name="system"/>
+	<cassandra:session id="session-2" keyspace-name="system"/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-sessions.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-sessions.xml
index a9c4fbe16..a6c289703 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-sessions.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/multiple-sessions.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+	<cassandra:cluster/>
 
-	<cass:cluster/>
 	<bean id="mockSession1" class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
 	<bean id="mockSession2" class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
 
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/two-keyspaces-namespace.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/two-keyspaces-namespace.xml
index dee87e353..64a66096f 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/two-keyspaces-namespace.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/config/two-keyspaces-namespace.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
-	   xsi:schemaLocation="http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra-1.5.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	   xsi:schemaLocation="
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
+">
 
-	<cass:cluster/>
+	<cassandra:cluster/>
 
-	<bean id="keyspace-1"
-		  class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
-	<bean id="keyspace-2"
-		  class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
+	<bean id="keyspace-1" class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
+	<bean id="keyspace-2" class="org.springframework.data.cassandra.config.CassandraMappingBeanFactoryPostProcessorUnitTests.MockSessionFactory"/>
 
-	<cass:mapping id="mapping-1"/>
-	<cass:mapping id="mapping-2"/>
+	<cassandra:mapping id="mapping-1"/>
+	<cassandra:mapping id="mapping-2"/>
 
-	<cass:converter id="converter-1" mapping-ref="mapping-1"/>
-	<cass:converter id="converter-2" mapping-ref="mapping-2"/>
+	<cassandra:converter id="converter-1" mapping-ref="mapping-1"/>
+	<cassandra:converter id="converter-2" mapping-ref="mapping-2"/>
 
-	<cass:template id="c-1" cassandra-converter-ref="converter-1" session-ref="keyspace-1"/>
-	<cass:template id="c-2" cassandra-converter-ref="converter-2" session-ref="keyspace-2"/>
+	<cassandra:template id="c-1" cassandra-converter-ref="converter-1" session-ref="keyspace-1"/>
+	<cassandra:template id="c-2" cassandra-converter-ref="converter-2" session-ref="keyspace-2"/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml
index d6375f572..b4c7b8cdb 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/compositeprimarykey/ForceQuotedCompositePrimaryKeyRepositoryXmlConfigIntegrationTests-context.xml
@@ -1,42 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
 	   xsi:schemaLocation="
-	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+	   	http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
 ">
 
 	<import resource="classpath:/config/spring-data-cassandra-basic.xml"/>
 
-	<cass:mapping
-			entity-base-packages="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey">
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.Implicit">
-			<cass:table force-quote="true" />
-		</cass:entity>
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.Explicit">
-			<cass:table force-quote="true" name="XmlExplicitTable" />
-			<cass:property name="stringValue" force-quote="true" column-name="XmlExplicitStringValue"/>
-		</cass:entity>
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.ExplicitKey">
-			<cass:property name="keyZero" force-quote="true" column-name="XmlExplicitKeyZero"/>
-			<cass:property name="keyOne" force-quote="true" column-name="XmlExplicitKeyOne"/>
-		</cass:entity>
-	</cass:mapping>
+	<cassandra:mapping entity-base-packages="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey">
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.Implicit">
+			<cassandra:table force-quote="true"/>
+		</cassandra:entity>
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.Explicit">
+			<cassandra:table name="XmlExplicitTable" force-quote="true"/>
+			<cassandra:property name="stringValue" force-quote="true" column-name="XmlExplicitStringValue"/>
+		</cassandra:entity>
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey.ExplicitKey">
+			<cassandra:property name="keyZero" force-quote="true" column-name="XmlExplicitKeyZero"/>
+			<cassandra:property name="keyOne" force-quote="true" column-name="XmlExplicitKeyOne"/>
+		</cassandra:entity>
+	</cassandra:mapping>
 
-	<cass:cluster port="${build.cassandra.native_transport_port}" netty-options-ref="nettyOptions">
-		<cass:keyspace name="#{randomKeyspaceName}"
-			action="CREATE_DROP" durable-writes="true">
-		</cass:keyspace>
-	</cass:cluster>
+	<cassandra:cluster port="${build.cassandra.native_transport_port}" netty-options-ref="nettyOptions">
+		<cassandra:keyspace name="#{randomKeyspaceName}" action="CREATE_DROP" durable-writes="true">
+		</cassandra:keyspace>
+	</cassandra:cluster>
 
-	<cass:session keyspace-name="#{randomKeyspaceName}"
-		schema-action="RECREATE_DROP_UNUSED">
-	</cass:session>
+	<cassandra:session keyspace-name="#{randomKeyspaceName}" schema-action="RECREATE_DROP_UNUSED"/>
 
-	<cass:repositories base-package="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey"/>
+	<cassandra:repositories base-package="org.springframework.data.cassandra.repository.forcequote.compositeprimarykey"/>
 
 </beans>
diff --git a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml
index c070aa289..925c7a35f 100644
--- a/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml
+++ b/spring-data-cassandra/src/test/resources/org/springframework/data/cassandra/repository/forcequote/config/ForceQuotedRepositoryXmlConfigIntegrationTests-context.xml
@@ -1,52 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:cass="http://www.springframework.org/schema/data/cassandra"
+	   xmlns:cassandra="http://www.springframework.org/schema/data/cassandra"
 	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	   xsi:schemaLocation="
-		http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/data/cassandra https://www.springframework.org/schema/data/cassandra/spring-cassandra.xsd
 ">
 
 	<import resource="classpath:/config/spring-data-cassandra-basic.xml"/>
 
-	<cass:mapping
-			entity-base-packages="org.springframework.data.cassandra.repository.forcequote.config">
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.config.Implicit">
-			<cass:table force-quote="true" />
-		</cass:entity>
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.config.Explicit">
+	<cassandra:mapping entity-base-packages="org.springframework.data.cassandra.repository.forcequote.config">
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.config.Implicit">
+			<cassandra:table force-quote="true" />
+		</cassandra:entity>
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.config.Explicit">
 			<!-- this value must match those in
 			org.springframework.data.cassandra.test.integration.forcequote.config.ForceQuotedRepositoryXmlConfigIntegrationTests
 			testExplicit() -->
-			<cass:table force-quote="true" name="Zz" />
-		</cass:entity>
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.config.ImplicitProperties">
-			<cass:property name="primaryKey" force-quote="true" />
-			<cass:property name="stringValue" force-quote="true" />
-		</cass:entity>
-		<cass:entity
-				class="org.springframework.data.cassandra.repository.forcequote.config.ExplicitProperties">
+			<cassandra:table name="Zz" force-quote="true"/>
+		</cassandra:entity>
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.config.ImplicitProperties">
+			<cassandra:property name="primaryKey" force-quote="true" />
+			<cassandra:property name="stringValue" force-quote="true" />
+		</cassandra:entity>
+		<cassandra:entity class="org.springframework.data.cassandra.repository.forcequote.config.ExplicitProperties">
 			<!-- these values must match those in
 			org.springframework.data.cassandra.test.integration.forcequote.config.ForceQuotedRepositoryXmlConfigIntegrationTests
 			testExplicitPropertiesWithXmlValues() -->
-			<cass:property name="primaryKey" force-quote="true" column-name="XmlPrimaryKey"/>
-			<cass:property name="stringValue" force-quote="true" column-name="XmlStringValue"/>
-		</cass:entity>
-	</cass:mapping>
+			<cassandra:property name="primaryKey" force-quote="true" column-name="XmlPrimaryKey"/>
+			<cassandra:property name="stringValue" force-quote="true" column-name="XmlStringValue"/>
+		</cassandra:entity>
+	</cassandra:mapping>
 
-	<cass:cluster port="${build.cassandra.native_transport_port}" netty-options-ref="nettyOptions">
-		<cass:keyspace name="ForceQuoteRepositoryXmlConfigIntegrationTests"
-			action="CREATE_DROP" durable-writes="true">
-		</cass:keyspace>
-	</cass:cluster>
+	<cassandra:cluster port="${build.cassandra.native_transport_port}" netty-options-ref="nettyOptions">
+		<cassandra:keyspace name="ForceQuoteRepositoryXmlConfigIntegrationTests" action="CREATE_DROP" durable-writes="true">
+		</cassandra:keyspace>
+	</cassandra:cluster>
 
-	<cass:session keyspace-name="ForceQuoteRepositoryXmlConfigIntegrationTests"
-		schema-action="RECREATE_DROP_UNUSED">
-	</cass:session>
+	<cassandra:session keyspace-name="ForceQuoteRepositoryXmlConfigIntegrationTests" schema-action="RECREATE_DROP_UNUSED"/>
 
-	<cass:repositories base-package="org.springframework.data.cassandra.repository.forcequote.config"/>
+	<cassandra:repositories base-package="org.springframework.data.cassandra.repository.forcequote.config"/>
 
 </beans>