svn commit: r765703 - in /incubator/cassandra/trunk: lib/libfb303.jar src/org/apache/cassandra/service/CassandraServer.java

[jbellis]

Author: jbellis
Date: Thu Apr 16 17:47:25 2009
New Revision: 765703

URL: http://svn.apache.org/viewvc?rev=765703&view=rev
Log:
r/m libfb303 as a dependency.  (this completes the process begun by Prashant 
earlier.)  patch by Jun Rao; reviewed by jbellis for #86

Removed:
    incubator/cassandra/trunk/lib/libfb303.jar
Modified:
    
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java

Modified: 
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java?rev=765703&r1=765702&r2=765703&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java 
(original)
+++ 
incubator/cassandra/trunk/src/org/apache/cassandra/service/CassandraServer.java 
Thu Apr 16 17:47:25 2009
@@ -26,15 +26,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
 
-import com.facebook.fb303.FacebookBase;
-import com.facebook.fb303.fb_status;
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.cql.common.CqlResult;
@@ -43,41 +37,26 @@
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.Row;
 import org.apache.cassandra.db.RowMutation;
-import org.apache.cassandra.db.RowMutationMessage;
-import org.apache.cassandra.net.EndPoint;
-import org.apache.cassandra.net.Message;
-import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.net.IAsyncResult;
 import org.apache.cassandra.utils.LogUtil;
-import org.apache.cassandra.io.DataInputBuffer;
-import org.apache.cassandra.io.DataOutputBuffer;
 import org.apache.thrift.TException;
 
 /**
  * Author : Avinash Lakshman ( alaksh...@facebook.com) & Prashant Malik ( 
pma...@facebook.com )
  */
 
-public class CassandraServer extends FacebookBase implements Cassandra.Iface
+public class CassandraServer implements Cassandra.Iface
 {
 
        private static Logger logger_ = Logger.getLogger(CassandraServer.class);
-       /*
-        * Handle to the storage service to interact with the other machines in 
the
-        * cluster.
-        */
-       protected StorageService storageService;
 
-       protected CassandraServer(String name)
-       {
-               super(name);
-               // Create the instance of the storage service
-               storageService = StorageService.instance();
-       }
+    /*
+      * Handle to the storage service to interact with the other machines in 
the
+      * cluster.
+      */
+       protected StorageService storageService;
 
-       public CassandraServer()
+       protected CassandraServer()
        {
-               super("CassandraServer");
-               // Create the instance of the storage service
                storageService = StorageService.instance();
        }
 
@@ -751,7 +730,7 @@
         }
         else if (propertyName.equals("version"))
         {
-            return getVersion();
+            return "1";
         }
         else
         {
@@ -824,21 +803,5 @@
        }
        }
     
-    
-       public String getVersion()
-       {
-               return "1";
-       }
-
-       public int getStatus()
-       {
-               return fb_status.ALIVE;
-       }
-
-       public String getStatusDetails()
-       {
-               return null;
-       }
-
     // main method moved to CassandraDaemon
 }