[cassandra, cassandra2] rename the cassandra2-cql client to cassandra-cql.

bin/bindings.properties

@@ -29,6 +29,7 @@ accumulo:com.yahoo.ycsb.db.accumulo.AccumuloClient
 aerospike:com.yahoo.ycsb.db.AerospikeClient
 asynchbase:com.yahoo.ycsb.db.AsyncHBaseClient
 basic:com.yahoo.ycsb.BasicDB
+cassandra-cql:com.yahoo.ycsb.db.CassandraCQLClient
 cassandra2-cql:com.yahoo.ycsb.db.CassandraCQLClient
 couchbase:com.yahoo.ycsb.db.CouchbaseClient
 couchbase2:com.yahoo.ycsb.db.couchbase2.Couchbase2Client

bin/ycsb

@@ -55,6 +55,7 @@ DATABASES = {
     "aerospike"    : "com.yahoo.ycsb.db.AerospikeClient",
     "asynchbase"   : "com.yahoo.ycsb.db.AsyncHBaseClient",
     "basic"        : "com.yahoo.ycsb.BasicDB",
+    "cassandra-cql": "com.yahoo.ycsb.db.CassandraCQLClient",
     "cassandra2-cql": "com.yahoo.ycsb.db.CassandraCQLClient",
     "couchbase"    : "com.yahoo.ycsb.db.CouchbaseClient",
     "couchbase2"   : "com.yahoo.ycsb.db.couchbase2.Couchbase2Client",
@@ -239,6 +240,12 @@ def main():
     # Classpath set up
     binding = args.database.split("-")[0]
 
+    if binding == "cassandra2":
+        warn("The 'cassandra2-cql' client has been deprecated. It has been "
+             "renamed to simply 'cassandra-cql'. This alias will be removed"
+             " in the next YCSB release.")
+        binding = "cassandra"
+
     if binding == "couchbase":
         warn("The 'couchbase' client has been deprecated. If you are using "
              "Couchbase 4.0+ try using the 'couchbase2' client instead.")

bin/ycsb.bat

@@ -117,6 +117,12 @@ GOTO confAdded
 SET CLASSPATH=%YCSB_HOME%\conf
 :confAdded
 
+@REM Cassandra2 deprecation message
+IF NOT "%BINDING_DIR%" == "cassandra2" GOTO notAliasCassandra
+echo [WARN] The 'cassandra2-cql' client has been deprecated. It has been renamed to simply 'cassandra-cql'. This alias will be removed in the next YCSB release.
+SET BINDING_DIR=cassandra
+:notAliasCassandra
+
 @REM Build classpath according to source checkout or release distribution
 IF EXIST "%YCSB_HOME%\pom.xml" GOTO gotSource
 

bin/ycsb.sh

@@ -133,6 +133,14 @@ else
   CLASSPATH="$CLASSPATH:$YCSB_HOME/conf"
 fi
 
+# Cassandra2 deprecation message
+if [ "${BINDING_DIR}" = "cassandra2" ] ; then
+  echo "[WARN] The 'cassandra2-cql' client has been deprecated. It has been \
+renamed to simply 'cassandra-cql'. This alias will be removed  in the next \
+YCSB release."
+  BINDING_DIR="cassandra"
+fi
+
 # Build classpath
 #   The "if" check after the "for" is because glob may just return the pattern
 #   when no files are found.  The "if" makes sure the file is really there.

cassandra2/pom.xml → cassandra/pom.xml

@@ -27,7 +27,7 @@ LICENSE file.
     <relativePath>../binding-parent</relativePath>
   </parent>
 
-  <artifactId>cassandra2-binding</artifactId>
+  <artifactId>cassandra-binding</artifactId>
   <name>Cassandra 2.1+ DB Binding</name>
   <packaging>jar</packaging>
 
@@ -41,7 +41,7 @@ LICENSE file.
     <dependency>
       <groupId>com.datastax.cassandra</groupId>
       <artifactId>cassandra-driver-core</artifactId>
-      <version>${cassandra2.cql.version}</version>
+      <version>${cassandra.cql.version}</version>
     </dependency>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>

distribution/pom.xml

@@ -56,7 +56,7 @@ LICENSE file.
     </dependency>
     <dependency>
       <groupId>com.yahoo.ycsb</groupId>
-      <artifactId>cassandra2-binding</artifactId>
+      <artifactId>cassandra-binding</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

pom.xml

@@ -73,7 +73,7 @@ LICENSE file.
     <hbase098.version>0.98.14-hadoop2</hbase098.version>
     <hbase10.version>1.0.2</hbase10.version>
     <accumulo.version>1.6.0</accumulo.version>
-    <cassandra2.cql.version>3.0.0</cassandra2.cql.version>
+    <cassandra.cql.version>3.0.0</cassandra.cql.version>
     <geode.version>1.0.0-incubating.M2</geode.version>
     <googlebigtable.version>0.2.3</googlebigtable.version>
     <infinispan.version>7.2.2.Final</infinispan.version>
@@ -105,7 +105,7 @@ LICENSE file.
     <module>accumulo</module>
     <module>aerospike</module>
     <module>asynchbase</module>
-    <module>cassandra2</module>
+    <module>cassandra</module>
     <module>couchbase</module>
     <module>couchbase2</module>
     <module>distribution</module>