[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/ZPTPage - zptpage.zcml:1.1.2.7.2.4

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/ZPTPage
In directory cvs.zope.org:/tmp/cvs-serv30105/lib/python/Zope/App/OFS/Content/ZPTPage

Modified Files:
      Tag: Zope3InWonderland-branch
	zptpage.zcml 
Log Message:
wonderland updates to zcml files.


=== Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/zptpage.zcml 1.1.2.7.2.3 => 1.1.2.7.2.4 ===
 >
 
-  <zmi:factoryFromClass name="ZPTPage"
-                        class=".ZPTPage."
-                        permission="Zope.ManageContent"
-                        title="ZPT Page"
-                        description="A simple, content-based Page Template" />
-
-
-  <security:protectClass class=".ZPTPage."
-                         permission="Zope.View">
-    <security:protect
-              names="content_type __call__"
-              permission="Zope.View" />
-    <security:protect
-              interface=".ZPTPage.IZPTPage"
-              permission="Zope.ManageContent" />
-    <security:protect
-              interface=".ZPTPage.IRenderZPTPage"
-              permission="Zope.View" />
-  </security:protectClass>
+  <zmi:factoryFromClass
+      name="ZPTPage"
+      class=".ZPTPage."
+      permission="Zope.ManageContent"
+      title="ZPT Page"
+      description="A simple, content-based Page Template" />
+
+  <content class=".ZPTPage.">
+    <security:require permission="Zope.View"
+                      attributes="content_type __call__" />
+
+    <security:require permission="Zope.ManageContent"
+                      interface=".ZPTPage.IZPTPage" />
+    <security:require permission="Zope.View"
+                      interface=".ZPTPage.IRenderZPTPage" />
+  </content>
 
 
   <adapter
@@ -44,7 +41,5 @@
   </zmi:tabs>
 
   <include package=".Views" file="views.zcml" />
-
-
 
 </zopeConfigure>