[Zope3-checkins] CVS: Zope3/src/zope/app/startup - bootstrap.py:1.1.2.2 configure.zcml:1.1.2.2 requestfactory.py:1.1.2.2 servertype.py:1.1.2.2 simpleregistry.py:1.1.2.2 sitedefinition.py:1.1.2.2
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:51 -0500
Update of /cvs-repository/Zope3/src/zope/app/startup
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/startup
Modified Files:
Tag: NameGeddon-branch
bootstrap.py configure.zcml requestfactory.py servertype.py
simpleregistry.py sitedefinition.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/startup/bootstrap.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/startup/bootstrap.py:1.1.2.1 Mon Dec 23 14:32:30 2002
+++ Zope3/src/zope/app/startup/bootstrap.py Tue Dec 24 07:51:20 2002
@@ -21,7 +21,7 @@
"""
from transaction import get_transaction
-from Zope.App.Traversing import traverse, traverseName
+from zope.app.traversing import traverse, traverseName
from zope.app.publication.zopepublication import ZopePublication
from zope.app.content.folder import RootFolder
from zope.app.services.service import ServiceManager
=== Zope3/src/zope/app/startup/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/startup/configure.zcml:1.1.2.1 Mon Dec 23 14:32:30 2002
+++ Zope3/src/zope/app/startup/configure.zcml Tue Dec 24 07:51:20 2002
@@ -5,48 +5,49 @@
<startup:registerRequestFactory name="BrowserRequestFactory"
publication =
- "Zope.App.ZopePublication.Browser.Publication.BrowserPublication"
- request = "Zope.Publisher.Browser.BrowserRequest."
+ "zope.app.publication.browser.BrowserPublication"
+ request = "zope.publisher.browser.BrowserRequest"
/>
<startup:registerRequestFactory name="XMLRPCRequestFactory"
publication =
- "Zope.App.ZopePublication.XMLRPC.Publication.XMLRPCPublication"
- request = "Zope.Publisher.XMLRPC.XMLRPCRequest."
+ "zope.app.publication.xmlrpc.XMLRPCPublication"
+ request = "zope.publisher.xmlrpc.XMLRPCRequest"
/>
<startup:registerRequestFactory name="VFSRequestFactory"
publication =
- "Zope.App.ZopePublication.VFS.Publication.VFSPublication"
- request = "Zope.Publisher.VFS.VFSRequest."
+ "zope.app.publication.vfs.VFSPublication"
+ request = "zope.publisher.vfs.VFSRequest"
/>
<startup:registerServerType
name = "Browser"
- factory = "Zope.Server.HTTP.PublisherHTTPServer."
+ factory = "zope.server.http.publisherhttpserver.PublisherHTTPServer"
requestFactory="BrowserRequestFactory"
- logFactory = "Zope.Server.HTTP.CommonHitLogger."
+ logfactory = "zope.server.http.commonhitlogger.CommonHitLogger"
defaultPort="8080"
defaultVerbose="true" />
<startup:registerServerType
name = "XML-RPC"
- factory = "Zope.Server.HTTP.PublisherHTTPServer."
+ factory = "zope.server.http.publisherhttpserver.PublisherHTTPServer"
requestFactory="XMLRPCRequestFactory"
- logFactory = "Zope.Server.HTTP.CommonHitLogger."
+ logFactory = "zope.server.http.commonhitlogger.CommonHitLogger"
defaultPort="8081"
defaultVerbose="true" />
<startup:registerServerType
name = "FTP"
- factory = "Zope.Server.FTP.PublisherFTPServer."
+ factory = "zope.server.ftp.publisherftpserver.PublisherFTPServer"
requestFactory="VFSRequestFactory"
- logFactory = "Zope.Server.FTP.CommonFTPActivityLogger."
+ logFactory =
+ "zope.server.ftp.commonftpactivitylogger.CommonFTPActivityLogger"
defaultPort="8021"
defaultVerbose="true" />
=== Zope3/src/zope/app/startup/requestfactory.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/startup/requestfactory.py:1.1.2.1 Mon Dec 23 14:32:30 2002
+++ Zope3/src/zope/app/startup/requestfactory.py Tue Dec 24 07:51:20 2002
@@ -51,22 +51,15 @@
self._request = request
- ############################################################
- # Implementation methods for interface
- # Zope.App.StartUp.RequestFactory.IRequestFactory
-
def realize(self, db):
- 'See Zope.App.StartUp.RequestFactory.IRequestFactory'
+ 'See IRequestFactory'
realized = copy.copy(self)
realized._publication = realized._pubFactory(db)
return realized
def __call__(self, input_stream, output_steam, env):
- 'See Zope.App.StartUp.RequestFactory.IRequestFactory'
+ 'See IRequestFactory'
request = self._request(input_stream, output_steam, env)
request.setPublication(self._publication)
return request
-
- #
- ############################################################
=== Zope3/src/zope/app/startup/servertype.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/startup/servertype.py:1.1.2.1 Mon Dec 23 14:32:30 2002
+++ Zope3/src/zope/app/startup/servertype.py Tue Dec 24 07:51:20 2002
@@ -44,12 +44,8 @@
self._defaultVerbose = defaultVerbose
- ############################################################
- # Implementation methods for interface
- # Zope.App.StartUp.ServerType.IServerType
-
def create(self, task_dispatcher, db, port=None, verbose=None):
- 'See Zope.App.StartUp.ServerType.IServerType'
+ 'See IServerType'
request_factory = getRequestFactory(self._requestFactory)
request_factory = request_factory.realize(db)
@@ -65,8 +61,5 @@
{'task_dispatcher': task_dispatcher,
'verbose': verbose,
'hit_log': self._logFactory()})
-
- #
- ############################################################
=== Zope3/src/zope/app/startup/simpleregistry.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/startup/simpleregistry.py:1.1.2.1 Mon Dec 23 14:32:30 2002
+++ Zope3/src/zope/app/startup/simpleregistry.py Tue Dec 24 07:51:20 2002
@@ -66,7 +66,7 @@
def register(self, name, object):
- '''See interface Zope.App.Formulator.ISimpleRegistry.ISimpleRegistry'''
+ '''See ISimpleRegistry'''
if name in self.objects.keys():
raise ZopeDuplicateRegistryEntryError(name)
@@ -89,7 +89,7 @@
def get(self, name):
- '''See interface Zope.App.Formulator.ISimpleRegistry.ISimpleRegistry'''
+ '''See ISimpleRegistry'''
if name in self.objects.keys():
return self.objects[name]
else:
=== Zope3/src/zope/app/startup/sitedefinition.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/startup/sitedefinition.py:1.1.2.1 Mon Dec 23 14:32:30 2002
+++ Zope3/src/zope/app/startup/sitedefinition.py Tue Dec 24 07:51:20 2002
@@ -188,7 +188,7 @@
def _initDB(self):
"""Initialize the ZODB and persistence module importer."""
- from Zope.App.StartUp import bootstrap
+ from zope.app.startup import bootstrap
bootstrap.bootstrapInstance(self._zodb)
imp = PersistentModuleImporter()