[Zope3-checkins] CVS: Zope3/src/zope/app/browser/services - componentconfigurl.py:1.1.2.2 configure.zcml:1.1.2.2 namecomponentconfigurableview.py:1.1.2.2 package.py:1.1.2.2
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:53 -0500
Update of /cvs-repository/Zope3/src/zope/app/browser/services
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/browser/services
Modified Files:
Tag: NameGeddon-branch
componentconfigurl.py configure.zcml
namecomponentconfigurableview.py package.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/app/browser/services/componentconfigurl.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/componentconfigurl.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/componentconfigurl.py Tue Dec 24 07:50:53 2002
@@ -16,7 +16,7 @@
"""
from zope.component import getView
-from Zope.App.Traversing import traverse, locationAsUnicode
+from zope.app.traversing import traverse, locationAsUnicode
from zope.proxy.introspection import removeAllProxies
__metaclass__ = type
=== Zope3/src/zope/app/browser/services/configure.zcml 1.1.2.1 => 1.1.2.2 === (512/612 lines abridged)
--- Zope3/src/zope/app/browser/services/configure.zcml:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/configure.zcml Tue Dec 24 07:50:53 2002
@@ -1,15 +1,16 @@
<zopeConfigure
xmlns='http://namespaces.zope.org/zope'
xmlns:browser='http://namespaces.zope.org/browser'
- package="Zope.App.OFS.Services.ErrorReportingService"
->
+ package="zope.app.services"
+ >
+
<browser:defaultView
name="main.html"
for="zope.app.interfaces.services.error.IErrorReportingService" />
<browser:view
for="zope.app.interfaces.services.error.IErrorReportingService"
- permission="Zope.Public"
+ permission="zope.Public"
factory="zope.app.browser.services.error.EditErrorLog">
<browser:page name="main.html" template="Views/Browser/main.pt" />
@@ -18,13 +19,6 @@
<browser:page name="showTextTBEntry.html" template="Views/Browser/showTextTBEntry.pt"/>
</browser:view>
-</zopeConfigure>
-
-<zopeConfigure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- package="Zope.App.OFS.Services.CachingService">
-
<!-- CachingService -->
<browser:defaultView
@@ -41,8 +35,9 @@
for="zope.app.services.cache.ILocalCachingService"
name="index.html"
template="Views/Browser/Caches.pt"
- class="zope.app.browser.services.namecomponentconfigurableview.NameComponentConfigurableView"
- permission="Zope.ManageServices" />
+ class="
+zope.app.browser.services.namecomponentconfigurableview.NameComponentConfigurableView"
+ permission="zope.ManageServices" />
<browser:menuItem
menu="add_component"
@@ -58,7 +53,7 @@
for="zope.app.interfaces.container.IAdding"
[-=- -=- -=- 512 lines omitted -=- -=- -=-]
- action="Zope.App.OFS.Services.ServiceManager.ConfigurationManager"
+ action="zope.app.services.service.ConfigurationManager"
title="Configuration"
/>
@@ -768,7 +700,7 @@
for="zope.app.interfaces.container.IAdding"
name="ServiceConfiguration"
factory="zope.app.browser.services.service.AddServiceConfiguration"
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
>
<page name="step1.html" template="Browser/add_service_1.pt" />
@@ -800,7 +732,7 @@
<view for="zope.app.interfaces.container.IAdding"
name="Module"
factory="zope.app.browser.services.module.AddModule"
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
>
<page name="index.html" template="Browser/add_module.pt" />
<page name="action.html" attribute="action" />
@@ -816,7 +748,7 @@
<view
for="zope.app.interfaces.services.servicemanager.interfaces.IViewPackage"
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
factory="zope.app.browser.services.package.ViewPackageContents">
<page name="contents.html"
@@ -833,7 +765,7 @@
<form:edit
schema=".interfaces.IViewPackageInfo."
name="DefaultConfiguration.html"
- permission="Zope.ManageServices"
+ permission="zope.ManageServices"
label="Default configuration parameters"
/>
@@ -845,7 +777,7 @@
</menuItems>
<menuItem menu="add_component" for="zope.app.interfaces.container.IAdding"
- action="Zope.App.OFS.Services.ServiceManager.viewpackage.ViewPackage"
+ action="zope.app.services.viewpackage.ViewPackage"
title="View Sub-Package" />
=== Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/namecomponentconfigurableview.py Tue Dec 24 07:50:53 2002
@@ -16,7 +16,7 @@
$Id$
"""
-from Zope.App.Traversing import traverse
+from zope.app.traversing import traverse
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.browser.services.nameconfigurableview \
import NameConfigurableView
=== Zope3/src/zope/app/browser/services/package.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/browser/services/package.py:1.1.2.1 Mon Dec 23 14:31:12 2002
+++ Zope3/src/zope/app/browser/services/package.py Tue Dec 24 07:50:53 2002
@@ -23,7 +23,7 @@
from zope.publisher.browser import BrowserView
-from Zope.App.PageTemplate import ViewPageTemplateFile
+from zope.app.pagetemplate import ViewPageTemplateFile
from zope.app.interfaces.container import IContainer
from zope.component import queryView, getView
@@ -51,7 +51,7 @@
from zope.publisher.browser import BrowserView
-from Zope.App.PageTemplate import ViewPageTemplateFile
+from zope.app.pagetemplate import ViewPageTemplateFile
from zope.app.interfaces.container import IContainer
from zope.component import queryView, getView