[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/services - configuration.py:1.7.2.1 connection.py:1.2.10.1 utility.py:1.1.2.3

[Jim Fulton]

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

Modified Files:
      Tag: local-utility-branch
	configuration.py connection.py utility.py 
Log Message:
Checking in current code to the branch.

It may be in a state of non-working-ness. We'll fix that later.

We're currently trying to clean up the logic for adding configs.


=== Zope3/src/zope/app/interfaces/services/configuration.py 1.7 => 1.7.2.1 ===
--- Zope3/src/zope/app/interfaces/services/configuration.py:1.7	Thu Mar 13 12:10:36 2003
+++ Zope3/src/zope/app/interfaces/services/configuration.py	Tue Mar 18 07:35:50 2003
@@ -22,7 +22,6 @@
 from zope.app.security.permission import PermissionField
 from zope.app.interfaces.annotation import IAnnotatable
 from zope.app.interfaces.annotation import IAttributeAnnotatable
-from zope.app.interfaces.rdb import IZopeDatabaseAdapter
 from zope.app.services.field import ComponentPath
 
 Unregistered = u'Unregistered'
@@ -89,10 +88,11 @@
     """
 
     permission = PermissionField(
-        title=u"The permission needed to use the component.")
+        title=u"The permission needed to use the component.",
+        required=False,
+        )
 
     componentPath = ComponentPath(
-        type=IZopeDatabaseAdapter,
         title=u"Component path",
         description=u"The physical path to the component",
         required=True)
@@ -193,8 +193,8 @@
         arguments for each of the parameters needed to specify a set
         of configurations.
 
-        The registry must be returned in the context of the context of
-        the configurable.
+        The registry must be returned wrapped in the context of the
+        configurable.
 
         """
 
@@ -213,6 +213,10 @@
 
         Calling createConfigurationsFor twice for the same configuration
         returns the same registry.
+
+        The registry must be returned wrapped in the context of the
+        configurable.
+
         """
 
 


=== Zope3/src/zope/app/interfaces/services/connection.py 1.2 => 1.2.10.1 ===
--- Zope3/src/zope/app/interfaces/services/connection.py:1.2	Wed Dec 25 09:13:02 2002
+++ Zope3/src/zope/app/interfaces/services/connection.py	Tue Mar 18 07:35:50 2003
@@ -15,13 +15,19 @@
 
 $Id$
 """
+from zope.app.services.field import ComponentPath
+from zope.app.interfaces.services import configuration 
+from zope.app.interfaces.rdb import IZopeDatabaseAdapter
 
-from zope.app.interfaces.services.configuration \
-     import INamedComponentConfiguration
-
-class IConnectionConfiguration(INamedComponentConfiguration):
+class IConnectionConfiguration(configuration.INamedComponentConfiguration):
     """Database Connection Configuration
 
     Connection configurations are dependent on the database adapters that they
     configure. They register themselves as component dependents.
     """
+    
+    componentPath = ComponentPath(
+        type=IZopeDatabaseAdapter,
+        title=u"Component path",
+        description=u"The physical path to the component",
+        required=True)


=== Zope3/src/zope/app/interfaces/services/utility.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/interfaces/services/utility.py:1.1.2.2	Thu Mar 13 17:28:09 2003
+++ Zope3/src/zope/app/interfaces/services/utility.py	Tue Mar 18 07:35:50 2003
@@ -22,6 +22,7 @@
 from zope.app.security.permission import PermissionField
 from zope.schema import BytesLine, TextLine
 from zope.app.interfaces.services.configuration import IUseConfigurable
+from zope.app.services.field import ComponentPath
 
 class IUtilityConfiguration(INamedComponentConfiguration):
     """Utility configuration object.
@@ -31,12 +32,21 @@
     getComponent().
     """
 
+    componentPath = ComponentPath(
+        title=u"Component path",
+        description=u"The physical path to the component",
+        required=True,
+        readonly=True,
+        )
+
     interface = InterfaceField(
         title = u"Provided interface",
         description = u"The interface provided by the adapter",
         readonly = True,
         required = True,
         )
+
+
 
 class ILocalUtility(IUseConfigurable):
     """Local utility marker.