[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ComponentArchitecture - component-meta.zcml:1.1.2.4 metaConfigure.py:1.1.2.5

[Steve Alexander]

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

Modified Files:
      Tag: Zope3InWonderland-branch
	component-meta.zcml metaConfigure.py 
Log Message:
more corrections to new zcml.
some bugs in new directives fixed.
stub for "permission" in service declaration, awaiting Jim's checkins.
Zope starts!



=== Zope3/lib/python/Zope/App/ComponentArchitecture/component-meta.zcml 1.1.2.3 => 1.1.2.4 ===
         handler="Zope.App.ComponentArchitecture.metaConfigure.skin" />
     
-    <directive name="serviceType" attributes="name interface"
+    <directive name="serviceType" attributes="id interface"
        handler="Zope.App.ComponentArchitecture.metaConfigure.serviceType" />
 
-    <directive name="service" attributes="name component"
+    <directive name="service" attributes="serviceType component permission"
        handler="Zope.App.ComponentArchitecture.metaConfigure.service" />
 
   </directives>


=== Zope3/lib/python/Zope/App/ComponentArchitecture/metaConfigure.py 1.1.2.4 => 1.1.2.5 ===
     return actions
 
-def serviceType(_context, name, interface):
+def serviceType(_context, id, interface):
     return [
         Action(
-            discriminator = ('serviceType', name),        
+            discriminator = ('serviceType', id),
             callable = managerHandler,
-            args = ('defineService',name, _context.resolve(interface)),
+            args = ('defineService', id, _context.resolve(interface)),
             )
         ]
 
-def service(_context, name, component):
+def service(_context, serviceType, component, permission=None):
     component = _context.resolve(component)
     return [
         Action(
-            discriminator = ('service', name),        
+            discriminator = ('service', serviceType),
             callable = managerHandler,
-            args = ('provideService', name, component),
+            args = ('provideService', serviceType, component),
             )
         ]