[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - configure.zcml:1.88 zpt.zcml:1.6

[Jim Fulton]

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

Modified Files:
	configure.zcml zpt.zcml 
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/browser/services/configure.zcml 1.87 => 1.88 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.87	Fri Mar  5 23:17:20 2004
+++ Zope3/src/zope/app/browser/services/configure.zcml	Mon Mar  8 14:40:27 2004
@@ -83,13 +83,6 @@
       permission="zope.ManageServices"
       />
 
-
-<!-- Adapters -->
-  <zope:include package=".adapter" />
-
-<!-- Views -->  
-  <zope:include package=".presentation" />
-
 <!-- Menu -->  
   <zope:include file="menu.zcml" />
 


=== Zope3/src/zope/app/browser/services/zpt.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/browser/services/zpt.zcml:1.5	Thu Feb  5 23:13:30 2004
+++ Zope3/src/zope/app/browser/services/zpt.zcml	Mon Mar  8 14:40:27 2004
@@ -25,11 +25,10 @@
 
  <addform
       for="zope.app.services.zpt.IZPTTemplate"
-      schema="zope.app.services.presentation.IPageRegistration"
+      schema="zope.app.presentation.IPageRegistration"
       name="addRegistration.html"
-      class="
-           zope.app.browser.services.registration.AddComponentRegistration"
-      content_factory="zope.app.services.presentation.PageRegistration"
+      class="zope.app.browser.services.registration.AddComponentRegistration"
+      content_factory="zope.app.presentation.PageRegistration"
       keyword_arguments="required factoryName name permission 
                          layer  attribute"
       set_before_add="template"