[Zope3-checkins] CVS: Zope3/src/zope/app/browser/cache - cacheable.py:1.1.2.4 configure.zcml:1.1.2.3

[Jim Fulton]

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

Modified Files:
      Tag: NameGeddon-branch
	cacheable.py configure.zcml 
Log Message:
Gor zope running again! 

I haven't tested everything. 
(Yes, we need functional tests. Maybe this week).

Good enough to merge into trunk.



=== Zope3/src/zope/app/browser/cache/cacheable.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/browser/cache/cacheable.py:1.1.2.3	Tue Dec 24 02:11:46 2002
+++ Zope3/src/zope/app/browser/cache/cacheable.py	Wed Dec 25 08:27:20 2002
@@ -22,7 +22,7 @@
 from zope.schema.interfaces import StopValidation, ValidationError, \
      ValidationErrorsAll, ConversionErrorsAll
 
-from zope.app.Forms.Views.Browser import Widget
+from zope.app.browser.form.widget import Widget
 from zope.app.cache.caching import getCacheForObj, getLocationForCache
 from zope.app.form.utility import setUpEditWidgets
 from zope.app.form.widget import CustomWidget


=== Zope3/src/zope/app/browser/cache/configure.zcml 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/cache/configure.zcml:1.1.2.2	Tue Dec 24 07:50:47 2002
+++ Zope3/src/zope/app/browser/cache/configure.zcml	Wed Dec 25 08:27:20 2002
@@ -8,29 +8,21 @@
       title="RAM Cache" action="RAMCache"
       description="RAM Cache"/>
 
-  <browser:defaultView for="zope.app.interfaces.cache.ram.IRAMCache" 
-		       name="edit.html" />
-
   <browser:view for="zope.app.interfaces.cache.ram.IRAMCache"
 		factory="zope.app.browser.cache.ram.RAMCacheView"
 		permission="zope.Public"
 		>
     <browser:page name="editAction.html" attribute="action" />
-    <browser:page name="edit.html"       template="edit.pt" />
+    <browser:page name="index.html"       template="edit.pt" />
     <browser:page name="stats.html"      template="stats.pt" />
   </browser:view>
 
-  <browser:menuItems menu="zmi_views" for="zope.app.interfaces.cache.ram.IRAMCache">
-    <browser:menuItem title="Edit"       action="edit.html"/>
+  <browser:menuItems menu="zmi_views"
+     for="zope.app.interfaces.cache.ram.IRAMCache">
+    <browser:menuItem title="Edit"       action="index.html"/>
     <browser:menuItem title="Statistics" action="stats.html"/>
   </browser:menuItems>
 
-</zopeConfigure>
-
-<zopeConfigure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:browser='http://namespaces.zope.org/browser'
->
   <browser:view for="zope.app.interfaces.annotation.IAnnotatable"
                 permission="zope.ManageBindings"
                 factory="zope.app.browser.cache.cacheable.CacheableView">
@@ -42,4 +34,5 @@
     <browser:page name="InvalidateCache.html"
                   attribute="invalidate" />
   </browser:view>
+
 </zopeConfigure>