[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser - Services.pt:1.3.2.1 configure.zcml:1.2.10.1 ServiceConfigEdit.pt:NONE ServiceConfigEditPart.pt:NONE ServiceConfigSummary.pt:NONE ServiceConfigURL.py:NONE Services.py:NONE
Marius Gedminas
mgedmin@codeworks.lt
Tue, 10 Dec 2002 14:16:34 -0500
Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
In directory cvs.zope.org:/tmp/cvs-serv28246/lib/python/Zope/App/OFS/Services/ServiceManager/Browser
Modified Files:
Tag: named-component-configuration-branch
Services.pt configure.zcml
Removed Files:
Tag: named-component-configuration-branch
ServiceConfigEdit.pt ServiceConfigEditPart.pt
ServiceConfigSummary.pt ServiceConfigURL.py Services.py
Log Message:
Refactoring of configuration views:
- new interfaces INamedComponentConfiguration, INameConfigurable,
implemented in NamedComponentConfiguration, NameConfigurable, simplify
the case where configurations are identified by a name (service types,
connections, caches, queries, etc)
- common views for INamedComponentConfiguration, INameConfigurable
- refactored ServiceManager and ConnectionService to take advantage of the
new infrastructure
- incidentally wrote several unit tests for configuration classes
- removed caching from ComponentConnection.getComponent; this exposed a bug
in LocalEventService tests
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt 1.3 => 1.3.2.1 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt:1.3 Mon Dec 9 10:09:27 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.pt Tue Dec 10 14:16:02 2002
@@ -27,10 +27,10 @@
<td valign="top" align="right">
<a href="Roles"
tal:content="service/name"
- tal:attributes="href service/name"
+ tal:attributes="href service/url"
tal:condition="service/active"
>Roles</a>
- <span tal:replace="service/name"
+ <span tal:replace="service/name"
tal:condition="service/inactive" />
</td>
<td tal:content="structure service/view">
=== Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml 1.2 => 1.2.10.1 ===
--- Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml:1.2 Sat Nov 30 13:39:17 2002
+++ Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/configure.zcml Tue Dec 10 14:16:02 2002
@@ -7,17 +7,17 @@
<!-- ServiceManager -->
- <defaultView
+ <defaultView
for=".IServiceManager."
name="index.html"
/>
-
- <view
+
+ <view
for=".IServiceManager."
name="index.html"
template="Browser/Services.pt"
- class=".Browser.Services."
- permission="Zope.ManageServices"
+ class="Zope.App.OFS.Services.Browser.NameConfigurableView."
+ permission="Zope.ManageServices"
/>
<menuItems menu="zmi_views" for=".IServiceManager.">
@@ -27,7 +27,7 @@
action="Packages/@@SelectedManagementView.html"/>
<menuItem title="Default Package"
action="Packages/default/@@SelectedManagementView.html"/>
- </menuItems>
+ </menuItems>
<!-- Packages -->
@@ -35,7 +35,7 @@
<view
for=".IPackages."
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
factory=".Browser.PackagesContents.">
<page name="contents.html"
@@ -59,7 +59,7 @@
<!-- Package -->
- <view
+ <view
for=".IPackage."
permission="Zope.ManageServices"
factory="Zope.App.OFS.Container.Views.Browser.Contents."
@@ -74,103 +74,65 @@
action="@@contents.html"/>
</menuItems>
- <menu id="add_component"
+ <menu id="add_component"
title="Menu of objects to be added to service managers"
/>
- <view
+ <view
name="+"
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
for=".IPackage."
factory=".Browser.Adding.ComponentAdding">
<page name="index.html" attribute="index" />
<page name="action.html" attribute="action" />
- </view>
+ </view>
<!-- ConfigurationManager -->
- <defaultView
+ <defaultView
for=".IConfigurationManager."
name="contents.html"
/>
- <view
+ <view
for=".IConfigurationManager."
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
factory=".Browser.EditConfiguration.">
<page name="contents.html" template="Browser/editConfiguration.pt" />
- </view>
+ </view>
<menuItems menu="zmi_views" for=".IConfigurationManager.">
<menuItem title="Configuration" action="contents.html" />
</menuItems>
- <view
+ <view
for=".IConfigurationManager."
name="+"
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
factory=".Browser.Adding.ConfigurationAdding">
<page name="index.html" attribute="index" />
<page name="action.html" attribute="action" />
- </view>
+ </view>
<menuItem menu="add_component"
- for="Zope.App.OFS.Container.IAdding."
- action="Zope.App.OFS.Services.ServiceManager.ConfigurationManager"
+ for="Zope.App.OFS.Container.IAdding."
+ action="Zope.App.OFS.Services.ServiceManager.ConfigurationManager"
title="Configuration"
/>
- <menu id="add_configuration"
+ <menu id="add_configuration"
title="Menu of addable configuration objects"
/>
<!-- ServiceConfiguration -->
- <defaultView
- for=".IServiceConfiguration."
- name="index.html"
- />
-
- <menuItems menu="zmi_views" for=".IServiceConfiguration.">
- <menuItem title="Edit"
- action="index.html"/>
- </menuItems>
-
- <form:edit
- for = ".IServiceConfiguration."
- name = "index.html"
- schema = "Zope.App.OFS.Services.ConfigurationInterfaces.IConfiguration."
- label = "Service Configuration"
- permission = "Zope.ManageServices"
- template = "Browser/ServiceConfigEdit.pt"
- />
-
- <form:edit
- for = ".IServiceConfiguration."
- name = "ItemEdit"
- schema =
- "Zope.App.OFS.Services.ConfigurationInterfaces.IConfigurationSummary."
- label = "Service Configuration"
- template = "Browser/ServiceConfigEditPart.pt"
- class = ".Browser.ServiceConfigURL."
- permission = "Zope.ManageServices"
- />
-
<view
- for = ".IServiceConfiguration."
- name = "ConfigurationSummary"
- template = "Browser/ServiceConfigSummary.pt"
- class = ".Browser.ServiceConfigURL."
- permission="Zope.ManageServices"
- />
-
- <view
for="Zope.App.OFS.Container.IAdding."
name="ServiceConfiguration"
factory=".Browser.AddServiceConfiguration."
- permission="Zope.ManageServices"
+ permission="Zope.ManageServices"
>
<page name="step1.html" template="Browser/add_service_1.pt" />
@@ -189,7 +151,7 @@
<!-- Persistent Modules -->
<view for="Persistence.IPersistentModuleManager."
- factory=".Browser.EditModule."
+ factory=".Browser.EditModule."
>
<page name="edit.html" template="Views/Browser/edit_module.pt" />
</view>
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigEdit.pt ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigEditPart.pt ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigSummary.pt ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/ServiceConfigURL.py ===
=== Removed File Zope3/lib/python/Zope/App/OFS/Services/ServiceManager/Browser/Services.py ===