removed another bunch of references to geni

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

diff --git a/sfa/server/component.py b/sfa/server/component.py
index ab76961..c83ac4a 100644 (file)
--- a/sfa/server/component.py
+++ b/sfa/server/component.py
@@ -1,5 +1,5 @@
 #
-# Component is a GeniServer that implements the Component interface
+# Component is a SfaServer that implements the Component interface
 #
 ### $Id: 
 ### $URL: 
@@ -10,8 +10,7 @@ import os
 import time
 import sys
 
-from sfa.util.geniserver import GeniServer
-from sfacomponent.plc.api import ComponentAPI
+from sfa.util.componentserver import ComponentServer
  
 # GeniLight client support is optional
 try:
@@ -20,9 +19,9 @@ except ImportError:
     GeniClientLight = None            
 
 ##
-# Component is a GeniServer that serves component operations.
+# Component is a SfaServer that serves component operations.
 
-class Component(GeniServer):
+class Component(ComponentServer):
     ##
     # Create a new registry object.
     #
@@ -32,7 +31,5 @@ class Component(GeniServer):
     # @param cert_file certificate filename containing public key (could be a GID file)
 
     def __init__(self, ip, port, key_file, cert_file):
-        GeniServer.__init__(self, ip, port, key_file, cert_file)
-        # re-initialize the servers api as Component api  
-        self.server.api = ComponentAPI(interface='component', key_file=key_file, cert_file=cert_file)  
+        ComponentServer.__init__(self, ip, port, key_file, cert_file)
         self.server.interface = 'component'