[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - configure.zcml:1.1.2.6 namecomponentconfigurableview.py:1.1.2.4 nameconfigurableview.py:1.1.2.3
Jim Fulton
jim@zope.com
Wed, 25 Dec 2002 08:27:56 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv9989/src/zope/app/browser/services
Modified Files:
Tag: NameGeddon-branch
configure.zcml namecomponentconfigurableview.py
nameconfigurableview.py
Log Message:
Gor zope running again!
I haven't tested everything.
(Yes, we need functional tests. Maybe this week).
Good enough to merge into trunk.
=== Zope3/src/zope/app/browser/services/configure.zcml 1.1.2.5 => 1.1.2.6 ===
--- Zope3/src/zope/app/browser/services/configure.zcml:1.1.2.5 Tue Dec 24 21:22:49 2002
+++ Zope3/src/zope/app/browser/services/configure.zcml Wed Dec 25 08:27:24 2002
@@ -2,36 +2,20 @@
xmlns='http://namespaces.zope.org/zope'
xmlns:browser='http://namespaces.zope.org/browser'
xmlns:form='http://namespaces.zope.org/form'
- package="zope.app.browser.services"
>
- <browser:menu id="add_component"
- title="Menu of objects to be added to service managers"
- />
-
- <browser:menu id="add_user"
- title="Menu for adding new User." />
-
- <browser:menu id="add_configuration"
- title="Menu of addable configuration objects"
- />
-
<!--Error Reporting Service -->
- <browser:defaultView
- name="main.html"
- for="zope.app.interfaces.services.error.IErrorReportingService" />
-
<browser:view
for="zope.app.interfaces.services.error.IErrorReportingService"
permission="zope.Public"
factory="zope.app.browser.services.error.EditErrorLog">
- <browser:page name="main.html" template="Views/Browser/main.pt" />
+ <browser:page name="index.html" template="error.pt" />
<browser:page name="edit.html" attribute="updateProperties" />
- <browser:page name="showEntry.html" template="Views/Browser/showEntry.pt"/>
+ <browser:page name="showEntry.html" template="errorentry.pt"/>
<browser:page name="showTextTBEntry.html"
- template="Views/Browser/showTextTBEntry.pt"/>
+ template="texttbentry.pt"/>
</browser:view>
<browser:menuItem menu="add_component"
@@ -44,19 +28,26 @@
for="zope.app.interfaces.services.error.IErrorReportingService"
file="error_service.gif" />
+ <browser:menuItem
+ for="zope.app.interfaces.services.error.IErrorReportingService"
+ menu="zmi_views"
+ title="Errors"
+ action="index.html"
+ />
+
<!-- CachingService -->
<browser:menuItems
menu="zmi_views"
for="zope.app.services.cache.ILocalCachingService">
- <browser:menuItem title="Caches" action="index.html"/>
+ <browser:menuItem title="Caches" action="index.html"/>
</browser:menuItems>
<browser:view
for="zope.app.services.cache.ILocalCachingService"
name="index.html"
- template="Views/Browser/Caches.pt"
- class="zope.app.browser.services.namecomponentconfigurableview.NameComponentConfigurableView"
+ template="caches.pt"
+ class=".namecomponentconfigurableview.NameComponentConfigurableView"
permission="zope.ManageServices" />
<browser:menuItem
@@ -75,7 +66,7 @@
factory="zope.app.browser.services.cache.AddCacheConfiguration"
permission="zope.ManageServices">
- <browser:page name="add.html" template="Views/Browser/add_cache.pt" />
+ <browser:page name="add.html" template="add_cache.pt" />
<browser:page name="finish.html" attribute="action" />
</browser:view>
@@ -90,10 +81,6 @@
<!-- Event Service -->
- <browser:defaultView
- name="index.html"
- for="zope.interfaces.event.IEventService+" />
-
<browser:view
permission="zope.ManageServices"
for="zope.interfaces.event.IEventService+"
@@ -106,7 +93,7 @@
<browser:menuItems
menu="zmi_views" for="zope.interfaces.event.IEventService+">
<browser:menuItem title="Control" action="@@index.html" />
- </browser:menuItems>
+ </browser:menuItems>
<browser:menuItem menu="add_component"
for="zope.app.interfaces.container.IAdding"
@@ -127,11 +114,6 @@
for="zope.app.services.role.ILocalRoleService"
file="role_service.gif" />
- <browser:defaultView
- for="zope.app.services.role.IRoleService"
- name="index.html"
- />
-
<browser:view
permission="zope.ManageServices"
for="zope.app.services.role.IRoleService"
@@ -148,29 +130,29 @@
factory="zope.app.browser.services.role.Add"
>
- <browser:page name="+" template="Views/Browser/add.pt" />
+ <browser:page name="+" template="addrole.pt" />
<browser:page name="action.html" attribute="action" />
- </browser:view>
+ </browser:view>
<browser:menuItems
menu="zmi_views"
for="zope.app.services.role.IRoleService">
<browser:menuItem title="Contents" action="@@index.html"/>
- </browser:menuItems>
+ </browser:menuItems>
<!-- Authentication Service -->
- <browser:defaultView
- for="zope.app.services.auth.ILocalAuthenticationService"
- name="contents.html" />
+ <!-- XXX This is silly -->
+ <browser:menu id="add_user"
+ title="Menu for adding new User." />
<browser:view
permission="zope.ManageServices"
for="zope.app.services.auth.ILocalAuthenticationService"
factory="zope.app.browser.container.contents.Contents">
- <browser:page name="contents.html" attribute="contents" />
+ <browser:page name="index.html" attribute="contents" />
</browser:view>
@@ -180,7 +162,7 @@
permission="zope.ManageContent"
factory="zope.app.browser.services.auth.AddUser" >
- <browser:page name="index.html" template="Views/Browser/addUser.pt" />
+ <browser:page name="index.html" template="adduser.pt" />
<browser:page name="action.html" attribute="action" />
</browser:view>
@@ -201,7 +183,7 @@
factory="zope.app.browser.services.auth.EditUser">
<browser:page name="editForm.html"
- template="Views/Browser/editUser.pt" />
+ template="edituser.pt" />
<browser:page name="edit.html" attribute="action" />
</browser:view>
@@ -226,7 +208,7 @@
<browser:view
for="zope.app.interfaces.services.configuration.IConfigurationRegistry"
name="ChangeConfigurations"
- template="Browser/ChangeConfigurations.pt"
+ template="changeconfigurations.pt"
class="zope.app.browser.services.changeconfigurations.ChangeConfigurations"
allowed_interface="zope.app.interfaces.browser.form.IFormCollaborationView"
permission="zope.ManageServices"
@@ -250,7 +232,7 @@
schema="zope.app.interfaces.services.configuration.IConfiguration."
label="XXX Configuration"
permission="zope.ManageServices"
- template="Browser/ComponentConfigEdit.pt"
+ template="componentconfigedit.pt"
class="zope.app.browser.services.componentconfigurl.ComponentConfigURL"
/>
@@ -259,7 +241,7 @@
name="ItemEdit"
schema=
"zope.app.interfaces.services.configuration.IConfigurationSummary."
- template="Browser/ComponentConfigItemEdit.pt"
+ template="componentconfigitemedit.pt"
label="XXX not used but can't be omitted"
class="zope.app.browser.services.componentconfigurl.ComponentConfigURL"
permission = "zope.ManageServices"
@@ -268,7 +250,7 @@
<browser:view
for="zope.app.interfaces.services.configuration.INamedComponentConfiguration"
name="ConfigurationSummary"
- template="Browser/ComponentConfigSummary.pt"
+ template="componentconfigsummary.pt"
class="zope.app.browser.services.componentconfigurl.ComponentConfigURL"
permission="zope.ManageServices"
/>
@@ -320,7 +302,7 @@
<browser:view
for = "zope.app.interfaces.services.interfaces.IAdapterConfiguration"
name = "ConfigurationSummary"
- template = "Browser/AdapterConfigSummary.pt"
+ template = "adapterconfigsummary.pt"
permission="zope.ManageServices"
/>
@@ -332,7 +314,7 @@
<browser:view
for = "zope.component.interfaces.IAdapterService."
name = "index.html"
- template = "Browser/adapter_search.pt"
+ template = "adapter_search.pt"
permission="zope.ManageServices"
class="zope.app.browser.services.adapter.AdapterServiceView"
/>
@@ -345,7 +327,7 @@
>
<browser:page
name="index.html"
- template="Browser/add_adapter_config.pt"
+ template="add_adapter_config.pt"
/>
</browser:view>
@@ -384,7 +366,7 @@
<browser:view
for = "zope.app.interfaces.services.interfaces.IViewConfiguration"
name = "ConfigurationSummary"
- template = "Browser/ViewConfigSummary.pt"
+ template = "viewconfigsummary.pt"
permission="zope.ManageServices"
/>
@@ -415,7 +397,7 @@
<browser:view
for = "zope.component.interfaces.IViewService"
name = "index.html"
- template = "Browser/view_search.pt"
+ template = "view_search.pt"
permission="Zope.ManageServices"
class="zope.app.browser.services.view.ViewServiceView"
/>
@@ -449,7 +431,7 @@
<browser:view
for = "zope.app.interfaces.services.interfaces.IPageConfiguration"
name = "ConfigurationSummary"
- template = "Browser/PageConfigSummary.pt"
+ template = "pageconfigsummary.pt"
permission="zope.ManageServices"
/>
@@ -560,7 +542,7 @@
<browser:view
for="zope.app.services.connection.ILocalConnectionService"
name="index.html"
- template="Views/Browser/Connections.pt"
+ template="connections.pt"
class="zope.app.browser.services.namecomponentconfigurableview.NameComponentConfigurableView"
permission="zope.ManageServices" />
@@ -580,7 +562,7 @@
factory="zope.app.browser.services.connection.AddConnectionConfiguration"
permission="zope.ManageServices">
- <browser:page name="add.html" template="Views/Browser/add_config.pt" />
+ <browser:page name="add.html" template="add_config.pt" />
<browser:page name="finish.html" attribute="action" />
</browser:view>
@@ -598,7 +580,7 @@
<browser:view
for="zope.app.interfaces.services.service.IServiceManager"
name="index.html"
- template="Browser/Services.pt"
+ template="services.pt"
class="zope.app.browser.services.namecomponentconfigurableview.NameComponentConfigurableView"
permission="zope.ManageServices"
/>
@@ -659,8 +641,8 @@
<browser:view
name="+"
- permission="zope.ManageServices"
for="zope.app.interfaces.services.package.IPackage"
+ permission="zope.ManageServices"
factory="zope.app.browser.services.service.ComponentAdding">
<browser:page name="index.html" attribute="index" />
@@ -679,7 +661,7 @@
for="zope.app.interfaces.services.configurationmanager.IConfigurationManager"
permission="zope.ManageServices"
factory="zope.app.browser.services.service.EditConfiguration">
- <browser:page name="contents.html" template="Browser/editConfiguration.pt" />
+ <browser:page name="contents.html" template="editconfiguration.pt" />
</browser:view>
<browser:menuItems menu="zmi_views" for="zope.app.interfaces.services.configurationmanager.IConfigurationManager">
@@ -710,8 +692,8 @@
permission="zope.ManageServices"
>
- <browser:page name="step1.html" template="Browser/add_service_1.pt" />
- <browser:page name="step2.html" template="Browser/add_service_2.pt" />
+ <browser:page name="step1.html" template="add_service_1.pt" />
+ <browser:page name="step2.html" template="add_service_2.pt" />
<browser:page name="finish.html" attribute="action" />
</browser:view>
@@ -729,7 +711,7 @@
<browser:view for="zodb.code.interfaces.IPersistentModuleManager"
factory="zope.app.browser.services.module.EditModule"
>
- <browser:page name="edit.html" template="Browser/edit_module.pt" />
+ <browser:page name="edit.html" template="edit_module.pt" />
</browser:view>
<browser:menuItems menu="zmi_views" for="zodb.code.interfaces.IPersistentModuleManager">
@@ -741,7 +723,7 @@
factory="zope.app.browser.services.module.AddModule"
permission="zope.ManageServices"
>
- <browser:page name="index.html" template="Browser/add_module.pt" />
+ <browser:page name="index.html" template="add_module.pt" />
<browser:page name="action.html" attribute="action" />
</browser:view>
=== Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py:1.1.2.3 Tue Dec 24 21:20:16 2002
+++ Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py Wed Dec 25 08:27:24 2002
@@ -24,7 +24,7 @@
class NameComponentConfigurableView(NameConfigurableView):
- indexMacros = index = ViewPageTemplateFile('NameComponentConfigurable.pt')
+ indexMacros = index = ViewPageTemplateFile('namecomponentconfigurable.pt')
def _getItem(self, name, view, cfg):
item_dict = NameConfigurableView._getItem(self, name, view, cfg)
=== Zope3/src/zope/app/browser/services/nameconfigurableview.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/browser/services/nameconfigurableview.py:1.1.2.2 Tue Dec 24 21:20:16 2002
+++ Zope3/src/zope/app/browser/services/nameconfigurableview.py Wed Dec 25 08:27:24 2002
@@ -22,7 +22,7 @@
class NameConfigurableView(BrowserView):
- indexMacros = index = ViewPageTemplateFile('NameConfigurable.pt')
+ indexMacros = index = ViewPageTemplateFile('nameconfigurable.pt')
def update(self):