[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/File - IFile.py:1.1.2.4 file.zcml:1.1.2.6 FileEdit.py:NONE edit.pt:NONE

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	IFile.py file.zcml 
Removed Files:
      Tag: Zope-3x-branch
	FileEdit.py edit.pt 
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/File/IFile.py 1.1.2.3 => 1.1.2.4 ===
 
 from Interface import Interface
+from Zope.App.OFS.Content.IFileContent import IFileContent
 
-class IReadFile(Interface):
+class IReadFile(IFileContent):
     
 
     def getData():


=== Zope3/lib/python/Zope/App/OFS/Content/File/file.zcml 1.1.2.5 => 1.1.2.6 ===
   <!-- NaiveFile Directives -->
 
-  <!--security:permission permission_id="Zope.AddNaiveFiles" 
+  <security:permission id="Zope.AddNaiveFiles" 
                        title="Add Naive Files" />
 
-  <zmi:factoryFromClass name="NaiveFile"
-                        class=".NaiveFile."
-                        permission_id="Zope.AddNaiveFiles"
-                        title="Naive File"
-                        description="This is a simple file" />
-
-  <security:protectClass class=".NaiveFile."
-                         permission_id="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 permission_id="Zope.AddFiles" title="Add Files" />
+  <security:permission id="Zope.AddFiles" title="Add Files" />
 
-  <zmi:factoryFromClass name="File"
-                        class=".File."
-                        permission_id="Zope.ManageContent"
-                        title="File"
-                        description="A File" />
-
-  <security:protectClass class=".File."
-                         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.File.IFile.IWriteFile"
-              permission_id="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 -->
 
   <zmi:tabs for=".IFile.">
     <zmi:tab label="View" action=""/>
-    <zmi:tab label="Edit" action="edit;view"/>
-    <zmi:tab label="Role Permissions" action="RolePermissionsManagement;view"/>
+    <zmi:tab label="Edit" action="editForm.html"/>
+    <zmi:tab label="Role Permissions" 
+             action="AllRolePermissions.html"/>
   </zmi:tabs>
 
   <!-- Further Directives -->

=== Removed File Zope3/lib/python/Zope/App/OFS/Content/File/FileEdit.py ===

=== Removed File Zope3/lib/python/Zope/App/OFS/Content/File/edit.pt ===