[Zope3-checkins] CVS: Zope3/src/zope/app/services - configure.zcml:1.59

[Jim Fulton]

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

Modified Files:
	configure.zcml 
Log Message:
Reimplemented the local adapter service using a local surrogate registry.

Replaced the local view service with a local presentation service
based on local surrogate registries.

Moved a number of interfaces from zope/app/interfaces/... to
implementation modules.


=== Zope3/src/zope/app/services/configure.zcml 1.58 => 1.59 ===
--- Zope3/src/zope/app/services/configure.zcml:1.58	Fri Oct 31 18:11:14 2003
+++ Zope3/src/zope/app/services/configure.zcml	Fri Nov 21 12:10:08 2003
@@ -31,40 +31,16 @@
     />
 </content>
 
+<adapter
+  for="zope.app.interfaces.services.registration.IRegisterable"
+  provides="zope.app.interfaces.services.registration.IRegistered"
+  factory="zope.app.services.registration.Registered"
+  />
 
 <!-- Adapter Service -->
 
-<content class="zope.app.services.adapter.AdapterService">
-  <factory
-      id="zope.app.services.AdapterService"
-      permission="zope.ManageServices"
-      />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.registration.IRegistry"
-      attributes="getRegisteredMatching"
-      />
-</content>
-
-<content class="zope.app.services.adapter.AdapterRegistration">
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.adapter.IAdapterRegistration"
-      set_schema="zope.app.interfaces.services.registration.IRegistration"
-      />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IRemoveNotifiable"
-      />
-</content>
-
-<!-- View Service -->
-
-<content class="zope.app.services.view.ViewService">
-  <factory
-      id="zope.app.services.ViewService"
-      permission="zope.ManageServices"
-      />
+<content class="zope.app.services.adapter.LocalAdapterService">
+  <factory permission="zope.ManageServices" />
   <require
       permission="zope.ManageServices"
       interface="zope.app.interfaces.services.registration.IRegistry"
@@ -72,11 +48,11 @@
       />
 </content>
 
-<content class="zope.app.services.view.ViewRegistration">
+<content class=".adapter.AdapterRegistration">
   <require
       permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.view.IViewRegistration"
-      set_schema="zope.app.interfaces.services.registration.IRegistration"
+      interface=".adapter.IAdapterRegistration"
+      set_schema=".adapter.IAdapterRegistration"
       />
   <require
       permission="zope.ManageServices"
@@ -84,72 +60,9 @@
       />
 </content>
 
-<content class="zope.app.services.view.PageRegistration">
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.view.IPageRegistration"
-      set_schema="zope.app.interfaces.services.view.IPageRegistration"
-      />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.container.IRemoveNotifiable"
-      />
-</content>
-
-<adapter
-   for="zope.component.interfaces.IGlobalViewService"
-   provides="zope.app.interfaces.services.interface.IInterfaceBasedRegistry"
-   factory=".view.RegistrationAdapter"
-   />
-
-
 <!-- Menu Service -->
 <include file="menu.zcml"/>
 
-
-<!-- Page Templates -->
-
-<content class="zope.app.services.zpt.ZPTTemplate">
-  <factory
-      id="zope.app.services.zpt.template"
-      permission="zope.ManageServices"
-      title="ZPT Template"
-      description="Page Template"
-      />
-  <require
-      permission="zope.View"
-      attributes="__call__"
-      />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.view.IZPTTemplate"
-      set_schema="zope.app.interfaces.services.view.IZPTTemplate"
-      />
-  <implements
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
-      />
-</content>
-
-<adapter
-  for="zope.app.interfaces.services.view.IZPTTemplate"
-  provides="zope.app.interfaces.file.IReadFile"
-  factory=".zpt.ReadFile"
-  permission="zope.ManageServices"
-  />
-
-<adapter
-  for="zope.app.interfaces.services.view.IZPTTemplate"
-  provides="zope.app.interfaces.file.IWriteFile"
-  factory=".zpt.WriteFile"
-  permission="zope.ManageServices"
-  />
-
-<adapter
-  for="zope.app.interfaces.services.registration.IRegisterable"
-  provides="zope.app.interfaces.services.registration.IRegistered"
-  factory="zope.app.services.registration.Registered"
-  />
-
 <!-- Role Templates -->
 
 <content class="zope.app.services.role.RoleService">
@@ -310,6 +223,12 @@
         />
   </content>
 
+<!-- Presentation components -->
+  <include file="presentation.zcml" />
+
+<!-- Page templates -->
+  <include file="zpt.zcml" />
+
 <!-- Page Folder --> 
   <include file="pagefolder.zcml" />
 
@@ -463,11 +382,6 @@
 <fssync:adapter
     class=".service.ServiceManager"
     factory=".service.ServiceManagerAdapter"
-    />
-
-<fssync:adapter
-    class=".zpt.ZPTTemplate"
-    factory=".zpt.ZPTPageAdapter"
     />
 
 <fssync:adapter