move sfa.util.server into sfa.server.sfaserver

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

diff --git a/sfa/util/componentserver.py b/sfa/util/componentserver.py
index 9fa40f9..8596977 100644 (file)
--- a/sfa/util/componentserver.py
+++ b/sfa/util/componentserver.py
@@ -6,9 +6,6 @@
 # TODO: investigate ways to combine this with existing PLC server?
 ##
 
-### $Id$
-### $URL$
-
 import sys
 import traceback
 import threading
@@ -24,7 +21,7 @@ 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.util.server import verify_callback, ThreadedServer 
+from sfa.server.sfaserver import verify_callback, ThreadedServer 
 
 
 ##