[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ConnectionService - ConnectionService.py:1.8 IConnectionConfiguration.py:1.3

[Marius Gedminas]

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

Modified Files:
	ConnectionService.py IConnectionConfiguration.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/ConnectionService/ConnectionService.py 1.7 => 1.8 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/ConnectionService.py:1.7	Thu Dec 12 06:32:31 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/ConnectionService.py	Thu Dec 12 10:28:17 2002
@@ -40,12 +40,9 @@
 
     def getConnection(self, name):
         'See Zope.App.RDB.IConnectionService.IConnectionService'
-        registry = self.queryConfigurations(name)
-        if registry:
-            configuration = registry.active()
-            if configuration is not None:
-                adapter = configuration.getComponent()
-                return adapter()
+        adapter = self.queryActiveComponent(name)
+        if adapter is not None:
+            return adapter()
         service = queryNextService(self, "SQLDatabaseConnections")
         if service is not None:
             return service.getConnection(name)


=== Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/IConnectionConfiguration.py 1.2 => 1.3 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/IConnectionConfiguration.py:1.2	Thu Dec 12 06:32:31 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ConnectionService/IConnectionConfiguration.py	Thu Dec 12 10:28:17 2002
@@ -16,7 +16,6 @@
 $Id$
 """
 
-from Zope.Schema import TextLine
 from Zope.App.OFS.Services.ConfigurationInterfaces \
      import INamedComponentConfiguration