[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Image - image.zcml:1.1.2.7

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	image.zcml 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/OFS/Content/Image/image.zcml 1.1.2.6 => 1.1.2.7 ===
    xmlns:browser='http://namespaces.zope.org/browser'
 >
-
-  <security:permission permission_id="Zope.AddImages" title="Add Images" />
-
-  <zmi:factoryFromClass name="Image"
-                        class=".Image."
-                        permission_id="Zope.ManageContent"
-                        title="Image"
-                        description="An Image" />
-
-  <security:protectClass class=".Image."
-                         permission_id="Zope.View" >
-    <security:protect
-              interface="Zope.App.OFS.Content.File.IFile.IReadFile"
-              permission_id="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Content.Image.Image.IImage"
-              permission_id="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Content.File.IFile.IWriteFile"
-              permission_id="Zope.ManageContent" />
-  </security:protectClass>
+  <security:permission id="Zope.AddImages" title="Add Images" />
+  
+  <content class=".Image.">
+    <zmi:factory
+        id="Image"                        
+        permission="Zope.ManageContent"
+        title="Image"
+        description="An Image" />
+    <security:require
+        permission="Zope.View"
+        interface="Zope.App.OFS.Content.File.IFile.IReadFile" />
+    <security:require
+        permission="Zope.View"
+        interface=".Image.IImage" />
+    <security:require
+        permission="Zope.ManageContent"
+        interface="Zope.App.OFS.Content.File.IFile.IWriteFile" />
+  </content>
 
   <adapter
       factory="Zope.App.OFS.Annotation.AttributeAnnotations."
@@ -34,9 +31,10 @@
   <!-- tabs for image -->
 
   <zmi:tabs for=".Image.IImage.">
-    <zmi:tab label="Edit" action="edit;view"/>
+    <zmi:tab label="Edit" action="editForm.html"/>
     <zmi:tab label="View" action=""/>
-    <zmi:tab label="Role Permissions" action="RolePermissionsManagement;view"/>
+    <zmi:tab label="Role Permissions"
+             action="AllRolePermissions.html"/>
   </zmi:tabs>