[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/securitypolicy/configure.zcml Annotion-related adapters are trusted now. That means also that they are

[Stephan Richter]

Log message for revision 26489:
  Annotion-related adapters are trusted now. That means also that they are 
  security-proxied, which in turn means they need security declarations.
  


Changed:
  U   Zope3/trunk/src/zope/app/securitypolicy/configure.zcml


-=-
Modified: Zope3/trunk/src/zope/app/securitypolicy/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/configure.zcml	2004-07-13 17:13:19 UTC (rev 26488)
+++ Zope3/trunk/src/zope/app/securitypolicy/configure.zcml	2004-07-13 17:14:44 UTC (rev 26489)
@@ -3,28 +3,45 @@
     i18n_domain="zope"
     >
 
-  <content class=".permissionroles.PermissionRoles">
+  <class class=".permissionroles.PermissionRoles">
     <require permission="zope.Security"
              attributes="roles rolesInfo id title description" />
-  </content>
+  </class>
 
-  <content class=".rolepermission.RolePermissions">
+  <class class=".rolepermission.RolePermissions">
     <require permission="zope.Security"
              attributes="permissions permissionsInfo id title description" />
-  </content>
+  </class>
 
   <adapter factory=".rolepermission.AnnotationRolePermissionManager"
            provides=".interfaces.IRolePermissionManager"
-           for="zope.app.annotation.interfaces.IAnnotatable" />
+           for="zope.app.annotation.interfaces.IAnnotatable"
+           trusted="true" />
 
+  <class class=".rolepermission.AnnotationRolePermissionManager">
+    <require permission="zope.Security"
+             interface=".interfaces.IRolePermissionManager" />
+  </class>       
+
   <adapter factory=".principalrole.AnnotationPrincipalRoleManager"
            provides=".interfaces.IPrincipalRoleManager"
-           for="zope.app.annotation.interfaces.IAnnotatable" />
+           for="zope.app.annotation.interfaces.IAnnotatable" 
+           trusted="true" />
 
+  <class class=".principalrole.AnnotationPrincipalRoleManager">
+    <require permission="zope.Security"
+             interface=".interfaces.IPrincipalRoleManager" />
+  </class>
+
   <adapter factory=".principalpermission.AnnotationPrincipalPermissionManager"
            provides=".interfaces.IPrincipalPermissionManager"
-           for="zope.app.annotation.interfaces.IAnnotatable" />
+           for="zope.app.annotation.interfaces.IAnnotatable" 
+           trusted="true"/>
 
+  <class class=".principalpermission.AnnotationPrincipalPermissionManager">
+    <require permission="zope.Security"
+             interface=".interfaces.IPrincipalPermissionManager" />
+  </class>
 
   <!-- protect Roles and Permissions -->
   <content class=".role.Role">