diff --git a/README.md b/README.md index cd506b79e..361369e9a 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,6 @@ Prerequisites: Add the Maven dependency: ```xml - - org.springframework.data - spring-cql - ${version}.RELEASE - - org.springframework.data spring-data-cassandra @@ -48,12 +42,6 @@ Add the Maven dependency: If you would rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version. ```xml - - org.springframework.data - spring-cql - ${version}.BUILD-SNAPSHOT - - org.springframework.data spring-data-cassandra diff --git a/pom.xml b/pom.xml index 79cefac64..66f8dec26 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,6 @@ - spring-cql spring-data-cassandra spring-data-cassandra-distribution @@ -199,11 +198,6 @@ - - com.datastax.cassandra - cassandra-driver-core - - org.assertj assertj-core diff --git a/spring-cql/.gitignore b/spring-cql/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/spring-cql/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/spring-cql/pom.xml b/spring-cql/pom.xml deleted file mode 100644 index 92ea5708a..000000000 --- a/spring-cql/pom.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - 4.0.0 - - - org.springframework.data - spring-data-cassandra-parent - 2.0.0.BUILD-SNAPSHOT - ../pom.xml - - - spring-cql - - Spring CQL - Raw Cassandra CQL Support for Spring Core - https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-cql - - - - - - org.springframework - spring-context - - - - org.springframework - spring-beans - - - - org.springframework - spring-core - - - - org.springframework - spring-expression - - - - org.springframework - spring-tx - - - - - ${project.groupId} - spring-data-commons - ${springdata.commons} - - - - - io.projectreactor - reactor-core - ${reactor} - true - - - - io.projectreactor.addons - reactor-test - ${reactor} - test - - - - - com.datastax.cassandra - cassandra-driver-core - - - - com.google.guava - guava - ${guava} - - - - org.apache.cassandra - cassandra-all - - - - edu.umd.cs.mtc - multithreadedtc - - - - - - - - maven-jar-plugin - - - test-jar - - test-jar - - - - - - - diff --git a/spring-cql/src/main/resources/META-INF/spring.handlers b/spring-cql/src/main/resources/META-INF/spring.handlers deleted file mode 100644 index 0f88a8df8..000000000 --- a/spring-cql/src/main/resources/META-INF/spring.handlers +++ /dev/null @@ -1 +0,0 @@ -http\://www.springframework.org/schema/cql=org.springframework.cassandra.config.xml.CassandraNamespaceHandler diff --git a/spring-cql/src/main/resources/META-INF/spring.schemas b/spring-cql/src/main/resources/META-INF/spring.schemas deleted file mode 100644 index 59a2d3daa..000000000 --- a/spring-cql/src/main/resources/META-INF/spring.schemas +++ /dev/null @@ -1,4 +0,0 @@ -http\://www.springframework.org/schema/cql/spring-cql-1.0.xsd=org/springframework/cassandra/config/spring-cql-1.0.xsd -http\://www.springframework.org/schema/cql/spring-cql-1.5.xsd=org/springframework/cassandra/config/spring-cql-1.5.xsd -http\://www.springframework.org/schema/cql/spring-cql-2.0.xsd=org/springframework/cassandra/config/spring-cql-2.0.xsd -http\://www.springframework.org/schema/cql/spring-cql.xsd=org/springframework/cassandra/config/spring-cql-2.0.xsd diff --git a/spring-cql/src/main/resources/META-INF/spring.tooling b/spring-cql/src/main/resources/META-INF/spring.tooling deleted file mode 100644 index f81f92584..000000000 --- a/spring-cql/src/main/resources/META-INF/spring.tooling +++ /dev/null @@ -1,4 +0,0 @@ -# Tooling related information for the cql namespace -http\://www.springframework.org/schema/cql@name=Spring Cassandra CQL Namespace -http\://www.springframework.org/schema/cql@prefix=cassandra -http\://www.springframework.org/schema/cql@icon=org/springframework/data/cassandra/config/spring-cql.gif diff --git a/spring-cql/src/test/resources/config/cassandra-connection.properties b/spring-cql/src/test/resources/config/cassandra-connection.properties deleted file mode 100644 index c28cb2327..000000000 --- a/spring-cql/src/test/resources/config/cassandra-connection.properties +++ /dev/null @@ -1,9 +0,0 @@ -# cassandra-connection.properties is needed twice because of enabled random port generation -# Generated ports are only valid for one module -build.cassandra.native_transport_port=@build.cassandra.native_transport_port@ -build.cassandra.rpc_port=@build.cassandra.rpc_port@ -build.cassandra.storage_port=@build.cassandra.storage_port@ -build.cassandra.ssl_storage_port=@build.cassandra.ssl_storage_port@ -build.cassandra.mode=@build.cassandra.mode@ -build.cassandra.host=@build.cassandra.host@ -build.cassandra.reuse-cluster=true diff --git a/spring-cql/src/test/resources/embedded-cassandra.yaml b/spring-cql/src/test/resources/embedded-cassandra.yaml deleted file mode 100644 index 0099bb071..000000000 --- a/spring-cql/src/test/resources/embedded-cassandra.yaml +++ /dev/null @@ -1,652 +0,0 @@ -# Cassandra storage config YAML - -# See http://wiki.apache.org/cassandra/StorageConfiguration for -# full explanations of configuration directives -# /NOTE - -# The name of the cluster. This is mainly used to prevent machines in -# one logical cluster from joining another. -cluster_name: 'Test Cluster' - -# This defines the number of tokens randomly assigned to this node on the ring -# The more tokens, relative to other nodes, the larger the proportion of data -# that this node will store. You probably want all nodes to have the same number -# of tokens assuming they have equal hardware capability. -# -# If you leave this unspecified, Cassandra will use the default of 1 token for legacy compatibility, -# and will use the initial_token as described below. -# -# Specifying initial_token will override this setting. -# -# If you already have a cluster with 1 token per node, and wish to migrate to -# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations -# num_tokens: 256 - -# If you haven't specified num_tokens, or have set it to the default of 1 then -# you should always specify InitialToken when setting up a production -# cluster for the first time, and often when adding capacity later. -# The principle is that each node should be given an equal slice of -# the token ring; see http://wiki.apache.org/cassandra/Operations -# for more details. -# -# If blank, Cassandra will request a token bisecting the range of -# the heaviest-loaded existing node. If there is no load information -# available, such as is the case with a new cluster, it will pick -# a random token, which will lead to hot spots. -initial_token: - -# See http://wiki.apache.org/cassandra/HintedHandoff -hinted_handoff_enabled: false - -# this defines the maximum amount of time a dead host will have hints -# generated. After it has been dead this long, new hints for it will not be -# created until it has been seen alive and gone down again. -max_hint_window_in_ms: 10800000 # 3 hours -# throttle in KBs per second, per delivery thread -hinted_handoff_throttle_in_kb: 1024 -# Number of threads with which to deliver hints; -# Consider increasing this number when you have multi-dc deployments, since -# cross-dc handoff tends to be slower -max_hints_delivery_threads: 2 - -# The following setting populates the page cache on memtable flush and compaction -# WARNING: Enable this setting only when the whole node's data fits in memory. -# Defaults to: false -# populate_io_cache_on_flush: false - -# Authentication backend, implementing IAuthenticator; used to identify users -# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator, -# PasswordAuthenticator}. -# -# - AllowAllAuthenticator performs no checks - set it to disable authentication. -# - PasswordAuthenticator relies on username/password pairs to authenticate -# users. It keeps usernames and hashed passwords in system_auth.credentials table. -# Please increase system_auth keyspace replication factor if you use this authenticator. -authenticator: org.apache.cassandra.auth.AllowAllAuthenticator - -# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions -# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer, -# CassandraAuthorizer}. -# -# - AllowAllAuthorizer allows any action to any user - set it to disable authorization. -# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please -# increase system_auth keyspace replication factor if you use this authorizer. -authorizer: org.apache.cassandra.auth.AllowAllAuthorizer - -# Validity period for permissions cache (fetching permissions can be an -# expensive operation depending on the authorizer, CassandraAuthorizer is -# one example). Defaults to 2000, set to 0 to disable. -# Will be disabled automatically for AllowAllAuthorizer. -# permissions_validity_in_ms: 2000 - -# The partitioner is responsible for distributing rows (by key) across -# nodes in the cluster. Any IPartitioner may be used, including your -# own as long as it is on the classpath. Out of the box, Cassandra -# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner -# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}. -# -# - RandomPartitioner distributes rows across the cluster evenly by md5. -# This is the default prior to 1.2 and is retained for compatibility. -# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128 -# Hash Function instead of md5. When in doubt, this is the best option. -# - ByteOrderedPartitioner orders rows lexically by key bytes. BOP allows -# scanning rows in key order, but the ordering can generate hot spots -# for sequential insertion workloads. -# - OrderPreservingPartitioner is an obsolete form of BOP, that stores -# - keys in a less-efficient format and only works with keys that are -# UTF8-encoded Strings. -# - CollatingOPP collates according to EN,US rules rather than lexical byte -# ordering. Use this as an example if you need custom collation. -# -# See http://wiki.apache.org/cassandra/Operations for more on -# partitioners and token selection. -partitioner: org.apache.cassandra.dht.Murmur3Partitioner - -# Directories where Cassandra should store data on disk. Cassandra -# will spread data evenly across them, subject to the granularity of -# the configured compaction strategy. -# If not set, the default directory is $CASSANDRA_HOME/data/data. -# data_file_directories: -# - /var/lib/cassandra/data - -# commit log. when running on magnetic HDD, this should be a -# separate spindle than the data directories. -# If not set, the default directory is $CASSANDRA_HOME/data/commitlog. -# commitlog_directory: /var/lib/cassandra/commitlog - -# Enable / disable CDC functionality on a per-node basis. This modifies the logic used -# for write path allocation rejection (standard: never reject. cdc: reject Mutation -# containing a CDC-enabled table if at space limit in cdc_raw_directory). -cdc_enabled: false - -# CommitLogSegments are moved to this directory on flush if cdc_enabled: true and the -# segment contains mutations for a CDC-enabled table. This should be placed on a -# separate spindle than the data directories. If not set, the default directory is -# $CASSANDRA_HOME/data/cdc_raw. -cdc_raw_directory: target/embeddedCassandra/data/cdc_raw - - -# Directories where Cassandra should store data on disk. Cassandra -# will spread data evenly across them, subject to the granularity of -# the configured compaction strategy. -data_file_directories: - - target/embeddedCassandra/data - -hints_directory: - - target/embeddedCassandra/hints - -# commit log -commitlog_directory: target/embeddedCassandra/commitlog - -# policy for data disk failures: -# stop: shut down gossip and Thrift, leaving the node effectively dead, but -# can still be inspected via JMX. -# best_effort: stop using the failed disk and respond to requests based on -# remaining available sstables. This means you WILL see obsolete -# data at CL.ONE! -# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra -disk_failure_policy: stop - -# Maximum size of the key cache in memory. -# -# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the -# minimum, sometimes more. The key cache is fairly tiny for the amount of -# time it saves, so it's worthwhile to use it at large numbers. -# The row cache saves even more time, but must contain the entire row, -# so it is extremely space-intensive. It's best to only use the -# row cache if you have hot rows or static rows. -# -# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. -# -# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache. -key_cache_size_in_mb: - -# Duration in seconds after which Cassandra should -# save the key cache. Caches are saved to saved_caches_directory as -# specified in this configuration file. -# -# Saved caches greatly improve cold-start speeds, and is relatively cheap in -# terms of I/O for the key cache. Row cache saving is much more expensive and -# has limited use. -# -# Default is 14400 or 4 hours. -key_cache_save_period: 14400 - -# Number of keys from the key cache to save -# Disabled by default, meaning all keys are going to be saved -# key_cache_keys_to_save: 100 - -# Maximum size of the row cache in memory. -# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup. -# -# Default value is 0, to disable row caching. -row_cache_size_in_mb: 0 - -# Duration in seconds after which Cassandra should -# safe the row cache. Caches are saved to saved_caches_directory as specified -# in this configuration file. -# -# Saved caches greatly improve cold-start speeds, and is relatively cheap in -# terms of I/O for the key cache. Row cache saving is much more expensive and -# has limited use. -# -# Default is 0 to disable saving the row cache. -row_cache_save_period: 0 - -# Number of keys from the row cache to save -# Disabled by default, meaning all keys are going to be saved -# row_cache_keys_to_save: 100 - -# saved caches -saved_caches_directory: target/embeddedCassandra/saved_caches - -# commitlog_sync may be either "periodic" or "batch." -# When in batch mode, Cassandra won't ack writes until the commit log -# has been fsynced to disk. It will wait up to -# commitlog_sync_batch_window_in_ms milliseconds for other writes, before -# performing the sync. -# -# commitlog_sync: batch -# commitlog_sync_batch_window_in_ms: 50 -# -# the other option is "periodic" where writes may be acked immediately -# and the CommitLog is simply synced every commitlog_sync_period_in_ms -# milliseconds. -commitlog_sync: periodic -commitlog_sync_period_in_ms: 5000 - -# The size of the individual commitlog file segments. A commitlog -# segment may be archived, deleted, or recycled once all the data -# in it (potentially from each columnfamily in the system) has been -# flushed to sstables. -# -# The default size is 32, which is almost always fine, but if you are -# archiving commitlog segments (see commitlog_archiving.properties), -# then you probably want a finer granularity of archiving; 8 or 16 MB -# is reasonable. -commitlog_segment_size_in_mb: 8 - -# any class that implements the SeedProvider interface and has a -# constructor that takes a Map of parameters will do. -seed_provider: - # Addresses of hosts that are deemed contact points. - # Cassandra nodes use this list of hosts to find each other and learn - # the topology of the ring. You must change this if you are running - # multiple nodes! - - class_name: org.apache.cassandra.locator.SimpleSeedProvider - parameters: - # seeds is actually a comma-delimited list of addresses. - # Ex: ",," - - seeds: "127.0.0.1" - -# For workloads with more data than can fit in memory, Cassandra's -# bottleneck will be reads that need to fetch data from -# disk. "concurrent_reads" should be set to (16 * number_of_drives) in -# order to allow the operations to enqueue low enough in the stack -# that the OS and drives can reorder them. -# -# On the other hand, since writes are almost never IO bound, the ideal -# number of "concurrent_writes" is dependent on the number of cores in -# your system; (8 * number_of_cores) is a good rule of thumb. -concurrent_reads: 4 -concurrent_writes: 4 - -# Total memory to use for memtables. Cassandra will flush the largest -# memtable when this much memory is used. -# If omitted, Cassandra will set it to 1/3 of the heap. -# memtable_total_space_in_mb: 2048 - -# Total space to use for commitlogs. Since commitlog segments are -# mmapped, and hence use up address space, the default size is 32 -# on 32-bit JVMs, and 1024 on 64-bit JVMs. -# -# If space gets above this value (it will round up to the next nearest -# segment multiple), Cassandra will flush every dirty CF in the oldest -# segment and remove it. So a small total commitlog space will tend -# to cause more flush activity on less-active columnfamilies. -# commitlog_total_space_in_mb: 4096 - -# This sets the amount of memtable flush writer threads. These will -# be blocked by disk io, and each one will hold a memtable in memory -# while blocked. If you have a large heap and many data directories, -# you can increase this value for better flush performance. -# By default this will be set to the amount of data directories defined. -#memtable_flush_writers: 1 - -# Whether to, when doing sequential writing, fsync() at intervals in -# order to force the operating system to flush the dirty -# buffers. Enable this to avoid sudden dirty buffer flushing from -# impacting read latencies. Almost always a good idea on SSDs; not -# necessarily on platters. -trickle_fsync: false -trickle_fsync_interval_in_kb: 10240 - -# TCP port, for commands and data -storage_port: ${build.cassandra.storage_port} - -# SSL port, for encrypted communication. Unused unless enabled in -# encryption_options -ssl_storage_port: ${build.cassandra.ssl_storage_port} - -# Address to bind to and tell other Cassandra nodes to connect to. You -# _must_ change this if you want multiple nodes to be able to -# communicate! -# -# Leaving it blank leaves it up to InetAddress.getLocalHost(). This -# will always do the Right Thing _if_ the node is properly configured -# (hostname, name resolution, etc), and the Right Thing is to use the -# address associated with the hostname (it might not be). -# -# Setting this to 0.0.0.0 is always wrong. -listen_address: localhost - -# Address to broadcast to other Cassandra nodes -# Leaving this blank will set it to the same value as listen_address -# broadcast_address: 1.2.3.4 - -# Internode authentication backend, implementing IInternodeAuthenticator; -# used to allow/disallow connections from peer nodes. -# internode_authenticator: org.apache.cassandra.auth.AllowAllInternodeAuthenticator - -# Whether to start the native transport server. -# Please note that the address on which the native transport is bound is the -# same as the rpc_address. The port however is different and specified below. -start_native_transport: true -# port for the CQL native transport to listen for clients on -native_transport_port: ${build.cassandra.native_transport_port} -# The minimum and maximum threads for handling requests when the native -# transport is used. They are similar to rpc_min_threads and rpc_max_threads, -# though the defaults differ slightly. -# native_transport_min_threads: 16 -#native_transport_max_threads: 48 - -# Whether to start the thrift rpc server. -start_rpc: false - -# The address to bind the Thrift RPC service to -- clients connect -# here. Unlike ListenAddress above, you _can_ specify 0.0.0.0 here if -# you want Thrift to listen on all interfaces. -# -# Leaving this blank has the same effect it does for ListenAddress, -# (i.e. it will be based on the configured hostname of the node). -rpc_address: localhost -# port for Thrift to listen for clients on -rpc_port: ${build.cassandra.rpc_port} - -# enable or disable keepalive on rpc connections -rpc_keepalive: true - -# Cassandra provides three out-of-the-box options for the RPC Server: -# -# sync -> One thread per thrift connection. For a very large number of clients, memory -# will be your limiting factor. On a 64 bit JVM, 180KB is the minimum stack size -# per thread, and that will correspond to your use of virtual memory (but physical memory -# may be limited depending on use of stack space). -# -# hsha -> Stands for "half synchronous, half asynchronous." All thrift clients are handled -# asynchronously using a small number of threads that does not vary with the amount -# of thrift clients (and thus scales well to many clients). The rpc requests are still -# synchronous (one thread per active request). -# -# The default is sync because on Windows hsha is about 30% slower. On Linux, -# sync/hsha performance is about the same, with hsha of course using less memory. -# -# Alternatively, can provide your own RPC server by providing the fully-qualified class name -# of an o.a.c.t.TServerFactory that can create an instance of it. -rpc_server_type: sync - -# Uncomment rpc_min|max_thread to set request pool size limits. -# -# Regardless of your choice of RPC server (see above), the number of maximum requests in the -# RPC thread pool dictates how many concurrent requests are possible (but if you are using the sync -# RPC server, it also dictates the number of clients that can be connected at all). -# -# The default is unlimited and thus provides no protection against clients overwhelming the server. You are -# encouraged to set a maximum that makes sense for you in production, but do keep in mind that -# rpc_max_threads represents the maximum number of client requests this server may execute concurrently. -# -# rpc_min_threads: 16 -# rpc_max_threads: 2048 - -# uncomment to set socket buffer sizes on rpc connections -# rpc_send_buff_size_in_bytes: -# rpc_recv_buff_size_in_bytes: - -# Uncomment to set socket buffer size for internode communication -# Note that when setting this, the buffer size is limited by net.core.wmem_max -# and when not setting it it is defined by net.ipv4.tcp_wmem -# See: -# /proc/sys/net/core/wmem_max -# /proc/sys/net/core/rmem_max -# /proc/sys/net/ipv4/tcp_wmem -# /proc/sys/net/ipv4/tcp_wmem -# and: man tcp -# internode_send_buff_size_in_bytes: -# internode_recv_buff_size_in_bytes: - -# Frame size for thrift (maximum field length). -thrift_framed_transport_size_in_mb: 15 - -# The max length of a thrift message, including all fields and -# internal thrift overhead. -thrift_max_message_length_in_mb: 16 - -# Set to true to have Cassandra create a hard link to each sstable -# flushed or streamed locally in a backups/ subdirectory of the -# keyspace data. Removing these links is the operator's -# responsibility. -incremental_backups: false - -# Whether or not to take a snapshot before each compaction. Be -# careful using this option, since Cassandra won't clean up the -# snapshots for you. Mostly useful if you're paranoid when there -# is a data format change. -snapshot_before_compaction: false - -# Whether or not a snapshot is taken of the data before keyspace truncation -# or dropping of column families. The STRONGLY advised default of true -# should be used to provide data safety. If you set this flag to false, you will -# lose data on truncation or drop. -auto_snapshot: false - -# Add column indexes to a row after its contents reach this size. -# Increase if your column values are large, or if you have a very large -# number of columns. The competing causes are, Cassandra has to -# deserialize this much of the row to read a single column, so you want -# it to be small - at least if you do many partial-row reads - but all -# the index data is read for each access, so you don't want to generate -# that wastefully either. -column_index_size_in_kb: 64 - -# Number of simultaneous compactions to allow, NOT including -# validation "compactions" for anti-entropy repair. Simultaneous -# compactions can help preserve read performance in a mixed read/write -# workload, by mitigating the tendency of small sstables to accumulate -# during a single long running compactions. The default is usually -# fine and if you experience problems with compaction running too -# slowly or too fast, you should look at -# compaction_throughput_mb_per_sec first. -# -# concurrent_compactors defaults to the number of cores. -# Uncomment to make compaction mono-threaded, the pre-0.8 default. -#concurrent_compactors: 1 - -# Throttles compaction to the given total throughput across the entire -# system. The faster you insert data, the faster you need to compact in -# order to keep the sstable count down, but in general, setting this to -# 16 to 32 times the rate you are inserting data is more than sufficient. -# Setting this to 0 disables throttling. Note that this account for all types -# of compaction, including validation compaction. -compaction_throughput_mb_per_sec: 16 - -# Throttles all outbound streaming file transfers on this node to the -# given total throughput in Mbps. This is necessary because Cassandra does -# mostly sequential IO when streaming data during bootstrap or repair, which -# can lead to saturating the network connection and degrading rpc performance. -# When unset, the default is 200 Mbps or 25 MB/s. -# stream_throughput_outbound_megabits_per_sec: 200 - -# How long the coordinator should wait for read operations to complete -read_request_timeout_in_ms: 120000 -# How long the coordinator should wait for seq or index scans to complete -range_request_timeout_in_ms: 120000 -# How long the coordinator should wait for writes to complete -write_request_timeout_in_ms: 120000 -# How long the coordinator should wait for truncates to complete -# (This can be much longer, because unless auto_snapshot is disabled -# we need to flush first so we can snapshot before removing the data.) -truncate_request_timeout_in_ms: 120000 -# The default timeout for other, miscellaneous operations -request_timeout_in_ms: 120000 - -# Enable operation timeout information exchange between nodes to accurately -# measure request timeouts, If disabled cassandra will assuming the request -# was forwarded to the replica instantly by the coordinator -# -# Warning: before enabling this property make sure to ntp is installed -# and the times are synchronized between the nodes. -cross_node_timeout: false - -# Enable socket timeout for streaming operation. -# When a timeout occurs during streaming, streaming is retried from the start -# of the current file. This _can_ involve re-streaming an important amount of -# data, so you should avoid setting the value too low. -# Default value is 0, which never timeout streams. -# streaming_socket_timeout_in_ms: 0 - -# phi value that must be reached for a host to be marked down. -# most users should never need to adjust this. -# phi_convict_threshold: 8 - -# endpoint_snitch -- Set this to a class that implements -# IEndpointSnitch. The snitch has two functions: -# - it teaches Cassandra enough about your network topology to route -# requests efficiently -# - it allows Cassandra to spread replicas around your cluster to avoid -# correlated failures. It does this by grouping machines into -# "datacenters" and "racks." Cassandra will do its best not to have -# more than one replica on the same "rack" (which may not actually -# be a physical location) -# -# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER, -# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS -# ARE PLACED. -# -# Out of the box, Cassandra provides -# - SimpleSnitch: -# Treats Strategy order as proximity. This improves cache locality -# when disabling read repair, which can further improve throughput. -# Only appropriate for single-datacenter deployments. -# - PropertyFileSnitch: -# Proximity is determined by rack and data center, which are -# explicitly configured in cassandra-topology.properties. -# - GossipingPropertyFileSnitch -# The rack and datacenter for the local node are defined in -# cassandra-rackdc.properties and propagated to other nodes via gossip. If -# cassandra-topology.properties exists, it is used as a fallback, allowing -# migration from the PropertyFileSnitch. -# - RackInferringSnitch: -# Proximity is determined by rack and data center, which are -# assumed to correspond to the 3rd and 2nd octet of each node's -# IP address, respectively. Unless this happens to match your -# deployment conventions (as it did Facebook's), this is best used -# as an example of writing a custom Snitch class. -# - Ec2Snitch: -# Appropriate for EC2 deployments in a single Region. Loads Region -# and Availability Zone information from the EC2 API. The Region is -# treated as the datacenter, and the Availability Zone as the rack. -# Only private IPs are used, so this will not work across multiple -# Regions. -# - Ec2MultiRegionSnitch: -# Uses public IPs as broadcast_address to allow cross-region -# connectivity. (Thus, you should set seed addresses to the public -# IP as well.) You will need to open the storage_port or -# ssl_storage_port on the public IP firewall. (For intra-Region -# traffic, Cassandra will switch to the private IP after -# establishing a connection.) -# -# You can use a custom Snitch by setting this to the full class name -# of the snitch, which will be assumed to be on your classpath. -endpoint_snitch: SimpleSnitch - -# controls how often to perform the more expensive part of host score -# calculation -dynamic_snitch_update_interval_in_ms: 100 -# controls how often to reset all host scores, allowing a bad host to -# possibly recover -dynamic_snitch_reset_interval_in_ms: 600000 -# if set greater than zero and read_repair_chance is < 1.0, this will allow -# 'pinning' of replicas to hosts in order to increase cache capacity. -# The badness threshold will control how much worse the pinned host has to be -# before the dynamic snitch will prefer other replicas over it. This is -# expressed as a double which represents a percentage. Thus, a value of -# 0.2 means Cassandra would continue to prefer the static snitch values -# until the pinned host was 20% worse than the fastest. -dynamic_snitch_badness_threshold: 0.1 - -# request_scheduler -- Set this to a class that implements -# RequestScheduler, which will schedule incoming client requests -# according to the specific policy. This is useful for multi-tenancy -# with a single Cassandra cluster. -# NOTE: This is specifically for requests from the client and does -# not affect inter node communication. -# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place -# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of -# client requests to a node with a separate queue for each -# request_scheduler_id. The scheduler is further customized by -# request_scheduler_options as described below. -request_scheduler: org.apache.cassandra.scheduler.NoScheduler - -# Scheduler Options vary based on the type of scheduler -# NoScheduler - Has no options -# RoundRobin -# - throttle_limit -- The throttle_limit is the number of in-flight -# requests per client. Requests beyond -# that limit are queued up until -# running requests can complete. -# The value of 80 here is twice the number of -# concurrent_reads + concurrent_writes. -# - default_weight -- default_weight is optional and allows for -# overriding the default which is 1. -# - weights -- Weights are optional and will default to 1 or the -# overridden default_weight. The weight translates into how -# many requests are handled during each turn of the -# RoundRobin, based on the scheduler id. -# -# request_scheduler_options: -# throttle_limit: 80 -# default_weight: 5 -# weights: -# Keyspace1: 1 -# Keyspace2: 5 - -# request_scheduler_id -- An identifier based on which to perform -# the request scheduling. Currently the only valid option is keyspace. -# request_scheduler_id: keyspace - -# index_interval controls the sampling of entries from the primrary -# row index in terms of space versus time. The larger the interval, -# the smaller and less effective the sampling will be. In technicial -# terms, the interval coresponds to the number of index entries that -# are skipped between taking each sample. All the sampled entries -# must fit in memory. Generally, a value between 128 and 512 here -# coupled with a large key cache size on CFs results in the best trade -# offs. This value is not often changed, however if you have many -# very small rows (many to an OS page), then increasing this will -# often lower memory usage without a impact on performance. -index_interval: 128 - -# Enable or disable inter-node encryption -# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that -# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher -# suite for authentication, key exchange and encryption of the actual data transfers. -# NOTE: No custom encryption options are enabled at the moment -# The available internode options are : all, none, dc, rack -# -# If set to dc cassandra will encrypt the traffic between the DCs -# If set to rack cassandra will encrypt the traffic between the racks -# -# The passwords used in these options must match the passwords used when generating -# the keystore and truststore. For instructions on generating these files, see: -# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore -# -server_encryption_options: - internode_encryption: none - keystore: conf/.keystore - keystore_password: cassandra - truststore: conf/.truststore - truststore_password: cassandra - # More advanced defaults below: - # protocol: TLS - # algorithm: SunX509 - # store_type: JKS - # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] - # require_client_auth: false - -# enable or disable client/server encryption. -client_encryption_options: - enabled: false - keystore: conf/.keystore - keystore_password: cassandra - # require_client_auth: false - # Set trustore and truststore_password if require_client_auth is true - # truststore: conf/.truststore - # truststore_password: cassandra - # More advanced defaults below: - # protocol: TLS - # algorithm: SunX509 - # store_type: JKS - # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA] - -# internode_compression controls whether traffic between nodes is -# compressed. -# can be: all - all traffic is compressed -# dc - traffic between different datacenters is compressed -# none - nothing is compressed. -internode_compression: none - -# Enable or disable tcp_nodelay for inter-dc communication. -# Disabling it will result in larger (but fewer) network packets being sent, -# reducing overhead from the TCP protocol itself, at the cost of increasing -# latency if you block for cross-datacenter responses. -# inter_dc_tcp_nodelay: true diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index a7209cefd..1eada1568 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -25,6 +25,26 @@ + + org.springframework + spring-context + + + + org.springframework + spring-beans + + + + org.springframework + spring-core + + + + org.springframework + spring-tx + + org.springframework spring-expression @@ -37,12 +57,6 @@ ${springdata.commons} - - ${project.groupId} - spring-cql - ${project.version} - - joda-time joda-time @@ -55,12 +69,16 @@ true + - ${project.groupId} - spring-cql - ${project.version} - test-jar - test + com.datastax.cassandra + cassandra-driver-core + + + + com.google.guava + guava + ${guava} @@ -129,7 +147,6 @@ org.xerial.snappy snappy-java - test @@ -146,6 +163,11 @@ test + + edu.umd.cs.mtc + multithreadedtc + + diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CassandraCqlTemplateFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/ClusterBuilderConfigurer.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/CompressionType.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/CompressionType.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/CompressionType.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/DataCenterReplication.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAction.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceAttributes.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/PoolingOptionsFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/SocketOptionsFactoryBean.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractClusterConfiguration.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractCqlTemplateConfiguration.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/AbstractSessionConfiguration.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/java/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/java/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/java/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParser.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlSessionParser.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraCqlTemplateParser.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraNamespaceHandler.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/DefaultCqlBeanNames.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/ParsingUtils.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/xml/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/config/xml/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/config/xml/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ArgumentPreparedStatementBinder.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlOperations.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncCqlTemplate.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncPreparedStatementCreator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsyncSessionCallback.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/AsynchronousQueryListener.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CachedPreparedStatementCreator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CassandraUncategorizedDataAccessException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ColumnMapRowMapper.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/CqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/CqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlOperations.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/CqlProvider.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlProvider.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/CqlProvider.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlProvider.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/CqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/CqlTemplate.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ExceptionTranslatingListenableFutureAdapter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/GuavaListenableFutureAdapter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/HostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/HostMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/HostMapper.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/Ordering.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/Ordering.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/Ordering.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementBinder.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCallback.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PreparedStatementCreator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/PrimaryKeyType.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptions.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/QueryOptionsUtil.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlOperations.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCallback.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactivePreparedStatementCreator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveResultSetExtractor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveRowMapperResultSetExtractor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveSessionCallback.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReactiveStatementCallback.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/ResultSetExtractor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/RingMember.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/RingMember.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RingMemberHostMapper.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowCallbackHandler.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/RowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/RowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapper.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/RowMapperResultSetExtractor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/SessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/SessionCallback.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SessionCallback.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SimplePreparedStatementCreator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/SingleColumnRowMapper.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/WriteOptions.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/WriteOptions.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/WriteOptions.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/WriteOptions.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToArrayConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToArrayConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToListConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/RowToMapConverter.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/converter/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/converter/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlConstantType.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlIdentifier.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/KeyspaceIdentifier.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AddColumnCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterColumnCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/ColumnChangeCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropColumnCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/IndexNameCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceNameCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/KeyspaceOptionsCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/RenameColumnCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableNameCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/TableOptionsCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/UserTypeNameCqlGenerator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/cql/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/cql/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/cql/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AddColumnSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterColumnSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterKeyspaceSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterTableSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/AlterUserTypeSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnChangeSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/ColumnTypeChangeSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateIndexSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateKeyspaceSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateTableSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/CreateUserTypeSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultOption.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DefaultTableDescriptor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropColumnSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropKeyspaceSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropTableSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropUserTypeSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/FieldSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexDescriptor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/IndexNameSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceActionSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceDescriptor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOption.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/Option.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/Option.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/Option.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/RenameColumnSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableDescriptor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableNameSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOption.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableOptionsSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/TableSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeNameSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/UserTypeSpecification.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultBridgedReactiveSession.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultReactiveSessionFactory.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/DefaultSessionFactory.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveResultSet.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSession.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/ReactiveSessionFactory.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/SessionFactory.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactory.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookup.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookup.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookup.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SessionFactoryLookupFailureException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookup.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/lookup/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/session/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/session/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/session/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/CQLExceptionTranslator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/support/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/support/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/support/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/core/util/MapBuilder.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/CassandraExceptionTranslator.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/ReactiveCassandraAccessor.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/RowUtils.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/RowUtils.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/RowUtils.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/RowUtils.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraAuthenticationException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraConnectionFailureException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInsufficientReplicasAvailableException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInternalException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidConfigurationInQueryException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraInvalidQueryException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraKeyspaceExistsException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraQuerySyntaxException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraReadTimeoutException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraSchemaElementExistsException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTableExistsException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTraceRetrievalException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTruncateException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraTypeMismatchException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUnauthorizedException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraUncategorizedException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/CassandraWriteTimeoutException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/IncorrectResultSetColumnCountException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/UnsupportedCassandraOperationException.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/exception/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/exception/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/exception/package-info.java diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/package-info.java b/spring-data-cassandra/src/main/java/org/springframework/cassandra/support/package-info.java similarity index 100% rename from spring-cql/src/main/java/org/springframework/cassandra/support/package-info.java rename to spring-data-cassandra/src/main/java/org/springframework/cassandra/support/package-info.java diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers index 35ee66654..fbb804718 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.handlers +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.handlers @@ -1 +1,2 @@ +http\://www.springframework.org/schema/cql=org.springframework.cassandra.config.xml.CassandraNamespaceHandler http\://www.springframework.org/schema/data/cassandra=org.springframework.data.cassandra.config.xml.CassandraNamespaceHandler diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.schemas b/spring-data-cassandra/src/main/resources/META-INF/spring.schemas index 6ae67ae31..3e9e87819 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.schemas +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.schemas @@ -1,3 +1,8 @@ +http\://www.springframework.org/schema/cql/spring-cql-1.0.xsd=org/springframework/cassandra/config/spring-cql-1.0.xsd +http\://www.springframework.org/schema/cql/spring-cql-1.5.xsd=org/springframework/cassandra/config/spring-cql-1.5.xsd +http\://www.springframework.org/schema/cql/spring-cql-2.0.xsd=org/springframework/cassandra/config/spring-cql-2.0.xsd +http\://www.springframework.org/schema/cql/spring-cql.xsd=org/springframework/cassandra/config/spring-cql-2.0.xsd + http\://www.springframework.org/schema/data/cassandra/spring-cassandra-1.0.xsd=org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd http\://www.springframework.org/schema/data/cassandra/spring-cassandra-1.5.xsd=org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd http\://www.springframework.org/schema/data/cassandra/spring-cassandra-2.0.xsd=org/springframework/data/cassandra/config/spring-cassandra-2.0.xsd diff --git a/spring-data-cassandra/src/main/resources/META-INF/spring.tooling b/spring-data-cassandra/src/main/resources/META-INF/spring.tooling index bdc47bdbb..10f8c4d56 100644 --- a/spring-data-cassandra/src/main/resources/META-INF/spring.tooling +++ b/spring-data-cassandra/src/main/resources/META-INF/spring.tooling @@ -1,3 +1,8 @@ +# Tooling related information for the cql namespace +http\://www.springframework.org/schema/cql@name=Spring Cassandra CQL Namespace +http\://www.springframework.org/schema/cql@prefix=cassandra +http\://www.springframework.org/schema/cql@icon=org/springframework/data/cassandra/config/spring-cql.gif + # Tooling related information for the cassandra namespace http\://www.springframework.org/schema/data/cassandra@name=Spring Data Cassandra Namespace http\://www.springframework.org/schema/data/cassandra@prefix=cassandra diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd similarity index 100% rename from spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd rename to spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.0.xsd diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd similarity index 100% rename from spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd rename to spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-1.5.xsd diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd similarity index 100% rename from spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd rename to spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql-2.0.xsd diff --git a/spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql.gif b/spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql.gif similarity index 100% rename from spring-cql/src/main/resources/org/springframework/cassandra/config/spring-cql.gif rename to spring-data-cassandra/src/main/resources/org/springframework/cassandra/config/spring-cql.gif diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/config/CassandraCqlSessionFactoryBeanUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/config/PoolingOptionsFactoryBeanUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/config/java/AbstractClusterConfigurationUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/config/xml/CassandraCqlClusterParserUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/config/xml/ParsingUtilsUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/AsyncCqlTemplateUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/CachedPreparedStatementCreatorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/CqlTemplateIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/CqlTemplateIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/CqlTemplateUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/DefaultBridgedReactiveSessionUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/QueryOptionsUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUtilUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/QueryOptionsUtilUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/QueryOptionsUtilUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/QueryOptionsUtilUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/ReactiveCqlTemplateUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/SingleColumnRowMapperUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/SingleColumnRowMapperUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/SingleColumnRowMapperUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/SingleColumnRowMapperUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/WriteOptionsUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/CqlIdentifierUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractIndexOperationCqlGeneratorTest.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractKeyspaceOperationCqlGeneratorTest.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AbstractTableOperationCqlGeneratorTest.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterTableCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/AlterUserTypeCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateIndexCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateKeyspaceCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateTableCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/CreateUserTypeCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropIndexCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropKeyspaceCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropTableCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/cql/generator/DropUserTypeCqlGeneratorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/keyspace/OptionUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/AbstractRoutingSessionFactoryUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/BeanFactorySessionFactoryLookupUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookupUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookupUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookupUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/MapSessionFactoryLookupUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookupUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookupUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookupUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/core/session/lookup/SingleSessionFactoryLookupUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/support/BeanDefinitionTestUtils.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/RandomKeySpaceName.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/support/RandomKeySpaceName.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/support/RandomKeySpaceName.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/support/RandomKeySpaceName.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/KeyspaceRule.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/KeyspaceRule.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/KeyspaceRule.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/KeyspaceRule.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/CassandraCqlClusterFactoryBeanIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/IntegrationTestUtils.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/AbstractIntegrationTest.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/Config.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/ConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/CqlTemplateConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfig.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/java/KeyspaceCreatingJavaConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/Book.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/Book.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/Book.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/Book.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/BookListener.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlIndexSpecificationAssertions.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateIndexCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateKeyspaceCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CallbackSynchronizationSupport.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CallbackSynchronizationSupport.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CallbackSynchronizationSupport.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CallbackSynchronizationSupport.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CassandraConnectionProperties.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CassandraConnectionProperties.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CassandraConnectionProperties.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CassandraConnectionProperties.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CassandraVersion.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CassandraVersion.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CassandraVersion.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CassandraVersion.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CqlDataSet.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CqlDataSet.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/CqlDataSet.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/CqlDataSet.java diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java b/spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java similarity index 100% rename from spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java rename to spring-data-cassandra/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java diff --git a/spring-cql/src/test/resources/cassandraOperationsTest-cql-cleanup.cql b/spring-data-cassandra/src/test/resources/cassandraOperationsTest-cql-cleanup.cql similarity index 100% rename from spring-cql/src/test/resources/cassandraOperationsTest-cql-cleanup.cql rename to spring-data-cassandra/src/test/resources/cassandraOperationsTest-cql-cleanup.cql diff --git a/spring-cql/src/test/resources/cassandraOperationsTest-cql-dataload.cql b/spring-data-cassandra/src/test/resources/cassandraOperationsTest-cql-dataload.cql similarity index 100% rename from spring-cql/src/test/resources/cassandraOperationsTest-cql-dataload.cql rename to spring-data-cassandra/src/test/resources/cassandraOperationsTest-cql-dataload.cql diff --git a/spring-cql/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest-After.cql b/spring-data-cassandra/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest-After.cql similarity index 100% rename from spring-cql/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest-After.cql rename to spring-data-cassandra/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest-After.cql diff --git a/spring-cql/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql b/spring-data-cassandra/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql similarity index 100% rename from spring-cql/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql rename to spring-data-cassandra/src/test/resources/integration/cql/generator/CreateIndexCqlGeneratorIntegrationTests-BasicTest.cql diff --git a/spring-cql/src/test/resources/logback.xml b/spring-data-cassandra/src/test/resources/logback.xml similarity index 100% rename from spring-cql/src/test/resources/logback.xml rename to spring-data-cassandra/src/test/resources/logback.xml diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests-context.xml diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/FullySpecifiedKeyspaceCreatingXmlConfigIntegrationTests.properties diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalKeyspaceCreatingXmlConfigIntegrationTests-context.xml diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests-context.xml similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/MinimalXmlConfigIntegrationTests-context.xml diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests-context.xml similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigIntegrationTests-context.xml diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests-context.xml b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests-context.xml similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests-context.xml rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/XmlConfigIntegrationTests-context.xml diff --git a/spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties b/spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties similarity index 100% rename from spring-cql/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties rename to spring-data-cassandra/src/test/resources/org/springframework/cassandra/test/integration/config/xml/ppncxct.properties