remove old code

[sfa.git] / sfa / server / componentserver.py

diff --git a/sfa/server/componentserver.py b/sfa/server/componentserver.py
index 8596977..419ebf2 100644 (file)
--- a/sfa/server/componentserver.py
+++ b/sfa/server/componentserver.py
@@ -6,22 +6,14 @@
 # TODO: investigate ways to combine this with existing PLC server?
 ##
 
-import sys
-import traceback
 import threading
-import socket, os
-import SocketServer
-import BaseHTTPServer
-import SimpleHTTPServer
+import socket
 import SimpleXMLRPCServer
-from OpenSSL import SSL
 
 from sfa.util.sfalogging import logger
 from sfa.trust.certificate import Keypair, Certificate
-from sfa.trust.credential import *
-from sfa.util.faults import *
-from sfa.plc.api import ComponentAPI 
-from sfa.server.sfaserver import verify_callback, ThreadedServer 
+from sfa.plc.api import PlcComponentApi 
+from sfa.server.threadedserver import ThreadedServer 
 
 
 ##
@@ -45,10 +37,10 @@ class SecureXMLRpcRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
         try:
             peer_cert = Certificate()
             peer_cert.load_from_pyopenssl_x509(self.connection.get_peer_certificate())
-            self.api = ComponentAPI(peer_cert = peer_cert, 
-                           interface = self.server.interface, 
-                           key_file = self.server.key_file, 
-                           cert_file = self.server.cert_file)
+            self.api = PlcComponentApi(peer_cert = peer_cert, 
+                                    interface = self.server.interface, 
+                                    key_file = self.server.key_file, 
+                                    cert_file = self.server.cert_file)
             # get arguments
             request = self.rfile.read(int(self.headers["content-length"]))
             # In previous versions of SimpleXMLRPCServer, _dispatch
@@ -123,8 +115,6 @@ class ComponentServer(threading.Thread):
     # that was passed to it.
 
     def noop(self, cred, anything):
-        self.decode_authentication(cred)
-
         return anything
 
     ##