[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/Security - security.zcml:1.1.2.8.2.4

[Steve Alexander]

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

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


=== Zope3/lib/python/Zope/App/Security/security.zcml 1.1.2.8.2.3 => 1.1.2.8.2.4 ===
 >
   <serviceType
-      name="RoleService" 
+      id="RoleService" 
       interface="Zope.App.Security.IRoleService." />
   <service
-      name="RoleService" 
+      serviceType="RoleService" 
       component="Zope.App.Security.RoleRegistry.roleRegistry" />
 
   <serviceType
-      name="PermissionService" 
+      id="PermissionService" 
       interface="Zope.App.Security.IPermissionService." />
   <service
-      name="PermissionService" 
+      serviceType="PermissionService" 
       component="Zope.App.Security.PermissionRegistry.permissionRegistry" />
 
   <serviceType
-      name="AuthenticationService" 
+      id="AuthenticationService" 
       interface="Zope.App.Security.IAuthenticationService." />
   <service
-      name="AuthenticationService" 
+      serviceType="AuthenticationService" 
       component="Zope.App.Security.PrincipalRegistry.principalRegistry" />
 
-<security:defaultPolicy 
-  name="Zope.App.Security.ZopeSecurityPolicy.zopeSecurityPolicy" />
+  <security:defaultPolicy 
+      name="Zope.App.Security.ZopeSecurityPolicy.zopeSecurityPolicy" />
 
-<adapter factory="Zope.App.Security.BasicAuthAdapter."
-         provides="Zope.App.Security.ILoginPassword."
-         for="Zope.Publisher.HTTP.IHTTPCredentials." />
-
-<adapter factory="Zope.App.Security.BasicVFSAuthAdapter."
-         provides="Zope.App.Security.ILoginPassword."
-         for="Zope.Publisher.VFS.IVFSCredentials." />
-
-<adapter factory="Zope.App.Security.BasicVFSAuthAdapter."
-         provides="Zope.App.Security.ILoginPassword."
-         for="Zope.Publisher.VFS.IVFSCredentials." />
+  <adapter factory="Zope.App.Security.BasicAuthAdapter."
+           provides="Zope.App.Security.ILoginPassword."
+           for="Zope.Publisher.HTTP.IHTTPCredentials." />
+
+  <adapter factory="Zope.App.Security.BasicVFSAuthAdapter."
+           provides="Zope.App.Security.ILoginPassword."
+           for="Zope.Publisher.VFS.IVFSCredentials." />
+
+  <adapter factory="Zope.App.Security.BasicVFSAuthAdapter."
+           provides="Zope.App.Security.ILoginPassword."
+           for="Zope.Publisher.VFS.IVFSCredentials." />
 
 
 <!-- Role-Permission management view -->
 
-
-<security:protectClass
-   class="Zope.App.Security.RolePermissionView.PermissionRoles."
-   permission="Zope.Security"
-   names="roles rolesInfo"
-   interface="Zope.App.Security.IRegisteredObject." />
-
-<browser:view for="Zope.App.OFS.Annotation.IAnnotatable."
-              permission="Zope.Security"
-              factory="Zope.App.Security.RolePermissionView.">
+  <content class=".RolePermissionView.PermissionRoles.">
+    <security:require   
+        permission="Zope.Security"
+        attributes="roles rolesInfo"
+        interface="Zope.App.Security.IRegisteredObject." />
+  </content>
+  
+  <browser:view for="Zope.App.OFS.Annotation.IAnnotatable."
+                permission="Zope.Security"
+                factory="Zope.App.Security.RolePermissionView.">
 
     <browser:page name="AllRolePermissions.html" 
-                  attribute="index"
-                  />
+                  attribute="index" />
     <browser:page name="ChangeAllRolePermissions.html" 
-                  attribute="action"
-                  />
+                  attribute="action" />
     <browser:page name="RolePermissions.html" 
-                  attribute="manage_RoleForm"
-                  />
+                  attribute="manage_RoleForm" />
     <browser:page name="ChangeRolePermissions.html" 
-                  attribute="update_role"
-                  />
+                  attribute="update_role" />
     <browser:page name="RolesWithPermission.html" 
-                  attribute="manage_permissionForm"
-                  />
+                  attribute="manage_permissionForm" />
     <browser:page name="ChangeRolesWithPermission.html" 
-                  attribute="update_permission"
-                  />
+                  attribute="update_permission" />
+  </browser:view>
 
-</browser:view>
-
-<adapter factory=".AnnotationRolePermissionManager."
-         provides=".IRolePermissionManager."
-         for="Zope.App.OFS.Annotation.IAnnotatable." />
+  <adapter factory=".AnnotationRolePermissionManager."
+           provides=".IRolePermissionManager."
+           for="Zope.App.OFS.Annotation.IAnnotatable." />
 
 
 <!-- Principal-Permission management view -->
+  <content class=".PrincipalPermissionView."
+    <security:require
+        permission="Zope.Security"
+        names="index get_principal unsetPermissions denyPermissions
+               grantPermissions getUnsetPermissionsForPrincipal
+               getPermissionsForPrincipal" />
+  </content>
+
+  <browser:view
+      name="PrincipalPermissionsManagement"
+      for="Zope.App.OFS.Annotation.IAnnotatable."
+      factory=".PrincipalPermissionView." />
+
+  <adapter factory=".AnnotationPrincipalPermissionManager."
+           provides=".IPrincipalPermissionManager."
+           for="Zope.App.OFS.Annotation.IAnnotatable." />
+
+
+  <!-- protect Roles and Permissions -->
+  <content class=".RoleRegistry.Role">
+    <security:allow
+        interface="Zope.App.Security.IRegisteredObject." />
+  </content>
   
-<security:protectClass class="Zope.App.Security.PrincipalPermissionView."
-   permission="Zope.Security"
-   names="index get_principal unsetPermissions denyPermissions
-          grantPermissions getUnsetPermissionsForPrincipal
-          getPermissionsForPrincipal
-         " />
-
-
-<browser:view name="PrincipalPermissionsManagement"
-              for="Zope.App.OFS.Annotation.IAnnotatable."
-              factory="Zope.App.Security.PrincipalPermissionView." />
-
-<adapter factory=".AnnotationPrincipalPermissionManager."
-         provides=".IPrincipalPermissionManager."
-         for="Zope.App.OFS.Annotation.IAnnotatable." />
-
-
-<!-- protect Roles and Permissions -->
-<security:protectClass class="Zope.App.Security.RoleRegistry.Role"
-                       interface="Zope.App.Security.IRegisteredObject."
-                       permission="Zope.Public"/>
-
 </zopeConfigure>