DATACASS-80 - renamed module spring-cassandra -> spring-cql, xml namespace from .../cassandra -> .../cql, + classes

pom.xml

@@ -10,7 +10,7 @@
 	<packaging>pom</packaging>
 
 	<name>Spring Data Cassandra</name>
-	<description>Cassandra support for Spring Data</description>
+	<description>Spring Data Cassandra</description>
 	<url>http://www.springsource.org/spring-data/cassandra</url>
 
 	<parent>
@@ -21,7 +21,7 @@
 	</parent>
 
 	<modules>
-		<module>spring-cassandra</module>
+		<module>spring-cql</module>
 		<module>spring-data-cassandra</module>
 		<module>spring-data-cassandra-distribution</module>
 	</modules>

spring-cassandra/src/main/resources/META-INF/spring.handlers

@@ -1 +0,0 @@
-http\://www.springframework.org/schema/cassandra=org.springframework.cassandra.config.xml.CassandraNamespaceHandler

spring-cassandra/src/main/resources/META-INF/spring.schemas

@@ -1,2 +0,0 @@
-http\://www.springframework.org/schema/cassandra/spring-cassandra-1.0.xsd=org/springframework/cassandra/config/spring-cassandra-1.0.xsd
-http\://www.springframework.org/schema/cassandra/spring-cassandra.xsd=org/springframework/cassandra/config/spring-cassandra-1.0.xsd

spring-cassandra/src/main/resources/META-INF/spring.tooling

@@ -1,4 +0,0 @@
-# Tooling related information for the cassandra namespace
-http\://www.springframework.org/schema/cassandra@name=Spring Cassandra Namespace
-http\://www.springframework.org/schema/cassandra@prefix=cassandra
-http\://www.springframework.org/schema/cassandra@icon=org/springframework/data/cassandra/config/spring-cassandra.gif

spring-cql/pom.xml

@@ -4,10 +4,10 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>spring-cassandra</artifactId>
+	<artifactId>spring-cql</artifactId>
 
-	<name>Spring Cassandra - Core</name>
-	<description>Cassandra support for Spring</description>
+	<name>Spring CQL</name>
+	<description>Raw Cassandra CQL Support for Spring Core</description>
 
 	<parent>
 		<groupId>org.springframework.data</groupId>

spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java

@@ -57,7 +57,7 @@ import com.datastax.driver.core.policies.RetryPolicy;
  * @author Matthew T. Adams
  * @author David Webb
  */
-public class CassandraClusterFactoryBean implements FactoryBean<Cluster>, InitializingBean, DisposableBean,
+public class CassandraCqlClusterFactoryBean implements FactoryBean<Cluster>, InitializingBean, DisposableBean,
 		PersistenceExceptionTranslator {
 
 	public static final String DEFAULT_CONTACT_POINTS = "localhost";
@@ -67,7 +67,7 @@ public class CassandraClusterFactoryBean implements FactoryBean<Cluster>, Initia
 	public static final boolean DEFAULT_SSL_ENABLED = false;
 	public static final int DEFAULT_PORT = 9042;
 
-	protected static final Logger log = LoggerFactory.getLogger(CassandraClusterFactoryBean.class);
+	protected static final Logger log = LoggerFactory.getLogger(CassandraCqlClusterFactoryBean.class);
 
 	private Cluster cluster;
 
@@ -75,7 +75,7 @@ public class CassandraClusterFactoryBean implements FactoryBean<Cluster>, Initia
 	 * Attributes needed for cluster builder
 	 */
 	private String contactPoints = DEFAULT_CONTACT_POINTS;
-	private int port = CassandraClusterFactoryBean.DEFAULT_PORT;
+	private int port = CassandraCqlClusterFactoryBean.DEFAULT_PORT;
 	private CompressionType compressionType;
 	private PoolingOptions poolingOptions;
 	private SocketOptions socketOptions;

spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java

@@ -42,10 +42,10 @@ import com.datastax.driver.core.Session;
  * @author Matthew T. Adams
  */
 
-public class CassandraSessionFactoryBean implements FactoryBean<Session>, InitializingBean, DisposableBean,
+public class CassandraCqlSessionFactoryBean implements FactoryBean<Session>, InitializingBean, DisposableBean,
 		PersistenceExceptionTranslator {
 
-	private static final Logger log = LoggerFactory.getLogger(CassandraSessionFactoryBean.class);
+	private static final Logger log = LoggerFactory.getLogger(CassandraCqlSessionFactoryBean.class);
 
 	protected Cluster cluster;
 	protected Session session;

spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java

@@ -27,7 +27,7 @@ import com.datastax.driver.core.Session;
  * 
  * @author Matthew T. Adams
  */
-public class CassandraTemplateFactoryBean implements FactoryBean<CqlOperations>, InitializingBean {
+public class CassandraCqlTemplateFactoryBean implements FactoryBean<CqlOperations>, InitializingBean {
 
 	private CqlTemplate template;
 	private Session session;

spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java

@@ -18,7 +18,7 @@ package org.springframework.cassandra.config.java;
 import java.util.Collections;
 import java.util.List;
 
-import org.springframework.cassandra.config.CassandraClusterFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean;
 import org.springframework.cassandra.config.CompressionType;
 import org.springframework.cassandra.core.keyspace.CreateKeyspaceSpecification;
 import org.springframework.cassandra.core.keyspace.DropKeyspaceSpecification;
@@ -42,9 +42,9 @@ import com.datastax.driver.core.policies.RetryPolicy;
 public abstract class AbstractClusterConfiguration {
 
 	@Bean
-	public CassandraClusterFactoryBean cluster() {
+	public CassandraCqlClusterFactoryBean cluster() {
 
-		CassandraClusterFactoryBean bean = new CassandraClusterFactoryBean();
+		CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean();
 		bean.setAuthProvider(getAuthProvider());
 		bean.setCompressionType(getCompressionType());
 		bean.setContactPoints(getContactPoints());
@@ -88,11 +88,11 @@ public abstract class AbstractClusterConfiguration {
 	}
 
 	protected int getPort() {
-		return CassandraClusterFactoryBean.DEFAULT_PORT;
+		return CassandraCqlClusterFactoryBean.DEFAULT_PORT;
 	}
 
 	protected boolean getMetricsEnabled() {
-		return CassandraClusterFactoryBean.DEFAULT_METRICS_ENABLED;
+		return CassandraCqlClusterFactoryBean.DEFAULT_METRICS_ENABLED;
 	}
 
 	protected LoadBalancingPolicy getLoadBalancingPolicy() {
@@ -108,7 +108,7 @@ public abstract class AbstractClusterConfiguration {
 	}
 
 	protected String getContactPoints() {
-		return CassandraClusterFactoryBean.DEFAULT_CONTACT_POINTS;
+		return CassandraCqlClusterFactoryBean.DEFAULT_CONTACT_POINTS;
 	}
 
 	protected CompressionType getCompressionType() {

spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java

@@ -15,7 +15,7 @@
  */
 package org.springframework.cassandra.config.java;
 
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -33,11 +33,11 @@ public abstract class AbstractSessionConfiguration extends AbstractClusterConfig
 	protected abstract String getKeyspaceName();
 
 	@Bean
-	public CassandraSessionFactoryBean session() throws Exception {
+	public CassandraCqlSessionFactoryBean session() throws Exception {
 
 		Cluster cluster = cluster().getObject();
 
-		CassandraSessionFactoryBean bean = new CassandraSessionFactoryBean();
+		CassandraCqlSessionFactoryBean bean = new CassandraCqlSessionFactoryBean();
 		bean.setCluster(cluster);
 		bean.setKeyspaceName(getKeyspaceName());
 

spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java

@@ -31,7 +31,7 @@ import org.springframework.beans.factory.support.ManagedList;
 import org.springframework.beans.factory.support.ManagedSet;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.CassandraClusterFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlClusterFactoryBean;
 import org.springframework.cassandra.config.KeyspaceActionSpecificationFactoryBean;
 import org.springframework.cassandra.config.KeyspaceAttributes;
 import org.springframework.cassandra.config.MultiLevelSetFlattenerFactoryBean;
@@ -52,20 +52,20 @@ import com.datastax.driver.core.SocketOptions;
  * @author Matthew T. Adams
  * @author David Webb
  */
-public class CassandraClusterParser extends AbstractBeanDefinitionParser {
+public class CassandraCqlClusterParser extends AbstractBeanDefinitionParser {
 
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultBeanNames.CLUSTER;
+		return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.CLUSTER;
 	}
 
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CassandraClusterFactoryBean.class);
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(CassandraCqlClusterFactoryBean.class);
 		builder.getRawBeanDefinition().setSource(parserContext.extractSource(element));
 		builder.getRawBeanDefinition().setDestroyMethodName("destroy");
 		if (parserContext.isNested()) {
@@ -114,7 +114,7 @@ public class CassandraClusterParser extends AbstractBeanDefinitionParser {
 	}
 
 	/**
-	 * Parse the Child Element of {@link DefaultBeanNames.CLUSTER}
+	 * Parse the Child Element of {@link DefaultCqlBeanNames.CLUSTER}
 	 * 
 	 * @param element The Element being parsed
 	 * @param context The Parser Context

spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.CassandraSessionFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlSessionFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Attr;
@@ -37,11 +37,11 @@ import org.w3c.dom.NamedNodeMap;
  * @author David Webb
  * @author Matthew T. Adams
  */
-public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
+public class CassandraCqlSessionParser extends AbstractSingleBeanDefinitionParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return CassandraSessionFactoryBean.class;
+		return CassandraCqlSessionFactoryBean.class;
 	}
 
 	@Override
@@ -49,7 +49,7 @@ public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultBeanNames.SESSION;
+		return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.SESSION;
 	}
 
 	/**
@@ -81,7 +81,7 @@ public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
 	}
 
 	protected void setDefaultProperties(BeanDefinitionBuilder builder) {
-		addRequiredPropertyReference(builder, "cluster", DefaultBeanNames.CLUSTER);
+		addRequiredPropertyReference(builder, "cluster", DefaultCqlBeanNames.CLUSTER);
 	}
 
 	protected void parseSessionAttributes(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
@@ -101,7 +101,7 @@ public class CassandraSessionParser extends AbstractSingleBeanDefinitionParser {
 			if ("keyspace-name".equals(name)) {
 				addRequiredPropertyValue(builder, "keyspaceName", attribute);
 			} else if ("cluster-ref".equals(name)) {
-				addOptionalPropertyReference(builder, "cluster", attribute, DefaultBeanNames.CLUSTER);
+				addOptionalPropertyReference(builder, "cluster", attribute, DefaultCqlBeanNames.CLUSTER);
 			} else {
 				parseUnhandledSessionElementAttribute(attribute, parserContext, builder);
 			}

spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java

@@ -22,7 +22,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.cassandra.config.CassandraTemplateFactoryBean;
+import org.springframework.cassandra.config.CassandraCqlTemplateFactoryBean;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
 
@@ -32,11 +32,11 @@ import org.w3c.dom.Element;
  * @author David Webb
  * @author Matthew T. Adams
  */
-public class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser {
+public class CassandraCqlTemplateParser extends AbstractSingleBeanDefinitionParser {
 
 	@Override
 	protected Class<?> getBeanClass(Element element) {
-		return CassandraTemplateFactoryBean.class;
+		return CassandraCqlTemplateFactoryBean.class;
 	}
 
 	@Override
@@ -44,11 +44,11 @@ public class CassandraTemplateParser extends AbstractSingleBeanDefinitionParser
 			throws BeanDefinitionStoreException {
 
 		String id = super.resolveId(element, definition, parserContext);
-		return StringUtils.hasText(id) ? id : DefaultBeanNames.TEMPLATE;
+		return StringUtils.hasText(id) ? id : DefaultCqlBeanNames.TEMPLATE;
 	}
 
 	@Override
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		addOptionalPropertyReference(builder, "session", element, "session-ref", DefaultBeanNames.SESSION);
+		addOptionalPropertyReference(builder, "session", element, "session-ref", DefaultCqlBeanNames.SESSION);
 	}
 }

spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java

@@ -28,8 +28,8 @@ public class CassandraNamespaceHandler extends NamespaceHandlerSupport {
 	@Override
 	public void init() {
 
-		registerBeanDefinitionParser("cluster", new CassandraClusterParser());
-		registerBeanDefinitionParser("session", new CassandraSessionParser());
-		registerBeanDefinitionParser("template", new CassandraTemplateParser());
+		registerBeanDefinitionParser("cluster", new CassandraCqlClusterParser());
+		registerBeanDefinitionParser("session", new CassandraCqlSessionParser());
+		registerBeanDefinitionParser("template", new CassandraCqlTemplateParser());
 	}
 }

spring-cql/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java

@@ -20,7 +20,7 @@ package org.springframework.cassandra.config.xml;
  * @author David Webb
  * @author Matthew T. Adams
  */
-public interface DefaultBeanNames {
+public interface DefaultCqlBeanNames {
 
 	public static final String CLUSTER = "cassandraCluster";
 	public static final String SESSION = "cassandraSession";