[Zope3-checkins] CVS: Zope3/src/zope/app/presentation - configure.zcml:1.4 pagefolder.py:1.2 presentation.py:1.6 zpt.py:1.2

[Stephan Richter]

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

Modified Files:
	configure.zcml pagefolder.py presentation.py zpt.py 
Log Message:


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


=== Zope3/src/zope/app/presentation/configure.zcml 1.3 => 1.4 ===
--- Zope3/src/zope/app/presentation/configure.zcml:1.3	Thu Mar 11 05:18:36 2004
+++ Zope3/src/zope/app/presentation/configure.zcml	Sat Mar 13 13:01:15 2004
@@ -10,7 +10,7 @@
   <factory />
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.registration.IRegistry"
+      interface="zope.app.registration.interfaces.IRegistry"
       attributes="getRegisteredMatching"
       />
 </content>
@@ -19,7 +19,7 @@
   <require
       permission="zope.ManageServices"
       interface=".presentation.IViewRegistration"
-      set_schema="zope.app.interfaces.services.registration.IRegistration"
+      set_schema="zope.app.registration.interfaces.IRegistration"
       />
   <require
       permission="zope.ManageServices"


=== Zope3/src/zope/app/presentation/pagefolder.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/presentation/pagefolder.py:1.1	Thu Mar 11 05:18:36 2004
+++ Zope3/src/zope/app/presentation/pagefolder.py	Sat Mar 13 13:01:15 2004
@@ -25,16 +25,15 @@
 
 from zope.app.container.btree import BTreeContainer
 from zope.fssync.server.entryadapter import ObjectEntryAdapter, AttrMapping
-from zope.app.interfaces.services.registration import ActiveStatus
-from zope.app.interfaces.services.registration import IRegistrationManager
-from zope.app.interfaces.services.registration \
-     import IRegistrationManagerContainer
-from zope.app.interfaces.services.registration import RegisteredStatus
-from zope.app.interfaces.services.registration import UnregisteredStatus
-from zope.app.interfaces.services.registration import IRegisterable
+from zope.app.registration.interfaces import ActiveStatus
+from zope.app.registration.interfaces import IRegistrationManager
+from zope.app.registration.interfaces import IRegistrationManagerContainer
+from zope.app.registration.interfaces import RegisteredStatus
+from zope.app.registration.interfaces import UnregisteredStatus
+from zope.app.registration.interfaces import IRegisterable
 from zope.app.container.constraints import ItemTypePrecondition
 from zope.app.presentation import PageRegistration
-from zope.app.services.registration import RegistrationManagerContainer
+from zope.app.registration.registration import RegistrationManagerContainer
 from zope.app.container.constraints import ContainerTypesConstraint
 from zpt import IZPTTemplate
 from zope.app.traversing import getPath
@@ -44,8 +43,7 @@
 from zope.app.container.interfaces import IContainer
 from zope.app.interfaces.file import IDirectoryFactory
 from zope.fssync.server.interfaces import IObjectDirectory
-from zope.app.interfaces.services.registration import \
-       IRegistrationManagerContainer
+from zope.app.registration.interfaces import IRegistrationManagerContainer
 
 class IPageFolderInfo(Interface):
     """Default registration information for page folders


=== Zope3/src/zope/app/presentation/presentation.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/presentation/presentation.py:1.5	Sat Mar 13 10:21:26 2004
+++ Zope3/src/zope/app/presentation/presentation.py	Sat Mar 13 13:01:15 2004
@@ -24,7 +24,7 @@
 import zope.app.component.interfacefield
 import zope.app.component.nextservice
 import zope.app.container.contained
-import zope.app.interfaces.services.registration
+import zope.app.registration.interfaces
 import zope.app.site.interfaces
 import zope.app.adapter
 import zope.app.services.field
@@ -38,7 +38,7 @@
 import zope.schema
 from zope.app.container.interfaces import IAddNotifiable
 from zope.app.interfaces.dependable import IDependable, DependencyError
-from zope.app.interfaces.services.registration import IRegistered
+from zope.app.registration.interfaces import IRegistered
 
 # XXX How do we define skins and layers here?
 # For now, we will leave skin and layer definition to services above,
@@ -51,7 +51,7 @@
     zope.interface.implements(
         zope.component.interfaces.IPresentationService,
         zope.app.site.interfaces.ISimpleService,
-        zope.app.interfaces.services.registration.IRegistry,
+        zope.app.registration.interfaces.IRegistry,
         zope.app.interface.interfaces.IInterfaceBasedRegistry,
         )
 
@@ -244,10 +244,10 @@
     """Registrations representing global view service thingies."""
 
     zope.interface.implements(
-        zope.app.interfaces.services.registration.IRegistration)
+        zope.app.registration.interfaces.IRegistration)
 
     serviceType = zapi.servicenames.Presentation
-    status = zope.app.interfaces.services.registration.ActiveStatus
+    status = zope.app.registration.interfaces.ActiveStatus
 
     def __init__(self, req, ptype, factories, layer, viewName):
         self.required = req
@@ -315,7 +315,7 @@
         default = "default",
         )
 
-class ViewRegistration(zope.app.services.registration.SimpleRegistration):
+class ViewRegistration(zope.app.registration.registration.SimpleRegistration):
 
     zope.interface.implements(IViewRegistration)
 
@@ -372,7 +372,7 @@
         required = False,
         )
 
-    template = zope.app.interfaces.services.registration.ComponentPath(
+    template = zope.app.registration.interfaces.ComponentPath(
         title = u"Page template",
         required = False,
         )


=== Zope3/src/zope/app/presentation/zpt.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/presentation/zpt.py:1.1	Thu Mar 11 05:18:36 2004
+++ Zope3/src/zope/app/presentation/zpt.py	Sat Mar 13 13:01:15 2004
@@ -22,7 +22,7 @@
 from zope.schema import Text, BytesLine, Bool
 
 from zope.app.container.contained import Contained
-from zope.app.interfaces.services.registration import IRegisterable
+from zope.app.registration.interfaces import IRegisterable
 from zope.app.index.interfaces.text import ISearchableText
 from zope.fssync.server.entryadapter import ObjectEntryAdapter, AttrMapping
 from zope.fssync.server.interfaces import IObjectFile