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

diff --git a/docs/Makefile b/docs/Makefile
index 463dbaf..5f34949 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -3,7 +3,7 @@ doc:
        pythondoc.py ../sfa/util/certificate.py ../sfa/util/credential.py ../sfa/util/gid.py \
                      ../sfa/util/rights.py ../sfa/util/config.py ../sfa/trust/hierarchy.py \
                      ../sfa/util/record.py ../sfa/util/client.py \
        pythondoc.py ../sfa/util/certificate.py ../sfa/util/credential.py ../sfa/util/gid.py \
                      ../sfa/util/rights.py ../sfa/util/config.py ../sfa/trust/hierarchy.py \
                      ../sfa/util/record.py ../sfa/util/client.py \

-                     ../sfa/util/server.py 
+                     ../sfa/server/sfaserver.py 

 
        pythondoc.py ../sfa/registry/registry.py ../sfa/registry/import.py \
                      ../sfa/registry/nuke.py
 
        pythondoc.py ../sfa/registry/registry.py ../sfa/registry/import.py \
                      ../sfa/registry/nuke.py

diff --git a/sfa/server/aggregate.py b/sfa/server/aggregate.py
index 59a3e6b..6d7516d 100644 (file)
--- a/sfa/server/aggregate.py
+++ b/sfa/server/aggregate.py
@@ -1,5 +1,5 @@
 from sfa.util.faults import *
 from sfa.util.faults import *

-from sfa.util.server import SfaServer
+from sfa.server.sfaserver import SfaServer

 from sfa.util.xrn import hrn_to_urn
 from sfa.server.interface import Interfaces, Interface
 from sfa.util.config import Config     
 from sfa.util.xrn import hrn_to_urn
 from sfa.server.interface import Interfaces, Interface
 from sfa.util.config import Config     

diff --git a/sfa/server/registry.py b/sfa/server/registry.py
index b254811..b55f9ac 100644 (file)
--- a/sfa/server/registry.py
+++ b/sfa/server/registry.py
@@ -1,7 +1,7 @@
 #
 # Registry is a SfaServer that implements the Registry interface
 #
 #
 # Registry is a SfaServer that implements the Registry interface
 #

-from sfa.util.server import SfaServer
+from sfa.server.sfaserver import SfaServer

 from sfa.util.faults import *
 from sfa.util.xrn import hrn_to_urn
 from sfa.server.interface import Interfaces, Interface
 from sfa.util.faults import *
 from sfa.util.xrn import hrn_to_urn
 from sfa.server.interface import Interfaces, Interface

diff --git a/sfa/util/server.py b/sfa/server/sfaserver.py
similarity index 100%
rename from sfa/util/server.py
rename to sfa/server/sfaserver.py

diff --git a/sfa/server/slicemgr.py b/sfa/server/slicemgr.py
index c0fbd6a..9a7fa4a 100644 (file)
--- a/sfa/server/slicemgr.py
+++ b/sfa/server/slicemgr.py
@@ -2,7 +2,7 @@ import os
 import sys
 import datetime
 import time
 import sys
 import datetime
 import time

-from sfa.util.server import *
+from sfa.server.sfaserver import SfaServer

 
 class SliceMgr(SfaServer):
 
 
 class SliceMgr(SfaServer):
 

diff --git a/sfa/util/componentserver.py b/sfa/util/componentserver.py
index 98373ec..8596977 100644 (file)
--- a/sfa/util/componentserver.py
+++ b/sfa/util/componentserver.py
@@ -21,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.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 

 
 
 ##
 
 
 ##