[Zope3-checkins] CVS: Zope3/src/zope/app/cache - annotationcacheable.py:1.5 caching.py:1.7 configure.zcml:1.6 ram.py:1.13

[Philipp von Weitershausen]

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

Modified Files:
	annotationcacheable.py caching.py configure.zcml ram.py 
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/cache/annotationcacheable.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/cache/annotationcacheable.py:1.4	Tue Aug 19 13:34:08 2003
+++ Zope3/src/zope/app/cache/annotationcacheable.py	Mon Mar  1 05:57:35 2004
@@ -15,11 +15,12 @@
 
 $Id$
 """
+from zope.interface import implements
+
 from zope.app import zapi
 from zope.app.interfaces.annotation import IAnnotations
-from zope.app.interfaces.cache import ICacheable
+from zope.app.cache.interfaces import ICacheable
 from zope.app.services.servicenames import Caching
-from zope.interface import implements
 
 annotation_key = 'zope.app.cache.CacheManager'
 


=== Zope3/src/zope/app/cache/caching.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/cache/caching.py:1.6	Tue Sep 16 17:59:17 2003
+++ Zope3/src/zope/app/cache/caching.py	Mon Mar  1 05:57:35 2004
@@ -16,7 +16,7 @@
 $Id$
 """
 from zope.app import zapi
-from zope.app.interfaces.cache import ICacheable
+from zope.app.cache.interfaces import ICacheable
 from zope.app.services.servicenames import Caching
 from zope.component import ComponentLookupError
 


=== Zope3/src/zope/app/cache/configure.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/cache/configure.zcml:1.5	Tue Aug 19 13:34:08 2003
+++ Zope3/src/zope/app/cache/configure.zcml	Mon Mar  1 05:57:35 2004
@@ -2,30 +2,42 @@
 
   <serviceType 
       id="Caching"
-      interface="zope.app.interfaces.cache.ICachingService" />
+      interface="zope.app.cache.interfaces.ICachingService"
+      />
 
   <adapter 
       for="zope.app.interfaces.annotation.IAnnotatable"
-      provides="zope.app.interfaces.cache.ICacheable"
-      factory="zope.app.cache.annotationcacheable.AnnotationCacheable" />
+      provides="zope.app.cache.interfaces.ICacheable"
+      factory="zope.app.cache.annotationcacheable.AnnotationCacheable"
+      />
 
   <content class=".ram.RAMCache">
-    <factory 
+    <factory
         id="zope.caching.RAMCache"
-        permission="zope.Public" />
+        permission="zope.Public"
+        />
 
     <implements
-        interface="zope.app.interfaces.cache.ICache" />
+        interface="zope.app.cache.interfaces.ICache"
+        />
 
     <implements
-        interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
+        interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
+        />
 
     <implements
-        interface="zope.app.interfaces.services.utility.ILocalUtility" />
+        interface="zope.app.interfaces.services.utility.ILocalUtility"
+        />
 
     <require 
         permission="zope.Public" 
-        interface="zope.app.interfaces.cache.ram.IRAMCache" />
+        interface="zope.app.cache.interfaces.ram.IRAMCache"
+        />
   </content>
+
+
+  <!-- Include browser package -->
+
+  <include package=".browser" />
 
 </configure>


=== Zope3/src/zope/app/cache/ram.py 1.12 => 1.13 ===
--- Zope3/src/zope/app/cache/ram.py:1.12	Wed Feb 25 18:02:21 2004
+++ Zope3/src/zope/app/cache/ram.py	Mon Mar  1 05:57:35 2004
@@ -21,7 +21,7 @@
 from persistent import Persistent
 from zope.app import zapi
 from zope.app.container.contained import Contained
-from zope.app.interfaces.cache.ram import IRAMCache
+from zope.app.cache.interfaces.ram import IRAMCache
 from zope.app.interfaces.event import IObjectModifiedEvent
 from zope.interface import implements