[Zope3-checkins] CVS: Zope3/src/zope/app - _app.py:1.14.2.2

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/src/zope/app
In directory cvs.zope.org:/tmp/cvs-serv31244

Modified Files:
      Tag: zcml-interface-field-branch
	_app.py 
Log Message:
Use the global service manage from zope.app, of course, because that has
some essential services hard-wired.


=== Zope3/src/zope/app/_app.py 1.14.2.1 => 1.14.2.2 ===
--- Zope3/src/zope/app/_app.py:1.14.2.1	Mon Aug  4 11:34:08 2003
+++ Zope3/src/zope/app/_app.py	Tue Aug  5 18:59:12 2003
@@ -22,7 +22,7 @@
 from zope.publisher.browser import TestRequest
 from zope.app.publication.browser import BrowserPublication
 import zope.configuration.xmlconfig
-import zope.component.service
+import zope.app.component.service
 
 
 __metaclass__ = type
@@ -43,7 +43,7 @@
     newSecurityManager(system_user)
 
     # Load server-independent site config
-    sm = zope.component.service.serviceManager
+    sm = zope.app.component.service.globalServiceManager()
     context = zope.app.configuration.ConfigurationMachine(sm)
     zope.configuration.xmlconfig.registerCommonDirectives(context)
     zope.configuration.xmlconfig.file(file, context=context, execute=execute)