[Zope3-checkins] CVS: Zope3/src/zope/app/component - service.py:1.1.2.2

[Philipp von Weitershausen]

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

Modified Files:
      Tag: zcml-interface-field-branch
	service.py 
Log Message:
Use the global instances of the services instead of factoring them myself.
We need to do that because the configuration machinery will perform its
actions on whatever this service machinery returns. If this is not the same
that's going to be used by other stuff later on, there's no use in hard
wiring this thing in the first place.


=== Zope3/src/zope/app/component/service.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/component/service.py:1.1.2.1	Mon Aug  4 11:34:20 2003
+++ Zope3/src/zope/app/component/service.py	Tue Aug  5 19:10:39 2003
@@ -33,31 +33,31 @@
 services = {
     servicenames.Utilities: (
        zope.component.interfaces.IUtilityService,
-       utility.GlobalUtilityService,
+       utility.utilityService,
        ),
     servicenames.Adapters: (
        zope.component.interfaces.IAdapterService,
-       adapter.GlobalAdapterService,
+       adapter.adapterService,
        ),
     servicenames.Factories: (
        zope.component.interfaces.IFactoryService,
-       factory.GlobalFactoryService,
+       factory.factoryService,
        ),
     servicenames.Skins: (
        zope.component.interfaces.ISkinService,
-       skin.GlobalSkinService,
+       skin.skinService,
        ),
     servicenames.Views: (
        zope.component.interfaces.IViewService,
-       view.GlobalViewService,
+       view.viewService,
        ),
     servicenames.Resources: (
        zope.component.interfaces.IResourceService,
-       resource.GlobalResourceService,
+       resource.resourceService,
        ),
     servicenames.Interfaces: (
        zope.app.interfaces.component.IInterfaceService,
-       zope.app.component.globalinterfaceservice.InterfaceService,
+       zope.app.component.globalinterfaceservice.interfaceService,
        ),
     }
 
@@ -89,6 +89,6 @@
     for name in names:
         i, f = services[name]
         sm.defineService(name, i)
-        sm.provideService(name, f())
-        
+        sm.provideService(name, f)
+
     return sm