[Zope3-checkins] CVS: Zope3/src/zope/app/services - configure.zcml:1.83 factories.py:1.4 principalannotation.py:1.15

[Stephan Richter]

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

Modified Files:
	configure.zcml factories.py principalannotation.py 
Log Message:


Adjusted imports of placefulsetup and site-related objects.




=== Zope3/src/zope/app/services/configure.zcml 1.82 => 1.83 ===
--- Zope3/src/zope/app/services/configure.zcml:1.82	Thu Mar 11 07:38:19 2004
+++ Zope3/src/zope/app/services/configure.zcml	Sat Mar 13 10:21:34 2004
@@ -20,71 +20,6 @@
   factory="zope.app.services.registration.Registered"
   />
 
-<!-- Service Manager -->
-
-  <content class="zope.app.services.service.SiteManager">
-    <require
-        permission="zope.View"
-        interface="zope.app.container.interfaces.IReadContainer" />
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.interfaces.services.service.ISiteManager
-                   zope.app.container.interfaces.IWriteContainer" />
-    <implements
-        interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-    </content>
-
-  <content class="zope.app.services.service.ServiceRegistration">
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.interfaces.services.service.IServiceRegistration"
-        set_attributes="serviceType componentPath permission"
-        set_schema=
-            "zope.app.interfaces.services.registration.IRegistration"
-        />
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.container.interfaces.IAddNotifiable"
-        />
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.container.interfaces.IRemoveNotifiable"
-        />
-
-  </content>
-
-<!-- SiteManagementFolders -->
-
-  <content class="zope.app.services.folder.SiteManagementFolders">
-    <require
-        permission="zope.View"
-        interface="zope.app.container.interfaces.IReadContainer" />
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.container.interfaces.IWriteContainer" />
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.interfaces.services.service.IComponentManager" />
-    <implements
-        interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-
-    </content>
-
-  <content class="zope.app.services.folder.SiteManagementFolder">
-    <factory />
-    <require
-        permission="zope.View"
-        interface="zope.app.container.interfaces.IReadContainer" />
-    <require
-        permission="zope.ManageServices"
-        interface="zope.app.container.interfaces.IWriteContainer"
-        attributes="getRegistrationManager resolve" 
-        />
-    <implements
-        interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-
-    </content>
-
 <!-- Registration Manager -->
 
   <content class="zope.app.services.registration.RegistrationManager">
@@ -138,27 +73,5 @@
     class=".registration.RegistrationManager"
     factory="zope.fssync.server.entryadapter.DirectoryAdapter"
     />
-
-<fssync:adapter
-    class=".folder.SiteManagementFolder"
-    factory="zope.fssync.server.entryadapter.DirectoryAdapter"
-    />
-
-<fssync:adapter
-    class=".service.ServiceManager"
-    factory=".service.ServiceManagerAdapter"
-    />
-
-<fssync:adapter
-    class=".service.ServiceRegistration"
-    factory=".registration.ComponentRegistrationAdapter"
-    />
-
-<adapter 
-  for="zope.app.interfaces.services.service.ISiteManager"
-  provides="zope.app.interfaces.file.IDirectoryFactory"
-  factory=".folder.SMFolderFactory"
-  permission="zope.ManageContent"
-  />
 
 </configure>


=== Zope3/src/zope/app/services/factories.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/factories.py:1.3	Sat Jun 21 17:22:12 2003
+++ Zope3/src/zope/app/services/factories.py	Sat Mar 13 10:21:34 2004
@@ -31,7 +31,7 @@
     return ConnectionRegistration("", "") # name, componentPath
 
 def ServiceRegistration():
-    from zope.app.services.service import ServiceRegistration
+    from zope.app.site.service import ServiceRegistration
     return ServiceRegistration("", "") # name, componentPath
 
 def UtilityRegistration():


=== Zope3/src/zope/app/services/principalannotation.py 1.14 => 1.15 ===
--- Zope3/src/zope/app/services/principalannotation.py:1.14	Mon Mar  8 07:06:10 2004
+++ Zope3/src/zope/app/services/principalannotation.py	Sat Mar 13 10:21:34 2004
@@ -31,7 +31,7 @@
 # Sibling imports
 from zope.app.interfaces.services.principalannotation \
      import IPrincipalAnnotationService
-from zope.app.interfaces.services.service import ISimpleService
+from zope.app.site.interfaces import ISimpleService
 from zope.app.container.contained import Contained
 from zope.app.location import Location