[Zope3-checkins] CVS: Zope3/src/zope/component - __init__.py:1.6 servicenames.py:1.5

[R. Sean Bowman]

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

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


=== Zope3/src/zope/component/__init__.py 1.5 => 1.6 ===
--- Zope3/src/zope/component/__init__.py:1.5	Tue Feb 11 11:00:04 2003
+++ Zope3/src/zope/component/__init__.py	Tue Feb 11 21:17:42 2003
@@ -19,7 +19,7 @@
 from zope.component.interfaces import IComponentArchitecture
 from zope.component.exceptions import ComponentLookupError
 from zope.component.service import serviceManager
-from zope.component.servicenames import Adapters, Skins, ResourceService
+from zope.component.servicenames import Adapters, Skins, Resources
 from zope.component.servicenames import Factories
 
 __implements__ = IComponentArchitecture
@@ -130,17 +130,17 @@
 
 def getResource(wrapped_object, name, request):
     return getService(wrapped_object,
-                      ResourceService).getResource(
+                      Resources).getResource(
         wrapped_object, name, request)
 
 def queryResource(wrapped_object, name, request, default=None):
     return getService(wrapped_object,
-                      ResourceService).queryResource(
+                      Resources).queryResource(
         wrapped_object, name, request, default)
 
 
 #def _clear():
 #    from Service import _clear;     _clear()
 #    from ViewService import _clear; _clear()
-#    from ResourceService import _clear; _clear()
+#    from Resources import _clear; _clear()
 #    from SkinService import _clear; _clear()


=== Zope3/src/zope/component/servicenames.py 1.4 => 1.5 ===
--- Zope3/src/zope/component/servicenames.py:1.4	Tue Feb 11 11:00:04 2003
+++ Zope3/src/zope/component/servicenames.py	Tue Feb 11 21:17:42 2003
@@ -12,23 +12,15 @@
 #
 ##############################################################################
 """
-Default service names
+Default service names for CA core services
 
 $Id$
 """
 
-HubIds = 'HubIds'
-Events = 'Events'
-Subscription = 'Subscription'
-ErrorReports = 'ErrorReportingService'
-Roles = 'Roles'
-Permissions = 'Permissions'
 Adapters = 'Adapters'
-Authentication = 'Authentication'
 Interfaces = 'Interfaces'
 Utilities = 'Utilities'
 Skins = 'Skins'
 Views = 'Views'
-ResourceService = 'Resources'
+Resources = 'Resources'
 Factories = 'Factories'
-Workflows = 'Workflows'