[Zope3-checkins] CVS: Zope3/src/zope/app/interfaces/services - registration.py:1.19 service.py:1.19

[Jim Fulton]

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

Modified Files:
	registration.py service.py 
Log Message:
Got rid of NamedComponentRegistration.


=== Zope3/src/zope/app/interfaces/services/registration.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/interfaces/services/registration.py:1.18	Sat Mar  6 15:06:34 2004
+++ Zope3/src/zope/app/interfaces/services/registration.py	Sat Mar  6 17:07:25 2004
@@ -141,24 +141,6 @@
         """
 
 
-class INamedComponentRegistration(IComponentRegistration):
-    """Components registered by name, using componemt path and permission."""
-
-    name = TextLine(
-        title=_("Name"),
-        description=_("The name that is registered"),
-        readonly=True,
-        # Don't allow empty or missing name:
-        required=True,
-        min_length=1,
-        )
-
-    # The label is generally set as a class attribute on the
-    # registration class.
-    label = Attribute("Descriptive label of the registration type "
-                      "(for example, Service, Connection)")
-
-
 class IRegistrationStack(Interface):
     """A stack of registrations for a set of parameters
 


=== Zope3/src/zope/app/interfaces/services/service.py 1.18 => 1.19 ===
--- Zope3/src/zope/app/interfaces/services/service.py:1.18	Wed Mar  3 12:21:28 2004
+++ Zope3/src/zope/app/interfaces/services/service.py	Sat Mar  6 17:07:25 2004
@@ -17,9 +17,12 @@
 """
 __metaclass__ = type
 
-from zope.interface import Interface
-from zope.component.interfaces import IServiceService
+import zope.schema
+from zope.app.i18n import ZopeMessageIDFactory as _
 from zope.app.interfaces.services import registration
+from zope.app.interfaces.services.registration import IComponentRegistration
+from zope.component.interfaces import IServiceService
+from zope.interface import Interface
 
 class ILocalService(registration.IRegisterable):
     """A local service isn't a local service if it doesn't implement this.
@@ -116,7 +119,8 @@
         its containing sites and its subsites.
         """
 
-class IServiceRegistration(registration.INamedComponentRegistration):
+
+class IServiceRegistration(IComponentRegistration):
     """Service Registration
 
     Service registrations are dependent on the components that they
@@ -125,3 +129,12 @@
     The name of a service registration is used to determine the service
     type.
     """
+
+    name = zope.schema.TextLine(
+        title=_("Name"),
+        description=_("The name that is registered"),
+        readonly=True,
+        # Don't allow empty or missing name:
+        required=True,
+        min_length=1,
+        )