[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ComponentArchitecture - component.zcml:1.1.2.6

[Steve Alexander]

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

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


=== Zope3/lib/python/Zope/App/ComponentArchitecture/component.zcml 1.1.2.5 => 1.1.2.6 ===
 >
 
-<serviceType name='Utilities'
-             interface='.IUtilityService+' />
-<service name='Utilities'
-         component='.GlobalUtilityService.utilityService' />
+  <serviceType id='Utilities'
+               interface='.IUtilityService.' />
+  <service serviceType='Utilities'
+           permission='Zope.Public'
+           component='.GlobalUtilityService.utilityService' />
              
-<security:protectClass class=".GlobalUtilityService+"
-             permission="Zope.Public">
-    <security:protect interface=".IUtilityService+"
-             permission="Zope.Public" />
-    <security:protect names="provideUtility"
-             permission="Zope.ManageServices" />
-</security:protectClass>
-
-<serviceType name='Adapters'
-             interface='.IAdapterService+' />
-<service name='Adapters'
-             component='.GlobalAdapterService.adapterService' />
-<security:protectClass class=".GlobalAdapterService+"
-             permission="Zope.Public">
-    <security:protect interface=".IAdapterService+"
-             permission="Zope.Public" />
-    <security:protect names="provideAdapter"
-             permission="Zope.ManageServices" />
-</security:protectClass>
-
-<serviceType name='Factories'
-             interface='.IFactoryService+' />
-<service name='Factories'
-             component='.GlobalFactoryService.factoryService' />
-<security:protectClass class=".GlobalFactoryService+"
-             permission="Zope.Public">
-    <security:protect interface=".IFactoryService+"
-             permission="Zope.Public" />
-    <security:protect names="provideFactory"
-             permission="Zope.ManageServices" />
-</security:protectClass>
-
-<serviceType name='Skins'
-             interface='.ISkinService+' />
-<service name='Skins'
-             component='.GlobalSkinService.skinService' />
-<security:protectClass class=".GlobalSkinService+"
-             permission="Zope.Public">
-    <security:protect interface=".ISkinService+"
-             permission="Zope.Public" />
-    <security:protect names="defineSkin"
-             permission="Zope.ManageServices" />
-</security:protectClass>
-
-<serviceType name='Views' 
-             interface='.IViewService+' />
-<service name='Views'
-         component='.GlobalViewService.viewService' />
-<security:protectClass class=".GlobalViewService+"
-             permission="Zope.Public">
-    <security:protect interface=".IViewService+"
-             permission="Zope.Public" />
-    <security:protect names="provideView setDefaultViewName"
-             permission="Zope.ManageServices" />
-</security:protectClass>
-
-<serviceType name='Resources'
-             interface='.IResourceService+' />
-<service name='Resources'
-             component='.GlobalResourceService.resourceService' />
-<security:protectClass class=".GlobalResourceService+"
-             permission="Zope.Public">
-    <security:protect interface=".IResourceService+"
-             permission="Zope.Public" />
-    <security:protect names="provideResource"
-             permission="Zope.ManageServices" />
-</security:protectClass>
-
-<hookable name=".getServiceManager" />
-<hookable name=".getNextServiceManager" />
+  <serviceType id='Adapters'
+               interface='.IAdapterService.' />
+  <service serviceType='Adapters'
+           permission='Zope.Public'
+           component='.GlobalAdapterService.adapterService' />
+
+  <serviceType id='Factories'
+               interface='.IFactoryService.' />
+  <service serviceType='Factories'
+           permission='Zope.Public'
+           component='.GlobalFactoryService.factoryService' />
+
+  <serviceType id='Skins'
+               interface='.ISkinService.' />
+  <service serviceType='Skins'
+           permission='Zope.Public'
+           component='.GlobalSkinService.skinService' />
+
+  <serviceType id='Views' 
+               interface='.IViewService.' />
+  <service serviceType='Views'
+           permission='Zope.Public'
+           component='.GlobalViewService.viewService' />
+           
+  <serviceType id='Resources'
+               interface='.IResourceService.' />
+  <service serviceType='Resources'
+           permission='Zope.Public'
+           component='.GlobalResourceService.resourceService' />
+           
+  <hookable name=".getServiceManager" />
+  <hookable name=".getNextServiceManager" />
 
 </zopeConfigure>