[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ServiceManager - IServiceManager.py:1.8 ServiceManager.py:1.15

[Marius Gedminas]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/ServiceManager
In directory cvs.zope.org:/tmp/cvs-serv24277/lib/python/Zope/App/OFS/Services/ServiceManager

Modified Files:
	IServiceManager.py ServiceManager.py 
Log Message:
Caching service now uses the new configuration infrastructure
Added invalidateAll to Zope.App.Caching.ICache



=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/IServiceManager.py 1.7 => 1.8 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/IServiceManager.py:1.7	Thu Dec 12 06:32:32 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/IServiceManager.py	Thu Dec 12 10:28:17 2002
@@ -31,12 +31,3 @@
     """
 
     Packages = Attribute("""Package container""")
-
-    def getBoundService(name):
-        """Retrieve a bound service implementation.
-
-        Get the component currently bound to the named Service in this
-        ServiceService.   Does not search context.
-
-        None is returned if the named service isn't bound locally.
-        """


=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py 1.14 => 1.15 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py:1.14	Thu Dec 12 06:32:32 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/ServiceManager.py	Thu Dec 12 10:28:17 2002
@@ -106,7 +106,7 @@
 
             self._v_calling = 1
             try:
-                service = self.getBoundService(name)
+                service = self.queryActiveComponent(name)
                 if service is not None:
                     return service
 
@@ -127,20 +127,6 @@
         raise NameError(service_type)
 
     getInterfaceFor = ContextMethod(getInterfaceFor)
-
-    def getBoundService(self, name):
-        "See Zope.App.OFS.Services.ServiceManager.IServiceManager."
-
-        registry = self.queryConfigurations(name)
-        if registry:
-            configuration = registry.active()
-            if configuration is not None:
-                service = configuration.getComponent()
-                return service
-
-        return None
-
-    getBoundService = ContextMethod(getBoundService)
 
     ############################################################
     # Implementation methods for interface