[Zope3-checkins] CVS: Zope3/src/zope/app/services - field.py:1.7 service.py:1.12

[Guido van Rossum]

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

Modified Files:
	field.py service.py 
Log Message:
- Remove title and description fields from add_cache.pt (these
  attributes no longer exist on configurations).

- Changed the custom view for adding a connection configuration with
  an add form directive; addconnectionconfig.pt and connection.py in
  zope/app/browser/services bite the dust.

- Change the componentPath attribute to a ComponentPath field; this
  ran into some circularities so we did the following:

- Renamed INameResolver to IModuleService and moved it to its own
  file, zope/app/interfaces/services/module.py.

- Fixed up a few docstrings and comments.



=== Zope3/src/zope/app/services/field.py 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/field.py:1.6	Fri Jan 17 11:32:18 2003
+++ Zope3/src/zope/app/services/field.py	Thu Mar 13 12:10:37 2003
@@ -24,7 +24,7 @@
 from zope.app.interfaces.services.field import IComponentPath
 from zope.app.interfaces.services.field import IComponentLocation
 from zope.component import getServiceManager, getAdapter
-from zope.app.interfaces.services.service import INameResolver
+from zope.app.interfaces.services.module import IModuleService
 
 class ComponentPath(Field):
 
@@ -86,7 +86,7 @@
         # XXX Need to be careful here. Jim was going to look
         #     at whether a checkedResolve method is needed.
         servicemanager = getServiceManager(context)
-        resolver = getAdapter(servicemanager, INameResolver)
+        resolver = getAdapter(servicemanager, IModuleService)
         try:
             component = resolver.resolve(location)
         except ImportError:


=== Zope3/src/zope/app/services/service.py 1.11 => 1.12 ===
--- Zope3/src/zope/app/services/service.py:1.11	Tue Mar 11 11:11:22 2003
+++ Zope3/src/zope/app/services/service.py	Thu Mar 13 12:10:37 2003
@@ -13,7 +13,6 @@
 ##############################################################################
 """Service manager implementation
 
-
 A service manager has a number of roles:
 
   - A service service
@@ -21,7 +20,8 @@
   - A place to do TTW development or to manage database-based code
 
   - A registry for persistent modules.  The Zope import hook uses the
-    ServiceManager to search for modules.
+    ServiceManager to search for modules.  (This functionality will
+    eventually be replaced by a separate module service.)
 
 $Id$
 """
@@ -45,14 +45,14 @@
 
 from zope.app.interfaces.container import IReadContainer
 from zope.app.interfaces.services.service import IBindingAware
-from zope.app.interfaces.services.service import INameResolver
+from zope.app.interfaces.services.module import IModuleService
 from zope.app.interfaces.services.service import IServiceConfiguration
 from zope.app.interfaces.services.service import IServiceManager
 from zope.app.interfaces.services.service import IServiceManagerContainer
 from zope.app.interfaces.services.configuration import IUseConfiguration
 
-ModuleType = type(INameResolver)
-ModuleType = ModuleType, PersistentModule
+# XXX This makes no sense?
+ModuleType = type(IModuleService), PersistentModule
 
 from zope.app.services.configuration import ConfigurationStatusProperty
 from zope.app.services.configuration import NameComponentConfigurable
@@ -68,7 +68,7 @@
     __implements__ = (IServiceManager, IReadContainer,
                       PersistentModuleRegistry.__implements__,
                       NameComponentConfigurable.__implements__,
-                      INameResolver)
+                      IModuleService)
 
     def __init__(self):
         super(ServiceManager, self).__init__()