[Zope3-checkins] CVS: Zope3/src/zope/app/services - auth.py:1.25 configure.zcml:1.67 hub.py:1.31 menu.zcml:1.5 pagefolder.py:1.20 pagefolder.zcml:1.5 presentation.py:1.5 presentation.zcml:1.3 registration.py:1.22 service.py:1.39 utility.txt:1.9 utility.zcml:1.7

Philipp von Weitershausen philikon at philikon.de
Wed Mar 3 05:39:23 EST 2004


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

Modified Files:
	auth.py configure.zcml hub.py menu.zcml pagefolder.py 
	pagefolder.zcml presentation.py presentation.zcml 
	registration.py service.py utility.txt utility.zcml 
Log Message:
Moved container interfaces from zope.app.interfaces.container to
zope.app.container.interfaces.


=== Zope3/src/zope/app/services/auth.py 1.24 => 1.25 ===
--- Zope3/src/zope/app/services/auth.py:1.24	Fri Feb 20 17:02:31 2004
+++ Zope3/src/zope/app/services/auth.py	Wed Mar  3 05:38:51 2004
@@ -23,7 +23,7 @@
 from zope.component import getAdapter, queryAdapter
 from zope.app.services.servicenames import Authentication
 
-from zope.app.interfaces.container import IContainer
+from zope.app.container.interfaces import IContainer
 
 from zope.app.interfaces.security import ILoginPassword
 from zope.app.interfaces.security import IAuthenticationService


=== Zope3/src/zope/app/services/configure.zcml 1.66 => 1.67 ===
--- Zope3/src/zope/app/services/configure.zcml:1.66	Mon Mar  1 05:57:39 2004
+++ Zope3/src/zope/app/services/configure.zcml	Wed Mar  3 05:38:51 2004
@@ -56,7 +56,7 @@
       />
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IRemoveNotifiable"
+      interface="zope.app.container.interfaces.IRemoveNotifiable"
       />
 </content>
 
@@ -81,11 +81,11 @@
   <content class="zope.app.services.service.SiteManager">
     <require
         permission="zope.View"
-        interface="zope.app.interfaces.container.IReadContainer" />
+        interface="zope.app.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageServices"
         interface="zope.app.interfaces.services.service.ISiteManager
-                   zope.app.interfaces.container.IWriteContainer" />
+                   zope.app.container.interfaces.IWriteContainer" />
     <implements
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
     </content>
@@ -100,11 +100,11 @@
         />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IAddNotifiable"
+        interface="zope.app.container.interfaces.IAddNotifiable"
         />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IRemoveNotifiable"
+        interface="zope.app.container.interfaces.IRemoveNotifiable"
         />
 
   </content>
@@ -114,10 +114,10 @@
   <content class="zope.app.services.folder.SiteManagementFolders">
     <require
         permission="zope.View"
-        interface="zope.app.interfaces.container.IReadContainer" />
+        interface="zope.app.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IWriteContainer" />
+        interface="zope.app.container.interfaces.IWriteContainer" />
     <require
         permission="zope.ManageServices"
         interface="zope.app.interfaces.services.service.IComponentManager" />
@@ -130,10 +130,10 @@
     <factory permission="zope.ManageServices" />
     <require
         permission="zope.View"
-        interface="zope.app.interfaces.container.IReadContainer" />
+        interface="zope.app.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IWriteContainer"
+        interface="zope.app.container.interfaces.IWriteContainer"
         attributes="getRegistrationManager resolve" 
         />
     <implements
@@ -147,10 +147,10 @@
     <factory permission="zope.ManageServices" />
     <require
         permission="zope.View"
-        interface="zope.app.interfaces.container.IReadContainer" />
+        interface="zope.app.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IWriteContainer"
+        interface="zope.app.container.interfaces.IWriteContainer"
         attributes="getRegistrationManager resolve" 
         />
     <implements
@@ -167,14 +167,14 @@
         title = "Registration Manager" />
     <require
         permission="zope.View"
-        interface="zope.app.interfaces.container.IReadContainer" />
+        interface="zope.app.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageServices"
         interface="
-        zope.app.interfaces.container.IWriteContainer
+        zope.app.container.interfaces.IWriteContainer
         zope.app.interfaces.services.registration.IOrderedContainer
-        zope.app.interfaces.container.IRemoveNotifiable
-        zope.app.interfaces.container.INameChooser
+        zope.app.container.interfaces.IRemoveNotifiable
+        zope.app.container.interfaces.INameChooser
         " 
         />
     <implements


=== Zope3/src/zope/app/services/hub.py 1.30 => 1.31 ===
--- Zope3/src/zope/app/services/hub.py:1.30	Tue Mar  2 13:51:03 2004
+++ Zope3/src/zope/app/services/hub.py	Wed Mar  3 05:38:51 2004
@@ -28,9 +28,9 @@
 from zope.proxy import removeAllProxies
 from zope.app.services.servicenames import EventSubscription
 
-from zope.app.interfaces.container import IObjectRemovedEvent
-from zope.app.interfaces.container import IObjectMovedEvent
-from zope.app.interfaces.container import IObjectAddedEvent
+from zope.app.container.interfaces import IObjectRemovedEvent
+from zope.app.container.interfaces import IObjectMovedEvent
+from zope.app.container.interfaces import IObjectAddedEvent
 from zope.app.event.interfaces import IObjectEvent
 from zope.app.event.interfaces import ISubscriber
 from zope.app.event.interfaces import IObjectCreatedEvent


=== Zope3/src/zope/app/services/menu.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/menu.zcml:1.4	Tue Mar  2 12:40:52 2004
+++ Zope3/src/zope/app/services/menu.zcml	Wed Mar  3 05:38:51 2004
@@ -25,11 +25,11 @@
         description="A Persistent Browser Menu" />
 
     <allow
-        interface="zope.app.interfaces.container.IReadContainer" />
+        interface="zope.app.container.interfaces.IReadContainer" />
 
     <require
         permission="zope.ManageServices"
-        interface="zope.app.interfaces.container.IWriteContainer" />
+        interface="zope.app.container.interfaces.IWriteContainer" />
 
     <implements
         interface="zope.app.interfaces.services.utility.ILocalUtility" />


=== Zope3/src/zope/app/services/pagefolder.py 1.19 => 1.20 ===
--- Zope3/src/zope/app/services/pagefolder.py:1.19	Wed Feb 11 02:01:19 2004
+++ Zope3/src/zope/app/services/pagefolder.py	Wed Mar  3 05:38:51 2004
@@ -42,7 +42,7 @@
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 import zope.app.component.interfacefield
-import zope.app.interfaces.container
+import zope.app.container.interfaces
 import zope.app.interfaces.file
 import zope.fssync.server.interfaces
 import zope.app.interfaces.services.registration
@@ -88,7 +88,7 @@
 
 class IPageFolder(
     IPageFolderInfo,
-    zope.app.interfaces.container.IContainer,
+    zope.app.container.interfaces.IContainer,
     zope.app.interfaces.services.registration.IRegistrationManagerContainer,
     ):
 


=== Zope3/src/zope/app/services/pagefolder.zcml 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/pagefolder.zcml:1.4	Fri Nov 21 12:10:01 2003
+++ Zope3/src/zope/app/services/pagefolder.zcml	Wed Mar  3 05:38:51 2004
@@ -14,10 +14,10 @@
     />
   <require
       permission="zope.View"
-      interface="zope.app.interfaces.container.IReadContainer" />
+      interface="zope.app.container.interfaces.IReadContainer" />
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IWriteContainer
+      interface="zope.app.container.interfaces.IWriteContainer
                  zope.app.services.pagefolder.IPageFolderInfo"
       set_schema="zope.app.services.pagefolder.IPageFolderInfo"
       attributes="getRegistrationManager applyDefaults" 


=== Zope3/src/zope/app/services/presentation.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/services/presentation.py:1.4	Fri Feb 20 11:57:30 2004
+++ Zope3/src/zope/app/services/presentation.py	Wed Mar  3 05:38:51 2004
@@ -37,7 +37,7 @@
 import zope.proxy
 import zope.publisher.interfaces.browser
 import zope.schema
-from zope.app.interfaces.container import IAddNotifiable
+from zope.app.container.interfaces import IAddNotifiable
 from zope.app.interfaces.dependable import IDependable, DependencyError
 from zope.app.interfaces.services.registration import IRegistered
 


=== Zope3/src/zope/app/services/presentation.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/presentation.zcml:1.2	Fri Nov 21 12:09:59 2003
+++ Zope3/src/zope/app/services/presentation.zcml	Wed Mar  3 05:38:52 2004
@@ -22,7 +22,7 @@
       />
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IRemoveNotifiable"
+      interface="zope.app.container.interfaces.IRemoveNotifiable"
       />
 </content>
 
@@ -34,7 +34,7 @@
       />
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IRemoveNotifiable"
+      interface="zope.app.container.interfaces.IRemoveNotifiable"
       />
 </content>
 


=== Zope3/src/zope/app/services/registration.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/services/registration.py:1.21	Fri Feb 20 11:57:30 2004
+++ Zope3/src/zope/app/services/registration.py	Wed Mar  3 05:38:52 2004
@@ -32,7 +32,7 @@
 from zope.app.container.contained import Contained
 from zope.app.container.contained import setitem, contained, uncontained
 from zope.app.interfaces.annotation import IAttributeAnnotatable
-from zope.app.interfaces.container import IAddNotifiable, IRemoveNotifiable
+from zope.app.container.interfaces import IAddNotifiable, IRemoveNotifiable
 from zope.app.interfaces.dependable import IDependable, DependencyError
 from zope.app.interfaces.services import registration as interfaces
 from zope.app.interfaces.services.module import IModuleManager


=== Zope3/src/zope/app/services/service.py 1.38 => 1.39 ===
--- Zope3/src/zope/app/services/service.py:1.38	Tue Feb 24 11:50:57 2004
+++ Zope3/src/zope/app/services/service.py	Wed Mar  3 05:38:52 2004
@@ -49,7 +49,7 @@
 
 from zope.app.container.constraints import ItemTypePrecondition
 
-from zope.app.interfaces.container import IContainer
+from zope.app.container.interfaces import IContainer
 from zope.app.interfaces.services.service import IBindingAware
 from zope.app.interfaces.services.service import IServiceRegistration
 from zope.app.interfaces.services.service import ISiteManager


=== Zope3/src/zope/app/services/utility.txt 1.8 => 1.9 ===
--- Zope3/src/zope/app/services/utility.txt:1.8	Tue Mar  2 13:27:41 2004
+++ Zope3/src/zope/app/services/utility.txt	Wed Mar  3 05:38:52 2004
@@ -104,7 +104,7 @@
    <configure xmlns="http://namespaces.zope.org/browser">
 
    <menuItem
-         for="zope.app.interfaces.container.IAdding"
+         for="zope.app.container.interfaces.IAdding"
          menu="add_service"
          action="zope.app.services.UtilityService"
          title="Utility Service"


=== Zope3/src/zope/app/services/utility.zcml 1.6 => 1.7 ===
--- Zope3/src/zope/app/services/utility.zcml:1.6	Sun Sep 21 13:33:03 2003
+++ Zope3/src/zope/app/services/utility.zcml	Wed Mar  3 05:38:52 2004
@@ -15,8 +15,8 @@
   <require
     permission="zope.ManageServices"
     interface="zope.app.interfaces.services.utility.IUtilityRegistration
-               zope.app.interfaces.container.IAddNotifiable
-               zope.app.interfaces.container.IRemoveNotifiable"
+               zope.app.container.interfaces.IAddNotifiable
+               zope.app.container.interfaces.IRemoveNotifiable"
     set_schema="zope.app.interfaces.services.utility.IUtilityRegistration"
     />
  </content>




More information about the Zope3-Checkins mailing list