From 5bf59b69d208ed11ac4688020cb8240c688fba6f Mon Sep 17 00:00:00 2001
From: "Jason M. Kusar" <jason@kusar.net>
Date: Fri, 2 Dec 2011 18:55:42 -0500
Subject: [PATCH 1/2] Changes to compile against Cassandra 1.0

---
 src/lucandra/CassandraUtils.java    | 6 +++---
 src/solandra/SolandraComponent.java | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/lucandra/CassandraUtils.java b/src/lucandra/CassandraUtils.java
index df9b06a..146bfd9 100644
--- a/src/lucandra/CassandraUtils.java
+++ b/src/lucandra/CassandraUtils.java
@@ -34,7 +34,7 @@
 import java.util.zip.Inflater;
 
 import org.apache.cassandra.config.ConfigurationException;
-import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.*;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.service.AbstractCassandraDaemon;
@@ -307,7 +307,7 @@ public static void createCassandraSchema() throws IOException
             return;
         }
 
-        if (DatabaseDescriptor.getNonSystemTables().contains(keySpace))
+        if (Schema.instance.getNonSystemTables().contains(keySpace))
         {
             logger.info("Found Solandra specific schema");
             return;
@@ -329,7 +329,7 @@ public static void createCassandraSchema() throws IOException
             System.exit(2);
         }
 
-        if (DatabaseDescriptor.getNonSystemTables().contains(keySpace))
+        if (Schema.instance.getNonSystemTables().contains(keySpace))
         {
             logger.info("Found Solandra specific schema");
             return;
diff --git a/src/solandra/SolandraComponent.java b/src/solandra/SolandraComponent.java
index 8cc7ef7..cb498e5 100644
--- a/src/solandra/SolandraComponent.java
+++ b/src/solandra/SolandraComponent.java
@@ -35,6 +35,7 @@
 import com.google.common.collect.MapMaker;
 
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.Row;
 import org.apache.cassandra.db.filter.QueryPath;
 import org.apache.cassandra.service.StorageService;
@@ -93,7 +94,7 @@ public static boolean prepare(ResponseBuilder rb) throws IOException
         if(!hasSolandraSchema.get())
         {
             //Check is Solandra schema exists, if not die
-            if(! DatabaseDescriptor.getNonSystemTables().contains(CassandraUtils.keySpace) )
+            if(! Schema.instance.getNonSystemTables().contains(CassandraUtils.keySpace) )
                 throw new IOException("Solandra keyspace is missing, please import then retry");
             else
                 hasSolandraSchema.set(true);

From 46f033e4946ed6f693bbd13f61b84f67096b3bc2 Mon Sep 17 00:00:00 2001
From: "Jason M. Kusar" <jason@kusar.net>
Date: Fri, 2 Dec 2011 19:13:33 -0500
Subject: [PATCH 2/2] Use Cassandra 1.0.5 lib

---
 ivy.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ivy.xml b/ivy.xml
index ab586e7..c70d5ba 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -38,7 +38,7 @@
     <dependency org="org.mortbay.jetty" name="jetty-util" rev="6.1.26" conf="* -> *,!sources,!javadoc" />
     <dependency org="org.mortbay.jetty" name="jsp-2.1" rev="6.1.14" conf="* -> *,!sources,!javadoc" />
 
-    <dependency org="org.apache.cassandra" name="cassandra-all" rev="0.8.6" conf="* -> *,!sources,!javadoc" />
+    <dependency org="org.apache.cassandra" name="cassandra-all" rev="1.0.5" conf="* -> *,!sources,!javadoc" />
     <dependency org="net.java.dev.jna" name="jna" rev="3.2.7" conf="* -> *,!sources,!javadoc" />
     <dependency org="org.xerial.snappy" name="snappy-java" rev="1.0.3.1" conf="* -> *,!sources,!javadoc" />
   </dependencies>