[Zope3-checkins] CVS: Zope3/src/zope/app/services - configure.zcml:1.70 pagefolder.py:1.22 adapter.py:NONE presentation.py:NONE presentation.zcml:NONE surrogate.py:NONE

[Jim Fulton]

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

Modified Files:
	configure.zcml pagefolder.py 
Removed Files:
	adapter.py presentation.py presentation.zcml surrogate.py 
Log Message:
Moved the adapter and presentation services from zope.app.services to
their own packages under zope.app. Also folded
zope.app.services.surrogate into the new adapter module,
zope.app.adapter.adapter.


=== Zope3/src/zope/app/services/configure.zcml 1.69 => 1.70 ===
--- Zope3/src/zope/app/services/configure.zcml:1.69	Mon Mar  8 07:53:26 2004
+++ Zope3/src/zope/app/services/configure.zcml	Mon Mar  8 14:40:29 2004
@@ -37,29 +37,6 @@
   factory="zope.app.services.registration.Registered"
   />
 
-<!-- Adapter Service -->
-
-<content class="zope.app.services.adapter.LocalAdapterService">
-  <factory permission="zope.ManageServices" />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.interfaces.services.registration.IRegistry"
-      attributes="getRegisteredMatching"
-      />
-</content>
-
-<content class=".adapter.AdapterRegistration">
-  <require
-      permission="zope.ManageServices"
-      interface=".adapter.IAdapterRegistration"
-      set_schema=".adapter.IAdapterRegistration"
-      />
-  <require
-      permission="zope.ManageServices"
-      interface="zope.app.container.interfaces.IRemoveNotifiable"
-      />
-</content>
-
 <!-- Menu Service -->
 <include file="menu.zcml"/>
 
@@ -181,9 +158,6 @@
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
         />
   </content>
-
-<!-- Presentation components -->
-  <include file="presentation.zcml" />
 
 <!-- Page templates -->
   <include file="zpt.zcml" />


=== Zope3/src/zope/app/services/pagefolder.py 1.21 => 1.22 ===
--- Zope3/src/zope/app/services/pagefolder.py:1.21	Fri Mar  5 17:09:16 2004
+++ Zope3/src/zope/app/services/pagefolder.py	Mon Mar  8 14:40:30 2004
@@ -30,7 +30,7 @@
 from zope.app.interfaces.services.registration import UnregisteredStatus
 from zope.app.interfaces.services.registration import IRegisterable
 from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.services.presentation import PageRegistration
+from zope.app.presentation import PageRegistration
 from zope.app.services.registration import RegistrationManagerContainer
 from zope.app.container.constraints import ContainerTypesConstraint
 from zope.app.services.zpt import IZPTTemplate

=== Removed File Zope3/src/zope/app/services/adapter.py ===

=== Removed File Zope3/src/zope/app/services/presentation.py ===

=== Removed File Zope3/src/zope/app/services/presentation.zcml ===

=== Removed File Zope3/src/zope/app/services/surrogate.py ===