[Checkins] SVN: zope.app.server/trunk/src/zope/app/server/ Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

[Lorenzo Gil]

Log message for revision 85770:
  Substitute zope.app.zapi by direct calls to its wrapped apis. See bug 219302

Changed:
  U   zope.app.server/trunk/src/zope/app/server/server.py
  U   zope.app.server/trunk/src/zope/app/server/zpasswd.py

-=-
Modified: zope.app.server/trunk/src/zope/app/server/server.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/server.py	2008-04-26 19:21:11 UTC (rev 85769)
+++ zope.app.server/trunk/src/zope/app/server/server.py	2008-04-26 19:22:13 UTC (rev 85770)
@@ -17,7 +17,7 @@
 
 $Id$
 """
-from zope.app import zapi
+import zope.component
 from zope.app.server.servertype import IServerType
 
 class ServerFactory(object):
@@ -36,7 +36,7 @@
     def create(self, task_dispatcher, database):
         """Return a server based on the server types defined via ZCML."""
 
-        servertype = zapi.getUtility(IServerType, self.type)
+        servertype = zope.component.getUtility(IServerType, self.type)
         # The server object self-registers with the asyncore mainloop.
         return servertype.create(
             self.type,

Modified: zope.app.server/trunk/src/zope/app/server/zpasswd.py
===================================================================
--- zope.app.server/trunk/src/zope/app/server/zpasswd.py	2008-04-26 19:21:11 UTC (rev 85769)
+++ zope.app.server/trunk/src/zope/app/server/zpasswd.py	2008-04-26 19:22:13 UTC (rev 85770)
@@ -242,13 +242,13 @@
         from zope.app.authentication.password import managers
     else:
         from zope.configuration import xmlconfig
-        from zope.app import zapi
+        from zope.component import getUtilitiesFor
         from zope.app.authentication.interfaces import IPasswordManager
 
         print "Loading configuration..."
         config = xmlconfig.file(config_path)
         managers = []
-        for name, manager in zapi.getUtilitiesFor(IPasswordManager):
+        for name, manager in getUtilitiesFor(IPasswordManager):
             if name == "Plain Text":
                 managers.insert(0, (name, manager))
             else: