[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol - applicationcontrol.py:1.1.2.2 configure.zcml:1.1.2.2 runtimeinfo.py:1.1.2.2 servercontrol.py:1.1.2.2 zopeversion.py:1.1.2.2

Jim Fulton jim@zope.com
Tue, 24 Dec 2002 07:51:46 -0500


Update of /cvs-repository/Zope3/src/zope/app/applicationcontrol
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/applicationcontrol

Modified Files:
      Tag: NameGeddon-branch
	applicationcontrol.py configure.zcml runtimeinfo.py 
	servercontrol.py zopeversion.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/applicationcontrol/applicationcontrol.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/applicationcontrol.py:1.1.2.1	Mon Dec 23 14:30:56 2002
+++ Zope3/src/zope/app/applicationcontrol/applicationcontrol.py	Tue Dec 24 07:50:45 2002
@@ -29,12 +29,8 @@
     def __init__(self):
         self.start_time = time.time()
 
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.ApplicationControl.IApplicationControl.
 
     def getStartTime(self):
-        'See Zope.App.OFS.ApplicationControl.IApplicationControl.IApplicationControl'
         return self.start_time
 
     #


=== Zope3/src/zope/app/applicationcontrol/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/configure.zcml:1.1.2.1	Mon Dec 23 14:30:56 2002
+++ Zope3/src/zope/app/applicationcontrol/configure.zcml	Tue Dec 24 07:50:45 2002
@@ -2,12 +2,12 @@
 
   <content class="zope.app.applicationcontrol.applicationcontrol.ApplicationControl">
     <require
-        permission="Zope.ManageApplication"
+        permission="zope.ManageApplication"
         interface="zope.app.interfaces.applicationcontrol.applicationcontrol.IApplicationControl" />
   </content>
 
   <adapter factory="zope.app.applicationcontrol.runtimeinfo.RuntimeInfo"
-           permission="Zope.ManageApplication"
+           permission="zope.ManageApplication"
            provides="zope.app.interfaces.applicationcontrol.runtimeinfo.IRuntimeInfo"
            for="zope.app.interfaces.applicationcontrol.applicationcontrol.IApplicationControl" />
 
@@ -25,7 +25,7 @@
 >
 
   <utility factory="zope.app.applicationcontrol.servercontrol.ServerControl"
-           permission="Zope.ManageApplication"
+           permission="zope.ManageApplication"
            provides="zope.app.interfaces.applicationcontrol.servercontrol.IServerControl" />
 
   <!-- Hint: Here you see how to register something on Zope shutdown -->


=== Zope3/src/zope/app/applicationcontrol/runtimeinfo.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/runtimeinfo.py:1.1.2.1	Mon Dec 23 14:30:56 2002
+++ Zope3/src/zope/app/applicationcontrol/runtimeinfo.py	Tue Dec 24 07:50:45 2002
@@ -28,13 +28,8 @@
     
     def __init__(self, context):
         self.context = context
-    
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.ApplicationControl.IRuntimeInfo.
 
     def getZopeVersion(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         try:
             version_utility = getUtility(self.context, IZopeVersion)
         except ComponentLookupError:
@@ -42,30 +37,24 @@
         return version_utility.getZopeVersion()
 
     def getPythonVersion(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         return sys.version
 
     def getPythonPath(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         return tuple(sys.path)
 
     def getSystemPlatform(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         if hasattr(os, "uname"):
             return os.uname()
         else:
             return (sys.platform,)
 
     def getCommandLine(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         return sys.argv
 
     def getProcessId(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         return os.getpid()
     
     def getUptime(self):
-        'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         return time.time() - self.context.getStartTime()
 
     #


=== Zope3/src/zope/app/applicationcontrol/servercontrol.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/servercontrol.py:1.1.2.1	Mon Dec 23 14:30:56 2002
+++ Zope3/src/zope/app/applicationcontrol/servercontrol.py	Tue Dec 24 07:50:45 2002
@@ -33,12 +33,8 @@
                                    # a floating point value, to allow most fine
                                    # grained control on the priority.
 
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.ApplicationControl.ServerControl.IServerControl.
 
     def shutdown(self):
-        'See Zope.App.OFS.ApplicationControl.ServerControl.IServerControl.IServerControl'
         text = ""
         order = self._shutdown_reg.keys()
         order.sort()
@@ -48,11 +44,9 @@
                 hook[0]()
 
     def restart(self):
-        'See Zope.App.OFS.ApplicationControl.ServerControl.IServerControl.IServerControl'
+        'XXX'
 
     def registerShutdownHook(self, call, priority, name):
-        'See Zope.App.OFS.ApplicationControl.ServerControl.IServerControl.IServerControl'
-
         priority = float(priority)
         if priority in self._shutdown_reg:
             raise DoublePriorityError, (call, priority, name)


=== Zope3/src/zope/app/applicationcontrol/zopeversion.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/applicationcontrol/zopeversion.py:1.1.2.1	Mon Dec 23 14:30:56 2002
+++ Zope3/src/zope/app/applicationcontrol/zopeversion.py	Tue Dec 24 07:50:45 2002
@@ -22,19 +22,14 @@
 
     __implements__ =  IZopeVersion
 
-    ############################################################
-    # Implementation methods for interface
-    # Zope.App.OFS.ApplicationControl.IZopeVersion.
-
     def getZopeVersion(self):
-        'See Zope.App.OFS.ApplicationControl.IZopeVersion.IZopeVersion'
 
         version_id = "Development/Unknown"
         version_tag = ""
         is_cvs = 0
         
         import Zope
-        zopedir = os.path.dirname(Zope.__file__)
+        zopedir = os.path.dirname(zope.__file__)
         
         # is this a CVS checkout?
         cvsdir = os.path.join(zopedir, "CVS" )