[Zope-Checkins] CVS: Zope3 - zope.zcml:1.1.2.13

[Jim Fulton]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv18808

Modified Files:
      Tag: Zope-3x-branch
	zope.zcml 
Log Message:
Changed permission, role, and principal attributes in directives
to permission_id, role_id, and principal_id because they name ids, 
not instances.


=== Zope3/zope.zcml 1.1.2.12 => 1.1.2.13 ===
   <directives namespace="http://namespaces.zope.org/zmi">
     <directive name="provideClass"
-               attributes="name, permission, title, description"
+               attributes="name, permission_id, title, description"
                handler="Zope.App.ZMI.provideClass.provideClassDir" />
     <directive name="tabs" attributes="for"
                handler="Zope.App.ZMI.TabsDirective.">
@@ -22,35 +22,35 @@
 
   <!-- Zope.App.Security -->
   <directives namespace="http://namespaces.zope.org/security">
-    <directive name="definePermission"
-               attributes="permission, title, description"
+    <directive name="permission"
+               attributes="permission_id, title, description"
                handler="Zope.App.Security.metaConfigure.definePermission" />
-    <directive name="defineRole"
-               attributes="role, title, description"
+    <directive name="role"
+               attributes="role_id, title, description"
                handler="Zope.App.Security.metaConfigure.defineRole" />
     <directive name="protectClass"
-               attributes="name, permission, interface, method, methods"
+               attributes="name, permission_id, interface, method, methods"
        handler="Zope.App.Security.protectClass">
       <subdirective name="protect"
-                    attributes="permission, interface, method, methods" />
-      <subdirective name="instances" attributes="permission" />
+                    attributes="permission_id, interface, method, methods" />
+      <subdirective name="instances" attributes="permission_id" />
       </directive>
     <directive name="publicClass" attributes="name, interface, method, methods"
                handler="Zope.App.Security.publicClass" />
     <directive name="defaultPolicy" attributes="name"
        handler="Zope.App.Security.metaConfigure.defaultPolicy" />
-    <directive name="principal" attributes="principal, title, description"
+    <directive name="principal" attributes="principal_id, title, description"
        handler="Zope.App.Security.metaConfigure.principal" />
     <directive name="defaultPrincipal" 
-               attributes="principal, title, description"
+               attributes="principal_id, title, description"
        handler="Zope.App.Security.metaConfigure.defaultPrincipal" />
-    <directive name="grantPermissionToRole" attributes="permission, role"
+    <directive name="grantPermissionToRole" attributes="permission_id, role_id"
        handler="Zope.App.Security.metaConfigure.grantPermissionToRole" />
     <directive
        name="grantPermissionToPrincipal"
-       attributes="permission, principal"
+       attributes="permission_id, principal_id"
        handler="Zope.App.Security.metaConfigure.grantPermissionToPrincipal" />
-    <directive name="assignRoleToPrincipal" attributes="role, principal"
+    <directive name="assignRoleToPrincipal" attributes="role_id, principal_id"
        handler="Zope.App.Security.metaConfigure.assignRoleToPrincipal" />
   </directives>
 
@@ -110,13 +110,13 @@
 <security:defaultPolicy 
   name="Zope.App.Security.ZopeSecurityPolicy.zopeSecurityPolicy" />
 
-<security:definePermission permission="Zope.View" title="View" />
-<security:definePermission permission="Zope.Security"
+<security:permission permission_id="Zope.View" title="View" />
+<security:permission permission_id="Zope.Security"
    title="Change security settings" />
-<security:definePermission permission="Zope.AddFolders" title="Add folders" />
+<security:permission permission_id="Zope.AddFolders" title="Add folders" />
 
 <zmi:provideClass name="Zope.App.OFS.Folder"
-                  permission="Zope.AddFolders"
+                  permission_id="Zope.AddFolders"
                   title="Son of Folder"
                   description="Minimal folder" />
 
@@ -128,7 +128,7 @@
  component="Zope.App.OFS.ContainerTraverser.ContainerTraverser" />
 
 <security:protectClass name="Zope.App.OFS.FolderContents"
-   permission="Zope.View" methods="index" />
+   permission_id="Zope.View" methods="index" />
 
 <browser:view name="contents"
  for="Zope.App.OFS.Folder.IFolder"
@@ -143,10 +143,10 @@
  component="Zope.App.OFS.FolderContents" /-->
 
 <security:protectClass name="Zope.App.OFS.FolderAdder"
-   permission="Zope.AddFolders" methods="index, confirmed, action" />
+   permission_id="Zope.AddFolders" methods="index, confirmed, action" />
 
 <security:protectClass name="Zope.App.OFS.Folder"
-   permission="Zope.View" />
+   permission_id="Zope.View" />
 
 <browser:view name="adder"
  for="Zope.App.OFS.Folder.IFolder"
@@ -164,12 +164,12 @@
 <!-- Role-Permission management view -->
 
 <security:protectClass name="Zope.App.Security.RolePermissionView"
-   permission="Zope.Security"
+   permission_id="Zope.Security"
    methods="index, roles, permissions, permissionRoles, action" />
 
 <security:protectClass
    name="Zope.App.Security.RolePermissionView.PermissionRoles"
-   permission="Zope.Security"
+   permission_id="Zope.Security"
    methods="roles" 
    interface="Zope.App.Security.IPermission" />