[Zope3-checkins] CVS: Zope3/src/zope/app/services - adapter.py:1.6 configuration.py:1.6 configure.zcml:1.8 view.py:1.3

[Albertas Agejevas]

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

Modified Files:
	adapter.py configuration.py configure.zcml view.py 
Log Message:
Added missing IDeleteNotifiable implementations to ViewConfiguration
and PageConfiguration.  Refactored the same in AdapterConfiguration.


=== Zope3/src/zope/app/services/adapter.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/adapter.py:1.5	Wed Jan 15 11:24:00 2003
+++ Zope3/src/zope/app/services/adapter.py	Thu Jan 16 07:00:00 2003
@@ -145,7 +145,7 @@
 
 class AdapterConfiguration(SimpleConfiguration):
 
-    __implements__ = IAdapterConfiguration
+    __implements__ = IAdapterConfiguration, SimpleConfiguration.__implements__
 
     status = ConfigurationStatusProperty('Adapters')
 


=== Zope3/src/zope/app/services/configuration.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/configuration.py:1.5	Wed Jan 15 10:15:19 2003
+++ Zope3/src/zope/app/services/configuration.py	Thu Jan 16 07:00:00 2003
@@ -246,6 +246,11 @@
 
 class SimpleConfiguration(Persistent):
     """Configuration objects that just contain configuration data
+
+    Classes that derive from this must make sure they implement
+    IDeleteNotifiable either by implementing
+    SimpleConfiguration.__implements__ or explicitly implementing
+    IDeleteNotifiable.
     """
 
     __implements__ = IConfiguration, IDeleteNotifiable


=== Zope3/src/zope/app/services/configure.zcml 1.7 => 1.8 ===
--- Zope3/src/zope/app/services/configure.zcml:1.7	Wed Jan 15 10:15:19 2003
+++ Zope3/src/zope/app/services/configure.zcml	Thu Jan 16 07:00:00 2003
@@ -33,6 +33,10 @@
       interface="zope.app.interfaces.services.interfaces.IAdapterConfiguration"
       set_schema="zope.app.interfaces.services.configuration.IConfiguration"
       />
+  <require
+      permission="zope.ManageServices"
+      interface="zope.app.interfaces.container.IDeleteNotifiable"
+      />
 </content>    
 
 <!-- View Service -->


=== Zope3/src/zope/app/services/view.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/view.py:1.2	Wed Dec 25 09:13:19 2002
+++ Zope3/src/zope/app/services/view.py	Thu Jan 16 07:00:00 2003
@@ -210,7 +210,7 @@
 
 class ViewConfiguration(SimpleConfiguration):
 
-    __implements__ = IViewConfiguration
+    __implements__ = IViewConfiguration, SimpleConfiguration.__implements__
 
     status = ConfigurationStatusProperty('Views')
 
@@ -232,7 +232,7 @@
 
 class PageConfiguration(ViewConfiguration):
 
-    __implements__ = IPageConfiguration
+    __implements__ = IPageConfiguration, ViewConfiguration.__implements__
 
     def __init__(self,
                  forInterface, viewName, presentationType,