[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ZMI - metaConfigure.py:1.1.2.11 zmi.zcml:1.1.2.7 Addable.py:NONE

[Gary Poster]

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

Modified Files:
      Tag: Zope-3x-branch
	metaConfigure.py zmi.zcml 
Removed Files:
      Tag: Zope-3x-branch
	Addable.py 
Log Message:
1. As per ZopeTop discussion, moved Addable out of ZMI into the Services folder, and turned it into a true service (this involved a lot of small changes, particularly in the folders and a number of tests) and gave it some hooks
2. used SteveA's ContextWrapper.ContextMethod to make the ServiceManager and Services placefully look up to parent placeful equivalents
3. Made Event into a more standard service, and gave it some hooks
4. Built the beginning of a placeful EventService (will need tests, and views, and EventChannels, and more meat; just wanted to check this in for now)
5. made it so you can't add an item to a folder with a blank string id, and updated the folder interface
6. some typos fixed here and there
7. a few more tests here and there

I'm checking this in then checking it out again to check my work; also tagged previous version as gary-service_update.



=== Zope3/lib/python/Zope/App/ZMI/metaConfigure.py 1.1.2.10 => 1.1.2.11 ===
 from Zope.Configuration.Action import Action
 from Zope.ComponentArchitecture.IFactory import IFactory
-from Zope.ComponentArchitecture import provideFactory
-import Addable
+from Zope.ComponentArchitecture import provideFactory, getService
 from IGenericCreatorMarker import IGenericCreatorMarker
 
 class ClassFactory:
@@ -48,6 +47,7 @@
     """
     factory = ClassFactory(_class, permission)
     provideFactory(qualified_name, factory)
+    registry=getService(None,registry)
     registry.provideAddable(qualified_name, title, description, marker_interface)
 
 
@@ -57,7 +57,7 @@
         Action(
             discriminator = name,
             callable = provideClass,
-            args = (Addable.ServiceAddables, name, _context.resolve(class_),
+            args = ('AddableServices', name, _context.resolve(class_),
                     permission_id, title, description)
              )
         ]
@@ -71,7 +71,7 @@
         Action(
             discriminator = name,
             callable = provideClass,
-            args = (Addable.ContentAddables, name, _context.resolve(class_),
+            args = ('AddableContent', name, _context.resolve(class_),
                     permission_id, title, description, marker_interface)
             )
         ]


=== Zope3/lib/python/Zope/App/ZMI/zmi.zcml 1.1.2.6 => 1.1.2.7 ===
                          permission_id="Zope.View"/>
 
-  <security:protectClass name=".Addable."
-                         permission_id="Zope.Public"
-  		         methods="id, title, description, icon" />
-
   <security:protectClass name=".ZMIViewUtility."
                          permission_id="Zope.View"
                          methods="getZMIViews"/>

=== Removed File Zope3/lib/python/Zope/App/ZMI/Addable.py ===