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

Jim Fulton jim@zope.com
Fri, 21 Mar 2003 15:59:56 -0500


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

Modified Files:
	configure.zcml 
Log Message:
Added a component path display widget for the old component path field
that just displays the component path for a configuration.

Registered the new component path widget for the new component path field.

Moved many general configuration views to the configuration sub-package.


=== Zope3/src/zope/app/browser/services/configure.zcml 1.32 => 1.33 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.32	Tue Mar 18 16:02:20 2003
+++ Zope3/src/zope/app/browser/services/configure.zcml	Fri Mar 21 15:59:55 2003
@@ -1,6 +1,4 @@
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/browser'
-   >
+<zopeConfigure xmlns='http://namespaces.zope.org/browser'>
 
 <!-- For services, just treat @@manage as @@index.html by default -->
 
@@ -13,6 +11,8 @@
      allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"
      />
 
+<!-- General configuration views --> <include package=".configuration" />
+
 <!--Error Logging Service -->
 
   <pages
@@ -58,7 +58,7 @@
       for="zope.app.services.cache.ILocalCachingService"
       name="index.html"
       template="caches.pt"
-      class=".namecomponentconfigurableview.NameComponentConfigurableView"
+      class=".configuration.NameComponentConfigurableView"
       permission="zope.ManageServices" 
       />
 
@@ -207,77 +207,10 @@
     <menuItem title="Edit" action="editForm.html"/>
     </menuItems>
 
-<!-- IConfigurationStatus -->
-
-  <page
-      for="zope.app.interfaces.services.configuration.IConfigurationStatus"
-      name="edit"
-      class=
-"zope.app.browser.services.configurationstatuswidget.ConfigurationStatusWidget"
-      allowed_interface="zope.app.interfaces.browser.form.IBrowserWidget"
-      permission="zope.ManageServices"
-      />
-
-<!-- IConfigurationRegistry -->
-
-  <page
-      for="zope.app.interfaces.services.configuration.IConfigurationRegistry"
-      name="ChangeConfigurations"
-      template="changeconfigurations.pt"
-      class=
-      "zope.app.browser.services.changeconfigurations.ChangeConfigurations"
-      allowed_interface=
-      "zope.app.interfaces.browser.form.IFormCollaborationView"
-      permission="zope.ManageServices"
-      />
-
-<!-- IConfiguration subclasses -->
-
-  <editform
-      for=
-      "zope.app.interfaces.services.configuration.INamedComponentConfiguration"
-      name="index.html"
-      menu="zmi_views"
-      schema="zope.app.interfaces.services.configuration.IConfiguration."
-      label="XXX Configuration"
-      permission="zope.ManageServices"
-      template="componentconfigedit.pt"
-      class="zope.app.browser.services.componentconfigurl.ComponentConfigURL"
-      />
-
-  <page
-      for=
-      "zope.app.interfaces.services.configuration.INamedComponentConfiguration"
-      name="ConfigurationSummary"
-      template="componentconfigsummary.pt"
-      class="zope.app.browser.services.componentconfigurl.ComponentConfigURL"
-      permission="zope.ManageServices"
-      />
-
-  <page
-      for="zope.app.interfaces.services.service.ILocalService"
-      name="useConfiguration.html"
-      template="useconfiguration.pt"
-      class=".useconfiguration.UseConfiguration"
-      permission="zope.ManageServices"
-      menu="zmi_views" title="Configurations"
-      />
-
-
-<!-- INameComponentConfigurable default view -->
-
-  <page
-      name="index.html" 
-      for=
-      "zope.app.interfaces.services.configuration.INameComponentConfigurable"
-      class=
-      ".namecomponentconfigurableview.NameComponentConfigurableView"
-      permission="zope.ManageServices"
-      attribute="index" 
-      />
-
 <!-- Component Location widget -->
 
+<!-- XXX we are phasing these widgets out -->
+
 <page
     for="zope.app.services.field.IComponentPath"
     name="edit"
@@ -286,6 +219,14 @@
     permission="zope.ManageServices"
     />
 
+<page
+    for="zope.app.services.field.IComponentPath"
+    name="display"
+    class="zope.app.browser.services.field.ComponentPathDisplayWidget"
+    allowed_interface="zope.app.interfaces.browser.form.IBrowserWidget"
+    permission="zope.ManageServices"
+    />
+
 <!-- Adapters -->
 
 <editform
@@ -297,13 +238,6 @@
     />
 
 <page
-     for = "zope.app.interfaces.services.adapter.IAdapterConfiguration"
-     name = "ConfigurationSummary"
-     template = "adapterconfigsummary.pt"
-     permission="zope.ManageServices" 
-     />  
-
-<page
      for = "zope.component.interfaces.IAdapterService."
      name = "index.html"
      template = "adapter_search.pt"
@@ -351,13 +285,6 @@
     permission="zope.ManageServices"
     />
 
-<page
-     for = "zope.app.interfaces.services.view.IViewConfiguration"
-     name = "ConfigurationSummary"
-     template = "viewconfigsummary.pt"
-     permission="zope.ManageServices" 
-     />  
-
 <addform
       schema = "zope.app.interfaces.services.view.IViewConfiguration"
       name= "ViewConfiguration"
@@ -405,13 +332,6 @@
     permission="zope.ManageServices"
     />
 
-<page
-     for="zope.app.interfaces.services.view.IPageConfiguration"
-     name="ConfigurationSummary"
-     template="pageconfigsummary.pt"
-     permission="zope.ManageServices"
-     />
-
 <addform
       schema = "zope.app.interfaces.services.view.IPageConfiguration"
       name= "PageConfiguration"
@@ -493,7 +413,7 @@
       for="zope.app.services.connection.ILocalConnectionService"
       name="index.html"
       template="connections.pt"
-      class=".namecomponentconfigurableview.NameComponentConfigurableView"
+      class=".configuration.NameComponentConfigurableView"
       permission="zope.ManageServices" 
       />
 
@@ -603,6 +523,9 @@
   </pages>
 
 
+  
+
+
 <!-- Package -->
 
   <pages
@@ -638,36 +561,16 @@
 
   </view>
 
-<!-- ConfigurationManager -->
+<!-- ServiceConfiguration -->
 
   <page
-     name="index.html" 
-     for=
-     "zope.app.interfaces.services.configurationmanager.IConfigurationManager"
-     menu="zmi_views" title="Configuration"
-     permission="zope.ManageServices"
-     class=".service.EditConfiguration"
-     template="editconfiguration.pt" 
-     />
-
-  <view
-     for=
-     "zope.app.interfaces.services.configurationmanager.IConfigurationManager"
-     name="+"
-     permission="zope.ManageServices"
-     class="zope.app.browser.services.service.ConfigurationAdding">
-    <page name="index.html"  attribute="index"  />
-    <page name="action.html" attribute="action" />
-  </view>
-
-  <menuItem
-        menu="add_component"
-        for="zope.app.interfaces.container.IAdding"
-        action="zope.app.services.ConfigurationManager"
-        title="Configuration"
-        />
-
-<!-- ServiceConfiguration -->
+      for="zope.app.interfaces.services.service.ILocalService"
+      name="useConfiguration.html"
+      template="configuration/useconfiguration.pt"
+      class=".configuration.NameUseConfiguration"
+      permission="zope.ManageServices"
+      menu="zmi_views" title="Configurations"
+      />
 
   <page
       name="addConfiguration.html"
@@ -814,18 +717,10 @@
       for="zope.app.interfaces.services.hub.IObjectHub" 
       file="hub.gif" />
 
+<!-- Utility Service --> <include package=".utility" />
 
 <!-- "Add Service" menu -->
 
-<menuItem
-    menu="zmi_actions"
-    for="zope.app.interfaces.services.package.IPackage"
-    action="AddService"
-    title="Add Service"
-    permission="zope.ManageServices"
-    />
-
-<!-- XXX do we still need this one? -->
 <menuItem
     menu="add_component"
     for="zope.app.interfaces.container.IAdding"