[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ContentDirective - ContentDirective.py:1.1.2.2

[Steve Alexander]

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

Modified Files:
      Tag: Zope3InWonderland-branch
	ContentDirective.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/ContentDirective/ContentDirective.py 1.1.2.1 => 1.1.2.2 ===
         return [
             Action(
-                discriminator = ('AddableFactory', name),
+                discriminator = ('AddableFactory', id),
                 callable = provideClass,
-                args = ('AddableContent', name, self.__class,
+                args = ('AddableContent', id, self.__class,
                         permission, title, description, for_container,
                         creation_markers)
                 )