[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder - folder.zcml:1.1.4.4.2.3

[Steve Alexander]

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

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


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/folder.zcml 1.1.4.4.2.2 => 1.1.4.4.2.3 ===
   <!-- Simple Folder Directives -->
 
-  <zmi:factoryFromClass name="Folder"
-                        class=".Folder."
-                        permission="Zope.ManageContent"
-                        title="Son of Folder"
-                        description="Minimal folder" />
-
-  <security:protectClass class=".Folder."
-                         permission="Zope.View">
-    <security:protect 
-      interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
-              permission="Zope.Public" />
-    <security:protect 
-       interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
-              permission="Zope.ManageServices" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IContainer.IReadContainer"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
-              permission="Zope.ManageContent" />
-  </security:protectClass>
+  <content class=".Folder.">
+    <zmi:factory
+        id="Folder"
+        permission="Zope.ManageContent"
+        title="Son of Folder"
+        description="Minimal folder" />
+    <security:require
+        permission="Zope.View">
+    <security:allow
+        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
+        />
+    <security:require
+        permission="Zope.ManageServices"
+        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
+        />
+    <security:require
+        permission="Zope.View"
+        interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
+    <security:require
+        permission="Zope.ManageContent"
+        interface="Zope.App.OFS.Container.IContainer.IWriteContainer" />
+  </content>
 
   <!-- XXX Do we really need RootFolder? -->
-  <security:protectClass class=".RootFolder." like_unto=".Folder." /> 
+  <content class=".RootFolder.">
+    <security:mimic class=".Folder." />
+  </content>
 
   <zmi:tabs for=".Folder.IFolder.">
     <zmi:tab label="Contents" action="view::index.html"/>
@@ -39,47 +42,52 @@
 
 
   <!-- Loaded Folder Directives -->
-
-  <zmi:factoryFromClass name="LoadedFolder"
-                        class=".LoadedFolder."
-                        permission="Zope.ManageContent"
-                        title="Loaded Folder"
-                        description="A Folder having all the goodies." />
-
-  <security:protectClass class=".LoadedFolder."
-                         permission="Zope.View">
-    <security:protect 
-              interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
-              permission="Zope.Public" />
-    <security:protect 
-              interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
-              permission="Zope.ManageServices" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IContainer.IReadContainer"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
-              permission="Zope.ManageContent" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IOrderedContainer.IReadOrderedContainer"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IOrderedContainer.IWriteOrderedContainer"
-              permission="Zope.ManageContent" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IContainerLimit.IReadContainerLimit"
-              permission="Zope.View" />
-    <security:protect
-              interface="Zope.App.OFS.Container.IContainerLimit.IWriteContainerLimit"
-              permission="Zope.ManageContent" />
-  </security:protectClass>
-
-
+  <content class=".LoadedFolder.">
+    <zmi:factory
+        id="LoadedFolder"
+        permission="Zope.ManageContent"
+        title="Loaded Folder"
+        description="A Folder having all the goodies." />
+
+    <security:require
+        permission="Zope.View">
+    <security:allow
+        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
+        />
+    <security:require
+        permission="Zope.ManageServices"
+        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
+        />
+    <security:require
+        permission="Zope.View"
+        interface="Zope.App.OFS.Container.IContainer.IReadContainer"
+        />
+    <security:require
+        permission="Zope.ManageContent"
+        interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
+        />
+    <security:require
+        permission="Zope.View"
+        interface="Zope.App.OFS.Container.IOrderedContainer.IReadOrderedContainer"
+         />
+    <security:require
+        permission="Zope.ManageContent"
+        interface="Zope.App.OFS.Container.IOrderedContainer.IWriteOrderedContainer"
+        />
+    <security:require
+        permission="Zope.View"
+        interface="Zope.App.OFS.Container.IContainerLimit.IReadContainerLimit"
+        />
+    <security:require
+        permission="Zope.ManageContent"
+        interface="Zope.App.OFS.Container.IContainerLimit.IWriteContainerLimit"
+        />
+  </content>
+  
   <adapter
       factory="Zope.App.OFS.Annotation.AttributeAnnotations."
       provides="Zope.App.OFS.Annotation.IAnnotations."
       for=".Folder.IFolder." />
-
 
   <zmi:tabs for="Zope.App.OFS.Container.IContainerLimit.">
     <zmi:tab label="Limit" action="view::limit"/>