[z3-checkins] r28635 - z3/Sfive/trunk

[philikon at codespeak.net]

Author: philikon
Date: Sat Jun 10 17:57:22 2006
New Revision: 28635

Modified:
   z3/Sfive/trunk/browser.zcml
   z3/Sfive/trunk/configure.zcml
Log:
Improve Zoep 3 compatibility: use zope.View and only bridge it to zope2.View
when in Zope 2


Modified: z3/Sfive/trunk/browser.zcml
==============================================================================
--- z3/Sfive/trunk/browser.zcml	(original)
+++ z3/Sfive/trunk/browser.zcml	Sat Jun 10 17:57:22 2006
@@ -25,13 +25,13 @@
       for=".interfaces.IPresentation"
       name="index.html"
       class=".browser.ViewPresentation"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
   <browser:resourceDirectory
       name="s5ui"
       directory="ui"
-      permission="zope2.View"
+      permission="zope.View"
       />
 
 </configure>

Modified: z3/Sfive/trunk/configure.zcml
==============================================================================
--- z3/Sfive/trunk/configure.zcml	(original)
+++ z3/Sfive/trunk/configure.zcml	Sat Jun 10 17:57:22 2006
@@ -1,6 +1,7 @@
 <configure xmlns="http://namespaces.zope.org/zope"
            xmlns:five="http://namespaces.zope.org/five"
            xmlns:i18n="http://namespaces.zope.org/i18n"
+           xmlns:meta="http://namespaces.zope.org/meta"
            xmlns:zcml="http://namespaces.zope.org/zcml"
            i18n_domain="sfive"
            >
@@ -15,9 +16,15 @@
       title="Edit Sfive Presentations"
       />
 
+  <meta:redefinePermission
+      from="zope.View"
+      to="zope2.View"
+      zcml:condition="installed Zope2"
+      />
+
   <class class=".presentation.Presentation">
     <require
-        permission="zope2.View"
+        permission="zope.View"
         interface=".interfaces.IPresentation"
         />
     <require