[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI - metaConfigure.py:1.1.2.15.8.3

[Steve Alexander]

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

Modified Files:
      Tag: Zope3InWonderland-branch
	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/ZMI/metaConfigure.py 1.1.2.15.8.2 => 1.1.2.15.8.3 ===
 
 
-def ServiceClassDir(_context, name, class_, permission, title,
+def ServiceClassDir(_context, id, class_, permission, title,
                     description='', for_container='',
                     creation_markers=''):
     if for_container:
@@ -66,9 +66,9 @@
     # same namespace, despite the service/content division        
     return [
         Action(
-            discriminator = ('AddableFactory', name),
+            discriminator = ('AddableFactory', id),
             callable = provideClass,
-            args = ('AddableServices', name, _context.resolve(class_),
+            args = ('AddableServices', id, _context.resolve(class_),
                     permission, title, description, for_container,
                     creation_markers)
              )