[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/RoleService - configure.zcml:1.7

[Stephan Richter]

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

Modified Files:
	configure.zcml 
Log Message:
- Added descriptions to last Services

- Removed old-style menu entries

- Started more aggressivly to convert ZCML to Steve's style suggestions


=== Zope3/lib/python/Zope/App/OFS/Services/RoleService/configure.zcml 1.6 => 1.7 ===
 <zopeConfigure
    xmlns='http://namespaces.zope.org/zope'
    xmlns:browser='http://namespaces.zope.org/browser'
+   xmlns:service='http://namespaces.zope.org/service'>
 
-   xmlns:service='http://namespaces.zope.org/service'
->
-  <content class=".RoleService.">
+<content class=".RoleService.">
+  <factory
+      id="RoleService"
+      permission="Zope.ManageServices"
+      />
+  <require
+      permission="Zope.Security"
+      interface="Zope.App.Security.IRoleService." />
+  <require
+      permission="Zope.ManageServices"
+      interface="Zope.App.OFS.Container.IContainer." />
+</content>
+
+<content class=".Role.">
+  <factory />
+  <require
+      permission="Zope.Security"
+      interface="Zope.App.Security.IRole." />
+</content>
 
-    <factory
-        id="RoleService"
-        permission="Zope.ManageServices"
-        />
+<browser:icon name="zmi_icon" for=".RoleService.ILocalRoleService"
+    file="role_service.gif" />
 
-    <require
-        permission="Zope.Security"
-        interface="Zope.App.Security.IRoleService." />
-    <require
-        permission="Zope.ManageServices"
-        interface="Zope.App.OFS.Container.IContainer." />
-
-  </content>
-
-  <browser:menuItem menu="add_service" for="Zope.App.OFS.Container.IAdding."
-     action="RoleService"  title="Role Service" />
-  
-  <content class=".Role.">
-    <factory />
-    <require
-        permission="Zope.Security"
-        interface="Zope.App.Security.IRole." />
-  </content>
-
-  <include package=".Views" />
-
-  <browser:icon name="zmi_icon" for=".RoleService.ILocalRoleService"
-                file="role_service.gif" />
+<include package=".Views" />
 
 </zopeConfigure>