[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Image - Image.py:1.1.2.3.2.2 image.zcml:1.1.2.2

[Stephan Richter]

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

Modified Files:
      Tag: srichter-OFS_Formulator-branch
	Image.py image.zcml 
Log Message:
- Tweaks for new Publisher and ZPT security


=== Zope3/lib/python/Zope/App/OFS/Image/Image.py 1.1.2.3.2.1 => 1.1.2.3.2.2 ===
 import struct
 
-from Zope.App.OFS.File.File import IFile, File
+from Zope.App.OFS.Content.File.File import IFile, File
 from Zope.App.Security.IAttributeRolePermissionManageable \
      import IAttributeRolePermissionManageable
 


=== Zope3/lib/python/Zope/App/OFS/Image/image.zcml 1.1.2.1 => 1.1.2.2 ===
   <security:permission permission_id="Zope.AddImages" title="Add Images" />
 
-  <zmi:provideClass name="Zope.App.OFS.Image."
+  <zmi:provideClass name=".Image."
                     permission_id="Zope.AddImages"
                     title="Image"
                     description="An Image" />
 
-  <security:protectClass name="Zope.App.OFS.Image."
+  <security:protectClass name=".Image."
+    interface=".Image.IImage."
     permission_id="Zope.View" />
 
 
   <!-- tabs for image -->
 
-  <zmi:tabs for="Zope.App.OFS.Image.Image.IImage.">
+  <zmi:tabs for=".Image.IImage.">
     <zmi:tab label="Edit" action="edit;view"/>
     <zmi:tab label="Contents" action="data;view"/>
     <zmi:tab label="Role Permissions" action="RolePermissionsManagement;view"/>
@@ -27,7 +28,7 @@
 
   <!-- Further Directives -->
 
-  <include package="Zope.App.OFS.Image.Views" 
+  <include package=".Views" 
            file="views.zcml" />
 
 </zopeConfigure>