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

[Jim Fulton]

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

Modified Files:
	bootstrap.py 
Log Message:
Removed "Packages" from the object hierarchy in site managers (service
managers).  We now traverse directly from site managers to individual
site-management folders.

This change is backward compatible because the underlying data
structures haven't changed.


=== Zope3/src/zope/app/startup/bootstrap.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.10	Sat Mar  8 16:46:10 2003
+++ Zope3/src/zope/app/startup/bootstrap.py	Tue Mar 18 16:02:23 2003
@@ -100,7 +100,7 @@
     # The code here is complicated by the fact that the registry
     # calls at the end require a fully context-wrapped
     # configuration; hence all the traverse() and traverseName() calls.
-    package_name = ('', '++etc++Services', 'Packages', 'default')
+    package_name = '/++etc++Services/default'
     package = traverse(root_folder, package_name)
     name = service_type + '-1'
     service = service_factory()
@@ -115,11 +115,11 @@
 def configureService(root_folder, service_type, name,
                      initial_status='Active'):
     """Configure a service in the root folder."""
-    package_name = ('', '++etc++Services', 'Packages', 'default')
+    package_name = '/++etc++Services/default'
     package = traverse(root_folder, package_name)
     configuration_manager = traverseName(package, 'configure')
     configuration =  ServiceConfiguration(service_type,
-                                          package_name + (name,),
+                                          package_name + '/' + name,
                                           root_folder)
     cm = ZopeContainerAdapter(configuration_manager)
     key = cm.setObject("", configuration)