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

[Steve Alexander]

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

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


=== Zope3/lib/python/Zope/App/OFS/Content/Image/image.zcml 1.1.2.6.2.2 => 1.1.2.6.2.3 ===
    xmlns:browser='http://namespaces.zope.org/browser'
 >
-
   <security:permission id="Zope.AddImages" title="Add Images" />
-
-  <zmi:factoryFromClass name="Image"
-                        class=".Image."
-                        permission="Zope.ManageContent"
-                        title="Image"
-                        description="An Image" />
-
-  <security:protectClass class=".Image."
-                         permission="Zope.View" >
-    <security:protect
-              interface="Zope.App.OFS.Content.File.IFile.IReadFile"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Content.Image.Image.IImage"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Content.File.IFile.IWriteFile"
-              permission="Zope.ManageContent" />
-  </security:protectClass>
+  
+  <content class=".Image.">
+    <zmi:factory
+        name="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."