[Zope3-checkins] CVS: Zope3/src/zope/app/startup - bootstrap.py:1.5 metaconfigure.py:1.4 requestfactoryregistry.py:1.4 simpleregistry.py:1.4 sitedefinition.py:1.7

[Sidnei da Silva]

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

Modified Files:
	bootstrap.py metaconfigure.py requestfactoryregistry.py 
	simpleregistry.py sitedefinition.py 
Log Message:
Merging paris-copypasterename-branch. Not very fun :(

=== Zope3/src/zope/app/startup/bootstrap.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.4	Wed Feb  5 23:30:57 2003
+++ Zope3/src/zope/app/startup/bootstrap.py	Tue Feb 11 10:59:58 2003
@@ -31,7 +31,7 @@
 from zope.app.services.hub import ObjectHub
 from zope.app.services.event import EventService
 from zope.app.services.errorr import ErrorReportingService
-
+from zope.app.services.principalannotation import PrincipalAnnotationService
 
 def bootstrapInstance(db):
     """Bootstrap a Zope3 instance given a database object.
@@ -70,6 +70,8 @@
     addConfigureService(root_folder, HubIds, ObjectHub)
     addConfigureService(root_folder, ErrorReports,
                         ErrorReportingService, copy_to_zlog=True)
+    addConfigureService(root_folder, 'PrincipalAnnotation', \
+                        PrincipalAnnotationService)
 
 def addConfigureService(root_folder, service_type, service_factory, **kw):
     """Add and configure a service to the root folder."""


=== Zope3/src/zope/app/startup/metaconfigure.py 1.3 => 1.4 ===


=== Zope3/src/zope/app/startup/requestfactoryregistry.py 1.3 => 1.4 ===


=== Zope3/src/zope/app/startup/simpleregistry.py 1.3 => 1.4 ===


=== Zope3/src/zope/app/startup/sitedefinition.py 1.6 => 1.7 ===