svn commit: r1161221 - /cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java

[jbellis]

Author: jbellis
Date: Wed Aug 24 18:30:29 2011
New Revision: 1161221

URL: http://svn.apache.org/viewvc?rev=1161221&view=rev
Log:
update for CFMetaData -> Schema refactor

Modified:
    
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java

Modified: 
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java?rev=1161221&r1=1161220&r2=1161221&view=diff
==============================================================================
--- 
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java
 (original)
+++ 
cassandra/trunk/drivers/java/test/org/apache/cassandra/cql/EmbeddedServiceBase.java
 Wed Aug 24 18:30:29 2011
@@ -27,10 +27,7 @@ import java.net.UnknownHostException;
 
 import org.apache.cassandra.CleanupHelper;
 import org.apache.cassandra.SchemaLoader;
-import org.apache.cassandra.config.CFMetaData;
-import org.apache.cassandra.config.ConfigurationException;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.*;
 import org.apache.cassandra.service.EmbeddedCassandraService;
 import org.junit.BeforeClass;
 
@@ -39,10 +36,9 @@ import org.junit.BeforeClass;
  */
 public abstract class EmbeddedServiceBase
 {
-
     /** The embedded server cassandra. */
     private static EmbeddedCassandraService cassandra;
-    
+
     @BeforeClass 
     public static void cleanUpOldStuff() throws IOException
     {
@@ -77,9 +73,9 @@ public abstract class EmbeddedServiceBas
         {
             for (CFMetaData cfm : table.cfMetaData().values())
             {
-                CFMetaData.map(cfm);
+                Schema.instance.load(cfm);
             }
-            DatabaseDescriptor.setTableDefinition(table, 
DatabaseDescriptor.getDefsVersion());
+            Schema.instance.setTableDefinition(table, 
Schema.instance.getVersion());
         }
     }
     /**