[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/RoleService - role-service.zcml:1.1.4.3

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/RoleService
In directory cvs.zope.org:/tmp/cvs-serv12187/lib/python/Zope/App/OFS/Services/RoleService

Modified Files:
      Tag: Zope-3x-branch
	role-service.zcml 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/role-service.zcml 1.1.4.2 => 1.1.4.3 ===
    xmlns:service='http://namespaces.zope.org/service'
 >
+  <content class=".RoleService.">
+    <security:require
+        permission="Zope.Security"
+        interface="Zope.App.Security.IRoleService." />
+    <security:require
+        permission="Zope.ManageServices"
+        interface="Zope.App.OFS.Container.IContainer." />
+  </content>
+  
+  <content class=".Role.">
+    <security:require
+        permission="Zope.Security"
+        interface="Zope.App.Security.IRole." />
+  </content>
+
+  <service:factoryFromClass
+      id="RoleService"
+      class=".RoleService."
+      permission="Zope.ManageServices"
+      title="Role Service" />
 
-<security:protectClass class=".RoleService.">
-   <security:protect interface="Zope.App.Security.IRoleService." 
-                     permission_id="Zope.Security" />
-   <security:protect interface="Zope.App.OFS.Container.IContainer." 
-                     permission_id="Zope.ManageServices" />
-</security:protectClass>
+  <factory component=".Role." />
 
-<security:protectClass class=".Role.">
-   <security:protect interface="Zope.App.Security.IRole." 
-                     permission_id="Zope.Security" />
-</security:protectClass>
-
-
-<service:factoryFromClass name="RoleService"
-                          class=".RoleService."
-                          permission_id="Zope.ManageServices"
-                          title="Role Service" />
-
-<factory component=".Role." />
-
-<include package=".Views" file="views.zcml" />
+  <include package=".Views" file="views.zcml" />
 
 </zopeConfigure>