[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - configure.zcml:1.73.8.2 pagefolder.py:1.3.14.1 pagefolder.zcml:1.5.10.1 adapter.py:NONE adapter_search.pt:NONE add_adapter_config.pt:NONE configureView.pt:NONE view.py:NONE view.zcml:NONE views.pt:NONE

[Jim Fulton]

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

Modified Files:
      Tag: adaptergeddon-branch
	configure.zcml pagefolder.py pagefolder.zcml 
Removed Files:
      Tag: adaptergeddon-branch
	adapter.py adapter_search.pt add_adapter_config.pt 
	configureView.pt view.py view.zcml views.pt 
Log Message:
Implemented local presentation services.


=== Zope3/src/zope/app/browser/services/configure.zcml 1.73.8.1 => 1.73.8.2 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.73.8.1	Sun Nov  9 11:08:08 2003
+++ Zope3/src/zope/app/browser/services/configure.zcml	Tue Nov 18 17:26:22 2003
@@ -126,68 +126,17 @@
     permission="zope.ManageServices" />
 
 <!-- Adapters -->
-
-  <editform
-    schema="zope.app.interfaces.services.adapter.IAdapterRegistration"
-    name="index.html"
-    menu="zmi_views"
-    label="Change adapter"
-    permission="zope.ManageServices"
-    />
-
-  <page
-     for="zope.component.interfaces.IAdapterService"
-     name="index.html"
-     template="adapter_search.pt"
-     permission="zope.ManageServices"
-     class="zope.app.browser.services.adapter.AdapterServiceView" />
-
-  <view
-     for="zope.app.interfaces.container.IAdding"
-     name="AdapterRegistration"
-     permission="zope.ManageServices" 
-     class="zope.app.browser.services.adapter.AdapterRegistrationAdd"
-     menu="add_registration" title="Adapter">
-
-    <page name="index.html" template="add_adapter_config.pt" />
-
-  </view>
-
-  <menuItem
-      for="zope.app.interfaces.container.IAdding"
-      menu="add_service"
-      action="zope.app.services.AdapterService"
-      title="Adapter Service" />
+  <zope:include package=".adapter" />
 
 <!-- Views -->  
-  <zope:include file="view.zcml" />
+  <zope:include package=".presentation" />
 
 <!-- Menu -->  
   <zope:include file="menu.zcml" />
 
 
-<!-- ZPT Templates
-
-  <view
-    for="zope.app.interfaces.services.view.IZPTTemplate"
-    name="index.html"
-    class=".zpt.Source"
-    permission="zope.ManageServices" />
-
-  <editform
-    schema="zope.app.interfaces.services.view.IZPTTemplate"
-    name="edit.html"
-    menu="zmi_views"
-    label="ZPT Template"
-    permission="zope.ManageServices" />
-
-  <menuItem
-    for="zope.app.interfaces.container.IAdding"
-    menu="add_component"
-    action="zope.app.services.zpt.template"
-    title="ZPT Template" />
-
- -->
+<!-- ZPT Templates -->
+  <include file="zpt.zcml" />
 
 <!-- ConnectionService --> 
   <zope:include file="connection.zcml" />


=== Zope3/src/zope/app/browser/services/pagefolder.py 1.3 => 1.3.14.1 ===
--- Zope3/src/zope/app/browser/services/pagefolder.py:1.3	Thu Aug  7 13:41:03 2003
+++ Zope3/src/zope/app/browser/services/pagefolder.py	Tue Nov 18 17:26:22 2003
@@ -15,7 +15,7 @@
 
 $Id$
 """
-from zope.app.interfaces.services.pagefolder import IPageFolder
+from zope.app.services.pagefolder import IPageFolder
 
 class PageFolderDefaultConfiguration:
 


=== Zope3/src/zope/app/browser/services/pagefolder.zcml 1.5 => 1.5.10.1 ===
--- Zope3/src/zope/app/browser/services/pagefolder.zcml:1.5	Mon Aug 25 15:28:37 2003
+++ Zope3/src/zope/app/browser/services/pagefolder.zcml	Tue Nov 18 17:26:22 2003
@@ -6,13 +6,13 @@
 
   <page 
       name="index.html" 
-      for="zope.app.interfaces.services.pagefolder.IPageFolder"
+      for="zope.app.services.pagefolder.IPageFolder"
       permission="zope.ManageServices" 
       class="zope.app.browser.container.contents.JustContents"
       attribute="index" />
 
   <page name="contents.html"
-        for="zope.app.interfaces.services.pagefolder.IPageFolder"
+        for="zope.app.services.pagefolder.IPageFolder"
         permission="zope.ManageServices" 
         class="zope.app.browser.container.contents.Contents"
         menu="zmi_views" title="Contents"
@@ -21,18 +21,19 @@
   <editform
         name="DefaultRegistration.html"
         label="Default registration parameters"
-        schema="zope.app.interfaces.services.pagefolder.IPageFolderInfo"
+        schema="zope.app.services.pagefolder.IPageFolderInfo"
         menu="zmi_views" title="Default Registration"
         permission="zope.ManageServices"
-        class=".pagefolder.PageFolderDefaultConfiguration" />
+        class=".pagefolder.PageFolderDefaultConfiguration" 
+        />
 
   
   <!-- Override the add action with a link to add a template -->
   <menuItem
      menu="zmi_actions"
-     for="zope.app.interfaces.services.pagefolder.IPageFolder"
+     for="zope.app.services.pagefolder.IPageFolder"
      title="Add"
-     action="contents.html?type_name=zope.app.services.zpt.template"
+     action="contents.html?type_name=zope.app.services.zpt.ZPTTemplate"
      permission="zope.ManageServices" />
 
   <menuItem

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

=== Removed File Zope3/src/zope/app/browser/services/adapter_search.pt ===

=== Removed File Zope3/src/zope/app/browser/services/add_adapter_config.pt ===

=== Removed File Zope3/src/zope/app/browser/services/configureView.pt ===

=== Removed File Zope3/src/zope/app/browser/services/view.py ===

=== Removed File Zope3/src/zope/app/browser/services/view.zcml ===

=== Removed File Zope3/src/zope/app/browser/services/views.pt ===