[Zope3-checkins] CVS: Zope3/src/zope/app/startup - bootstrap.py:1.15.12.1

[Steve Alexander]

Update of /cvs-repository/Zope3/src/zope/app/startup
In directory cvs.zope.org:/tmp/cvs-serv32636/src/zope/app/startup

Modified Files:
      Tag: stevea-decorators-branch
	bootstrap.py 
Log Message:
Decorators are now really roughly integrated into zope on this branch.
Still to do:

  * The decorator registry needs an interface and some tests.

  * The decorator registry should be using a type registry rather than
    a simple dict, so that you don't need to keep declaring decorators
    for all the different subtypes of a container that doesn't manage
    its own context.

  * Fix various tests that explicitly use ZopeContainerAdapter.

  * Document use of decorators in Zope 3.

  * Get this work reviewed and discussed.

The first three points should be complete by the end of tomorrow.



=== Zope3/src/zope/app/startup/bootstrap.py 1.15 => 1.15.12.1 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.15	Sat Apr 12 07:52:18 2003
+++ Zope3/src/zope/app/startup/bootstrap.py	Wed May 14 13:44:12 2003
@@ -24,7 +24,8 @@
 from zope.app.traversing import traverse, traverseName
 from zope.app.publication.zopepublication import ZopePublication
 from zope.app.content.folder import RootFolder
-from zope.app.services.servicenames import EventPublication, HubIds, EventSubscription
+from zope.app.services.servicenames import EventPublication, EventSubscription
+from zope.app.services.servicenames import HubIds
 from zope.app.services.servicenames import ErrorLogging
 from zope.app.services.service import ServiceManager
 from zope.app.services.service import ServiceConfiguration
@@ -32,7 +33,8 @@
 from zope.app.services.event import EventService
 from zope.app.services.errorr import ErrorReportingService
 from zope.app.services.principalannotation import PrincipalAnnotationService
-from zope.app.container.zopecontainer import ZopeContainerAdapter
+#from zope.app.container.zopecontainer import ZopeContainerAdapter
+from zope.proxy.context import ContextWrapper
 from zope.proxy.introspection import removeAllProxies
 from zope.app.event import publish
 from zope.app.event.objectevent import ObjectCreatedEvent
@@ -124,7 +126,7 @@
     configuration =  ServiceConfiguration(service_type,
                                           package_name + '/' + name,
                                           root_folder)
-    cm = ZopeContainerAdapter(configuration_manager)
+    cm = ContextWrapper(configuration_manager, package)
     key = cm.setObject("", configuration)
     configuration = traverseName(configuration_manager, key)
     configuration.status = initial_status