[Zope3-checkins] CVS: Zope3/src/zope/app/services - cache.py:1.21 configure.zcml:1.66

[Philipp von Weitershausen]

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

Modified Files:
	cache.py configure.zcml 
Log Message:
Combined all cache-related code in the zope.app.cache package, except
for the cache service which is going to be converted to a utility anyway.


=== Zope3/src/zope/app/services/cache.py 1.20 => 1.21 ===
--- Zope3/src/zope/app/services/cache.py:1.20	Fri Feb 20 11:57:30 2004
+++ Zope3/src/zope/app/services/cache.py	Mon Mar  1 05:57:39 2004
@@ -16,14 +16,15 @@
 $Id$
 """
 from persistent import Persistent
+from zope.interface import implements
+
 from zope.app import zapi
-from zope.app.interfaces.cache import ICache
 from zope.app.interfaces.event import IObjectModifiedEvent
 from zope.app.interfaces.services.cache import ILocalCachingService
 from zope.app.interfaces.services.service import ISimpleService
+from zope.app.cache.interfaces import ICache
 from zope.app.services.event import ServiceSubscriberEventChannel
 from zope.app.services.servicenames import Utilities
-from zope.interface import implements
 from zope.app.container.contained import Contained
 
 class CachingService(ServiceSubscriberEventChannel, Persistent, Contained):


=== Zope3/src/zope/app/services/configure.zcml 1.65 => 1.66 ===
--- Zope3/src/zope/app/services/configure.zcml:1.65	Tue Feb 24 11:50:57 2004
+++ Zope3/src/zope/app/services/configure.zcml	Mon Mar  1 05:57:39 2004
@@ -68,10 +68,12 @@
   <content class="zope.app.services.cache.CachingService">
     <factory 
           id="zope.services.CachingService" 
-          permission="zope.ManageServices" />
+          permission="zope.ManageServices"
+          />
       <require
           permission="zope.View"
-          interface="zope.app.interfaces.cache.ICachingService" />
+          interface="zope.app.cache.interfaces.ICachingService"
+          />
     </content>
 
 <!-- Service Manager -->