X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fserver%2Fcomponent.py;h=df91917b6e75790fa64cf2836c81282feb88ddeb;hb=713d58df0baa1f9739eec9bfa30ceb41d7149e23;hp=ab76961dfeac82a7df812a1265f6db66ff67914d;hpb=5614016f9bbcf3bb597fcede399f3ad987c3bf18;p=sfa.git

diff --git a/sfa/server/component.py b/sfa/server/component.py
index ab76961d..df91917b 100644
--- a/sfa/server/component.py
+++ b/sfa/server/component.py
@@ -1,28 +1,24 @@
 #
-# Component is a GeniServer that implements the Component interface
+# Component is a SfaServer that implements the Component interface
 #
-### $Id: 
-### $URL: 
-#
-
 import tempfile
 import os
 import time
 import sys
 
-from sfa.util.geniserver import GeniServer
-from sfacomponent.plc.api import ComponentAPI
- 
+from sfa.server.sfaserver import SfaServer
+
 # GeniLight client support is optional
 try:
     from egeni.geniLight_client import *
 except ImportError:
-    GeniClientLight = None            
+    GeniClientLight = None
 
 ##
-# Component is a GeniServer that serves component operations.
+# Component is a SfaServer that serves component operations.
+
 
-class Component(GeniServer):
+class Component(SfaServer):
     ##
     # Create a new registry object.
     #
@@ -32,7 +28,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)  
-        self.server.interface = 'component'
+        SfaServer.__init__(self, ip, port, key_file,
+                           cert_file, interface='component')