[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.7 auth.py:1.10

[R. Sean Bowman]

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

Modified Files:
	adapter.py auth.py 
Log Message:
finished changing service names to use strings defined in
zope/component/servicenames.py, changed the name of
ErrorReportingService to ErrorReports and Resources to ResourceService


=== Zope3/src/zope/app/services/adapter.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/adapter.py:1.6	Thu Jan 16 07:00:00 2003
+++ Zope3/src/zope/app/services/adapter.py	Thu Feb  6 01:49:56 2003
@@ -23,6 +23,7 @@
 from zope.component.interfaces import IAdapterService
 from zope.component.exceptions import ComponentLookupError
 from zope.component import getServiceManager
+from zope.component.servicenames import Adapters
 from zope.app.interfaces.services.configuration import IConfigurable
 from zope.app.services.configuration import ConfigurationRegistry
 from zope.app.services.configuration import SimpleConfiguration
@@ -125,7 +126,7 @@
                 adapter = registry.active().getAdapter(object)
                 return adapter
 
-        adapters = getNextService(self, 'Adapters')
+        adapters = getNextService(self, Adapters)
 
         return adapters.queryAdapter(object, interface, default)
 
@@ -147,7 +148,7 @@
 
     __implements__ = IAdapterConfiguration, SimpleConfiguration.__implements__
 
-    status = ConfigurationStatusProperty('Adapters')
+    status = ConfigurationStatusProperty(Adapters)
 
     # XXX These should be positional arguments, except that forInterface
     #     isn't passed in if it is omitted. To fix this, we need a


=== Zope3/src/zope/app/services/auth.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/services/auth.py:1.9	Mon Feb  3 10:08:48 2003
+++ Zope3/src/zope/app/services/auth.py	Thu Feb  6 01:49:56 2003
@@ -23,6 +23,7 @@
 
 from zope.exceptions import NotFoundError
 from zope.component import getAdapter, queryAdapter
+from zope.component.servicenames import Authentication
 
 from zope.app.interfaces.container import IContainer
 
@@ -76,7 +77,7 @@
                         return p
                     else:
                         return None
-        next = getNextService(self, 'Authentication')
+        next = getNextService(self, Authentication)
         return next.authenticate(request)
 
     authenticate = ContextMethod(authenticate)
@@ -97,7 +98,7 @@
         try:
             return self._usersbyid[id]
         except KeyError:
-            next = getNextService(self, 'Authentication')
+            next = getNextService(self, Authentication)
             return next.getPrincipal(id)
 
     getPrincipal = ContextMethod(getPrincipal)