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

[Janko Hauser]

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

Modified Files:
      Tag: Zope-3x-branch
	zope.zcml 
Log Message:
Resolved conflict with the adaptor AttributePrincipalRoleManager


=== Zope3/zope.zcml 1.1.2.26 => 1.1.2.27 ===
          />
 
-<adapter factory="Zope.App.Security.AttributePrincipalPermissionManager."
-         for="Zope.App.Security.IAttributePrincipalPermissionManageable."
-         provides="Zope.App.Security.IPrincipalPermissionManager."
-         />
+<!-- Principal-Permission management view -->
+
+<security:protectClass name="Zope.App.Security.PrincipalPermissionView."
+   permission_id="Zope.Security"
+   methods="index, get_principal, unsetPermissions, denyPermissions,
+   grantPermissions, getUnsetPermissionsForPrincipal,
+   getPermissionsForPrincipal" />
+
+<browser:view name="PrincipalPermissionsManagement"
+              for="Zope.App.Security.IAttributePrincipalPermissionManageable."
+              factory="Zope.App.Security.PrincipalPermissionView." />
+
          
 <adapter factory="Zope.App.Security.AttributePrincipalRoleManager."
          for="Zope.App.Security.IAttributePrincipalRoleManageable."
          provides="Zope.App.Security.IPrincipalRoleManager."
          />
          
+
 <!-- Language negotiation adapter 
 <adapter factory="Zope.Publisher.Browser.BrowserLanguages."
          for="Zope.Publisher.Browser.IHTTPRequest."