cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdusba...@apache.org
Subject svn commit: r1079977 - in /cassandra/trunk/drivers/java: src/org/apache/cassandra/cql/driver/ src/org/apache/cassandra/cql/driver/jdbc/ src/org/apache/cassandra/cql/jdbc/ test/org/apache/cassandra/cql/ test/org/apache/cassandra/cql/driver/jdbc/
Date Wed, 09 Mar 2011 20:23:41 GMT
Author: gdusbabek
Date: Wed Mar  9 20:23:40 2011
New Revision: 1079977

URL: http://svn.apache.org/viewvc?rev=1079977&view=rev
Log:
move all java cql into jdbc package and only expose a few bits. patch by gdusbabek, reviewed
by eevans. CASSANDRA-2124

Added:
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraConnection.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraDriver.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraResultSet.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraStatement.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraStatement.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Col.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Col.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ColumnDecoder.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Connection.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Connection.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ConnectionPool.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ConnectionPool.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/DriverResolverException.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/DriverResolverException.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/InvalidUrlException.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/InvalidUrlException.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Utils.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Utils.java
    cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/EmbeddedServiceBase.java
    cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java
      - copied, changed from r1079976, cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/JdbcDriverTest.java
Removed:
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Col.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ColumnDecoder.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Connection.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ConnectionPool.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/IConnectionPool.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Results.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Utils.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraConnection.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraDriver.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraResultSet.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraStatement.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/DriverResolverException.java
    cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/InvalidUrlException.java
    cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/EmbeddedServiceBase.java
    cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/JdbcDriverTest.java

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraConnection.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraConnection.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraConnection.java
(original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraConnection.java
Wed Mar  9 20:23:40 2011
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql.jdbc;
 
 import java.sql.Array;
 import java.sql.Blob;
@@ -53,7 +53,7 @@ public class CassandraConnection impleme
 {
     
     /** The cassandra con. */
-    private org.apache.cassandra.cql.driver.Connection cassandraCon;
+    private org.apache.cassandra.cql.jdbc.Connection cassandraCon;
     
     /**
      * Instantiates a new cassandra connection.
@@ -76,7 +76,7 @@ public class CassandraConnection impleme
             final int host_backwardIdx = host_port.indexOf('/');
             final String port = host_port.substring(host_colonIdx + 1, host_backwardIdx);
             final String keyspace = host_port.substring(host_backwardIdx + 1);
-            cassandraCon = new org.apache.cassandra.cql.driver.Connection(hostName, Integer.valueOf(port),
userName,
+            cassandraCon = new org.apache.cassandra.cql.jdbc.Connection(hostName, Integer.valueOf(port),
userName,
                                                                                         
                                    password);
             final String useQ = "USE " + keyspace;
             cassandraCon.execute(useQ);

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraDriver.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraDriver.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraDriver.java
(original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraDriver.java Wed
Mar  9 20:23:40 2011
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql.jdbc;
 
 import java.sql.Connection;
 import java.sql.Driver;

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraResultSet.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraResultSet.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraResultSet.java
(original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraResultSet.java
Wed Mar  9 20:23:40 2011
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql.jdbc;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -47,8 +47,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.apache.cassandra.cql.driver.Col;
-import org.apache.cassandra.cql.driver.ColumnDecoder;
 import org.apache.cassandra.thrift.Column;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.CqlRow;

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraStatement.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraStatement.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraStatement.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraStatement.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraStatement.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/CassandraStatement.java
(original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/CassandraStatement.java
Wed Mar  9 20:23:40 2011
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql.jdbc;
 
 import java.io.InputStream;
 import java.io.Reader;
@@ -43,7 +43,6 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.Calendar;
 
-import org.apache.cassandra.cql.driver.Results;
 import org.apache.cassandra.thrift.CqlResult;
 import org.apache.cassandra.thrift.InvalidRequestException;
 import org.apache.cassandra.thrift.TimedOutException;
@@ -58,7 +57,7 @@ class CassandraStatement implements Prep
 {
     
     /** The connection. */
-    private org.apache.cassandra.cql.driver.Connection connection;
+    private org.apache.cassandra.cql.jdbc.Connection connection;
     
     /** The cql. */
     private String cql;
@@ -67,7 +66,7 @@ class CassandraStatement implements Prep
      * Constructor using fields.
      * @param con     cassandra connection.
      */
-    CassandraStatement(org.apache.cassandra.cql.driver.Connection con)
+    CassandraStatement(org.apache.cassandra.cql.jdbc.Connection con)
     {
         this.connection = con;
     }
@@ -78,7 +77,7 @@ class CassandraStatement implements Prep
      * @param con     cassandra connection
      * @param cql the cql
      */
-    CassandraStatement(org.apache.cassandra.cql.driver.Connection con, String cql)
+    CassandraStatement(org.apache.cassandra.cql.jdbc.Connection con, String cql)
     {
         this.connection = con;
         this.cql = cql;

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Col.java (from r1079976,
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Col.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Col.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Col.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Col.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Col.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Col.java Wed Mar  9 20:23:40
2011
@@ -1,6 +1,6 @@
-package org.apache.cassandra.cql.driver;
+package org.apache.cassandra.cql.jdbc;
 
-public class Col<N, V>
+class Col<N, V>
 {
     public final N name;
     public final V value;

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ColumnDecoder.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ColumnDecoder.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ColumnDecoder.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ColumnDecoder.java Wed
Mar  9 20:23:40 2011
@@ -1,31 +1,21 @@
-package org.apache.cassandra.cql.driver;
+package org.apache.cassandra.cql.jdbc;
 
 import org.apache.cassandra.config.ConfigurationException;
 import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.db.marshal.AsciiType;
-import org.apache.cassandra.db.marshal.BytesType;
-import org.apache.cassandra.db.marshal.IntegerType;
-import org.apache.cassandra.db.marshal.LexicalUUIDType;
-import org.apache.cassandra.db.marshal.LongType;
-import org.apache.cassandra.db.marshal.TimeUUIDType;
-import org.apache.cassandra.db.marshal.UTF8Type;
 import org.apache.cassandra.thrift.CfDef;
 import org.apache.cassandra.thrift.KsDef;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /** Decodes columns from bytes into instances of their respective expected types. */
-public class ColumnDecoder 
+class ColumnDecoder 
 {
     private static final Logger logger = LoggerFactory.getLogger(ColumnDecoder.class);
     private static final String MapFormatString = "%s.%s.%s";

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Connection.java (from
r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Connection.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Connection.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Connection.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Connection.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Connection.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Connection.java Wed Mar
 9 20:23:40 2011
@@ -19,7 +19,7 @@
  * 
  */
 
-package org.apache.cassandra.cql.driver;
+package org.apache.cassandra.cql.jdbc;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -46,7 +46,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /** CQL connection object. */
-public class Connection
+class Connection
 {
     private static final Pattern KeyspacePattern = Pattern.compile("USE (\\w+);?", Pattern.CASE_INSENSITIVE
| Pattern.MULTILINE);
     private static final Pattern SelectPattern = Pattern.compile("SELECT\\s+.+\\s+FROM\\s+(\\w+).*",
Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ConnectionPool.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ConnectionPool.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ConnectionPool.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ConnectionPool.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ConnectionPool.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/ConnectionPool.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/ConnectionPool.java Wed
Mar  9 20:23:40 2011
@@ -19,7 +19,7 @@
  * 
  */
 
-package org.apache.cassandra.cql.driver;
+package org.apache.cassandra.cql.jdbc;
 
 import java.util.Date;
 import java.util.Timer;
@@ -42,13 +42,13 @@ import org.slf4j.LoggerFactory;
  * <p>Example usage:</p>
  * 
  * <code>
- * IConnectionPool pool = new ConnectionPool("localhost", 9160);<br />
+ * ConnectionPool pool = new ConnectionPool("localhost", 9160);<br />
  * Connection conn = pool.borrowConnection();<br />
  * conn.execute(...);<br />
  * pool.returnConnection(pool);<br />
  * </code>
  */
-public class ConnectionPool implements IConnectionPool
+class ConnectionPool
 {
     public static final int DEFAULT_MAX_CONNECTIONS = 25;
     public static final int DEFAULT_PORT = 9160;

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/DriverResolverException.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/DriverResolverException.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/DriverResolverException.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/DriverResolverException.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/DriverResolverException.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/DriverResolverException.java
(original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/DriverResolverException.java
Wed Mar  9 20:23:40 2011
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql.jdbc;
 /**
  * Runtime exception handling in case of runtime error during Driver resolving. 
  */

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/InvalidUrlException.java
(from r1079976, cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/InvalidUrlException.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/InvalidUrlException.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/InvalidUrlException.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/InvalidUrlException.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/jdbc/InvalidUrlException.java
(original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/InvalidUrlException.java
Wed Mar  9 20:23:40 2011
@@ -18,7 +18,7 @@
  * under the License.
  * 
  */
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql.jdbc;
 
 /**
  * Runtime exception handling during incorrect connection url provided.

Copied: cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Utils.java (from r1079976,
cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Utils.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Utils.java?p2=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Utils.java&p1=cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Utils.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/driver/Utils.java (original)
+++ cassandra/trunk/drivers/java/src/org/apache/cassandra/cql/jdbc/Utils.java Wed Mar  9 20:23:40
2011
@@ -19,7 +19,7 @@
  * 
  */
 
-package org.apache.cassandra.cql.driver;
+package org.apache.cassandra.cql.jdbc;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
@@ -29,7 +29,7 @@ import org.apache.cassandra.thrift.Compr
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Utils
+class Utils
 {
     private static final Logger logger = LoggerFactory.getLogger(Utils.class);
     

Copied: cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java
(from r1079976, cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/EmbeddedServiceBase.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java?p2=cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java&p1=cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/EmbeddedServiceBase.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/EmbeddedServiceBase.java
(original)
+++ cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java Wed
Mar  9 20:23:40 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql;
 
 import java.io.IOException;
 import java.net.Socket;

Copied: cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java (from
r1079976, cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/JdbcDriverTest.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java?p2=cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java&p1=cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/JdbcDriverTest.java&r1=1079976&r2=1079977&rev=1079977&view=diff
==============================================================================
--- cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/driver/jdbc/JdbcDriverTest.java
(original)
+++ cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/JdbcDriverTest.java Wed Mar
 9 20:23:40 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.cql.driver.jdbc;
+package org.apache.cassandra.cql;
 /*
  * 
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -51,7 +51,7 @@ public class JdbcDriverTest extends Embe
     public static void startServer() throws Exception
     {
         startCassandraServer();
-        Class.forName("org.apache.cassandra.cql.driver.jdbc.CassandraDriver");
+        Class.forName("org.apache.cassandra.cql.jdbc.CassandraDriver");
         con = DriverManager.getConnection("jdbc:cassandra:root/root@localhost:9170/Keyspace1");
         String[] inserts = 
         {



Mime
View raw message