svn commit: r912008 - in /incubator/cassandra/trunk: ivy.xml src/java/org/apache/cassandra/avro/CassandraDaemon.java

[ee...@apache.org]

Author: eevans
Date: Fri Feb 19 22:11:22 2010
New Revision: 912008

URL: http://svn.apache.org/viewvc?rev=912008&view=rev
Log:
moved avro.CassandraDaemon to http transport (via jetty)

The Python library in avro trunk currently only contains support for an
HTTP transport, (the socket transport has been dropped for now).

Patch by eevans

Modified:
    incubator/cassandra/trunk/ivy.xml
    incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java

Modified: incubator/cassandra/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/ivy.xml?rev=912008&r1=912007&r2=912008&view=diff
==============================================================================
--- incubator/cassandra/trunk/ivy.xml (original)
+++ incubator/cassandra/trunk/ivy.xml Fri Feb 19 22:11:22 2010
@@ -42,6 +42,7 @@
     <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.8"/>
     <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1"/>
     <dependency org="junit" name="junit" rev="4.6"/>
+    <dependency org="org.mortbay.jetty" name="jetty" rev="6.1.21"/>
   </dependencies>
 </ivy-module>
 

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java?rev=912008&r1=912007&r2=912008&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraDaemon.java Fri Feb 19 22:11:22 2010
@@ -24,6 +24,7 @@
 import java.net.InetSocketAddress;
 
 import org.apache.avro.ipc.SocketServer;
+import org.apache.avro.ipc.HttpServer;
 import org.apache.avro.specific.SpecificResponder;
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.db.CompactionManager;
@@ -40,7 +41,7 @@
  */
 public class CassandraDaemon {
     private static Logger logger = Logger.getLogger(CassandraDaemon.class);
-    private SocketServer server;
+    private HttpServer server;
     private InetAddress listenAddr;
     private int listenPort;
     
@@ -100,11 +101,11 @@
     {
         if (logger.isDebugEnabled())
             logger.debug(String.format("Binding avro service to %s:%s", listenAddr, listenPort));
-        InetSocketAddress socketAddress = new InetSocketAddress(listenAddr, listenPort);
         SpecificResponder responder = new SpecificResponder(Cassandra.class, new CassandraServer());
         
         logger.info("Cassandra starting up...");
-        server = new SocketServer(responder, socketAddress);
+        // FIXME: This isn't actually binding to listenAddr (it should).
+        server = new HttpServer(responder, listenPort);
     }
     
     /** hook for JSVC */