[Zope3-checkins] CVS: Zope3/src/zope/app/startup - bootstrap.py:1.6 sitedefinition.py:1.8

[R. Sean Bowman]

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

Modified Files:
	bootstrap.py sitedefinition.py 
Log Message:
moved non core CA service names to zope/app/services/servicenames.py,
renamed ResourceService to Resources


=== Zope3/src/zope/app/startup/bootstrap.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.5	Tue Feb 11 10:59:58 2003
+++ Zope3/src/zope/app/startup/bootstrap.py	Tue Feb 11 21:17:36 2003
@@ -24,8 +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.component.servicenames import Events, HubIds, Subscription
-from zope.component.servicenames import ErrorReports
+from zope.app.services.servicenames import Events, HubIds, Subscription
+from zope.app.services.servicenames import ErrorReports
 from zope.app.services.service import ServiceManager
 from zope.app.services.service import ServiceConfiguration
 from zope.app.services.hub import ObjectHub


=== Zope3/src/zope/app/startup/sitedefinition.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/startup/sitedefinition.py:1.7	Tue Feb 11 10:59:59 2003
+++ Zope3/src/zope/app/startup/sitedefinition.py	Tue Feb 11 21:17:36 2003
@@ -38,7 +38,7 @@
 from zope.app.publication.zopepublication import ZopePublication
 from zope.app.browser.undo import ZODBUndoManager
 from zope.component import getService
-from zope.component.servicenames import Utilities
+from zope.app.services.servicenames import Utilities
 from zope.server.taskthreads import ThreadedTaskDispatcher
 
 from zodb.code.module import PersistentModuleImporter