[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/LocalEventService - localEventService.zcml:1.1.2.5

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	localEventService.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/LocalEventService/localEventService.zcml 1.1.2.4 => 1.1.2.5 ===
 >
 
-<service:factoryFromClass name='Events'
-             class='.LocalEventService+'
-             permission_id='Zope.ManageServices'
-             title='Events'
-             description='An event service: use sparingly' />
+  <content class='.LocalEventService.'>
+    <security:require
+        permission="Zope.View"
+        attributes="publishEvent notify" />
+    <security:require
+        permission="Zope.ManageServices"
+        attributes="bound unbound subscribe unsubscribe subscribeOnBind
+                    unsubscribedFrom subscribedTo" />
+  </content>
+  
+  <service:factoryFromClass
+      id='Events'
+      class='.LocalEventService.'
+      permission='Zope.ManageServices'
+      title='Events'
+      description='An event service: use sparingly' />
 
-  <security:protectClass class=".LocalEventService+"
-                         permission_id="Zope.View">
-    <security:protect 
-              names="bound, unbound, subscribe, unsubscribe, subscribeOnBind,
-              unsubscribedFrom, subscribedTo" 
-              permission_id="Zope.ManageServices" />
-    <security:protect
-              names="publishEvent, notify"
-              permission_id="Zope.View" />
-  </security:protectClass>
-
-<include package=".Views" 
-         file="views.zcml" />
+  <include package=".Views" 
+           file="views.zcml" />
 
 </zopeConfigure>