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

[Steve Alexander]

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

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


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/role-service.zcml 1.1.4.2.2.1 => 1.1.4.2.2.2 ===
    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="Zope.Security" />
-   <security:protect interface="Zope.App.OFS.Container.IContainer." 
-                     permission="Zope.ManageServices" />
-</security:protectClass>
+  <factory component=".Role." />
 
-<security:protectClass class=".Role.">
-   <security:protect interface="Zope.App.Security.IRole." 
-                     permission="Zope.Security" />
-</security:protectClass>
-
-
-<service:factoryFromClass name="RoleService"
-                          class=".RoleService."
-                          permission="Zope.ManageServices"
-                          title="Role Service" />
-
-<factory component=".Role." />
-
-<include package=".Views" file="views.zcml" />
+  <include package=".Views" file="views.zcml" />
 
 </zopeConfigure>