[Zope3-checkins] CVS: Zope3/src/zope/app/site - configure.zcml:1.2 folder.py:1.2 interfaces.py:1.2 service.py:1.2

[Stephan Richter]

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

Modified Files:
	configure.zcml folder.py interfaces.py service.py 
Log Message:


Moved registration code to zope.app.registration. Created module aliases, so
that old ZODBs work.


=== Zope3/src/zope/app/site/configure.zcml 1.1 => 1.2 ===
--- Zope3/src/zope/app/site/configure.zcml:1.1	Sat Mar 13 10:21:47 2004
+++ Zope3/src/zope/app/site/configure.zcml	Sat Mar 13 13:01:21 2004
@@ -48,7 +48,7 @@
         permission="zope.ManageServices"
         interface=".interfaces.IServiceRegistration"
         set_attributes="serviceType componentPath permission"
-        set_schema="zope.app.interfaces.services.registration.IRegistration"
+        set_schema="zope.app.registration.interfaces.IRegistration"
         />
     <require
         permission="zope.ManageServices"
@@ -105,7 +105,7 @@
   
   <fssync:adapter
       class=".service.ServiceRegistration"
-      factory="zope.app.services.registration.ComponentRegistrationAdapter"
+      factory="zope.app.registration.registration.ComponentRegistrationAdapter"
       />
   
   <adapter 


=== Zope3/src/zope/app/site/folder.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/site/folder.py:1.1	Sat Mar 13 10:21:47 2004
+++ Zope3/src/zope/app/site/folder.py	Sat Mar 13 13:01:21 2004
@@ -19,7 +19,7 @@
 from zope.app.component.nextservice import getNextServiceManager
 from zope.app.container.btree import BTreeContainer
 from zope.app.interfaces.file import IDirectoryFactory
-from zope.app.services.registration import RegistrationManagerContainer
+from zope.app.registration.registration import RegistrationManagerContainer
 from zope.app.traversing import getPath
 from zope.app.container.contained import setitem
 


=== Zope3/src/zope/app/site/interfaces.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/site/interfaces.py:1.1	Sat Mar 13 10:21:47 2004
+++ Zope3/src/zope/app/site/interfaces.py	Sat Mar 13 13:01:21 2004
@@ -21,7 +21,7 @@
 from zope.app.container.interfaces import IContainer
 from zope.app.container.constraints import ContainerTypesConstraint
 from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.interfaces.services import registration
+from zope.app.registration import interfaces as registration
 from zope.app.i18n import ZopeMessageIDFactory as _
 
 


=== Zope3/src/zope/app/site/service.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/site/service.py:1.1	Sat Mar 13 10:21:47 2004
+++ Zope3/src/zope/app/site/service.py	Sat Mar 13 13:01:21 2004
@@ -37,19 +37,19 @@
 from zope.app import zapi
 from interfaces import IBindingAware, ILocalService, IServiceRegistration
 from interfaces import IPossibleSite, ISite, ISiteManager
-from zope.app.interfaces.services.registration import IRegistry
+from zope.app.registration.interfaces import IRegistry
 from zope.app.interfaces.traversing import IContainmentRoot
 from zope.app.location import inside
 from zope.app.site.folder import SiteManagementFolder
-from zope.app.services.registration import ComponentRegistration
-from zope.app.services.registration import RegistrationStack
+from zope.app.registration.registration import \
+     ComponentRegistration, RegistrationStack
 from zope.app.traversing import getPath
 from zope.component.exceptions import ComponentLookupError
 from zope.component import getServiceManager
 from zope.fssync.server.entryadapter import AttrMapping, DirectoryAdapter
 from zope.proxy import removeAllProxies
 import sys
-import zope.app.interfaces.services.registration
+import zope.app.registration.interfaces
 import zope.interface
 
 
@@ -59,7 +59,7 @@
         """Add a site-management folder
         """
     __setitem__.precondition = ItemTypePrecondition(
-       zope.app.interfaces.services.registration.IRegistrationManagerContainer)
+       zope.app.registration.interfaces.IRegistrationManagerContainer)
 
 
 class SiteManager(