[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File - file.zcml:1.1.2.5.2.3

[Steve Alexander]

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

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


=== Zope3/lib/python/Zope/App/OFS/Content/File/file.zcml 1.1.2.5.2.2 => 1.1.2.5.2.3 ===
   <!--security:permission permission="Zope.AddNaiveFiles" 
                        title="Add Naive Files" />
-
-  <zmi:factoryFromClass name="NaiveFile"
-                        class=".NaiveFile."
-                        permission="Zope.AddNaiveFiles"
-                        title="Naive File"
-                        description="This is a simple file" />
-
-  <security:protectClass class=".NaiveFile."
-                         permission="Zope.View" /-->
+  <content class=".NaiveFile.">
+    <zmi:factory
+        id="NaiveFile"
+        permission="Zope.AddNaiveFiles"
+        title="Naive File"
+        description="This is a simple file" />
+    <security:require
+        permission="Zope.View" />
+  </content>
 
 
   <!-- File Directives -->
 
   <security:permission id="Zope.AddFiles" title="Add Files" />
 
-  <zmi:factoryFromClass name="File"
-                        class=".File."
-                        permission="Zope.ManageContent"
-                        title="File"
-                        description="A File" />
-
-  <security:protectClass class=".File."
-                         permission="Zope.View" >
-    <security:protect
-              interface="Zope.App.OFS.Content.File.IFile.IReadFile"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Content.File.IFile.IWriteFile"
-              permission="Zope.ManageContent" />
-  </security:protectClass>
-
-
-<adapter
-    factory="Zope.App.OFS.Annotation.AttributeAnnotations."
-    provides="Zope.App.OFS.Annotation.IAnnotations."
-    for=".IFile." />
+  <content class=".File.">
+    <zmi:factory
+        id="File"
+        permission="Zope.ManageContent"
+        title="File"
+        description="A File" />
+    <security:require
+        permission="Zope.View" >
+    <security:require
+        permission="Zope.View"
+        interface=".IFile.IReadFile" />
+    <security:require
+        permission="Zope.ManageContent"
+        interface=".IFile.IWriteFile" />
+  </content>
+
+  <adapter
+      factory="Zope.App.OFS.Annotation.AttributeAnnotations."
+      provides="Zope.App.OFS.Annotation.IAnnotations."
+      for=".IFile." />
 
 
   <!-- tabs for folder -->