[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/RoleService - Role.py:1.1.2.1.8.1 RoleService.py:1.1.2.1.8.1 __init__.py:1.1.2.1.8.1 role-service.zcml:1.1.2.1.8.1

[Gary Poster]

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

Modified Files:
      Tag: gary-pre_create_views-branch
	Role.py RoleService.py __init__.py role-service.zcml 
Log Message:
last commit bombed; trying again.

merged with Zope-3x branch (on my own branch; don't worry) to take advantage of Stephan's new code.  changed licenses with license utility (and thus five million commits).  Made a couple of presentational improvements.  Need to change job  board example to take advantage of this next.



=== Zope3/lib/python/Zope/App/OFS/RoleService/Role.py 1.1.2.1 => 1.1.2.1.8.1 ===
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """


=== Zope3/lib/python/Zope/App/OFS/RoleService/RoleService.py 1.1.2.1 => 1.1.2.1.8.1 ===
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 # 
 ##############################################################################
 """


=== Zope3/lib/python/Zope/App/OFS/RoleService/__init__.py 1.1.2.1 => 1.1.2.1.8.1 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+# 
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+# 
+##############################################################################
 


=== Zope3/lib/python/Zope/App/OFS/RoleService/role-service.zcml 1.1.2.1 => 1.1.2.1.8.1 ===
 >
 
-<security:protectClass name="Zope.App.OFS.RoleService.">
+<security:protectClass name=".RoleService.">
    <security:instances permission_id="Zope.Public" />
    <security:protect interface="Zope.App.Security.IRoleService." 
                      permission_id="Zope.Security" />
@@ -15,21 +15,20 @@
                      permission_id="Zope.ManageServices" />
 </security:protectClass>
 
-<security:protectClass name="Zope.App.OFS.RoleService.Role.">
+<security:protectClass name=".Role.">
    <security:instances permission_id="Zope.Public" />
    <security:protect interface="Zope.App.Security.IRole." 
                      permission_id="Zope.Security" />
 </security:protectClass>
 
 
-<service:provideClass
-  name="Zope.App.OFS.RoleService."
-  permission_id="Zope.ManageServices"
-  title="Role Service"
-  />
+<service:factoryFromClass name="RoleService"
+                          class=".RoleService."
+                          permission_id="Zope.ManageServices"
+                          title="Role Service" />
 
-<factory component="Zope.App.OFS.RoleService.Role." />
+<factory component=".Role." />
 
-<include package="Zope.App.OFS.RoleService.Views" file="views.zcml" />
+<include package=".Views" file="views.zcml" />
 
 </zopeConfigure>