[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ApplicationControl - RuntimeInfo.py:1.1.2.6 application-control-meta.zcml:1.1.2.3 application-control.zcml:1.1.2.4

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ApplicationControl
In directory cvs.zope.org:/tmp/cvs-serv12187/lib/python/Zope/App/OFS/ApplicationControl

Modified Files:
      Tag: Zope-3x-branch
	RuntimeInfo.py application-control-meta.zcml 
	application-control.zcml 
Log Message:
Merging in Zope3InWonderland-branch, which implemented the following
proposals (see
http://dev.zope.org/Wikis/DevSite/Projects/ComponentArchitecture/OldProposals): 
- RenameAllowToRequire

- GroupClassRelatedDirectivesInClassDirective

- ViewInterfaceAndSimplification

- ConsistentUseOfSpacesAsDelimitersInZCMLAttributes

- TwoArgumentViewConstructors

- ImplementsInZCML

- SimpleViewCreationInZCML

- RemoveGetView

- ReplaceProtectWithAllow

- ViewMethodsAsViews

- MergeProtectionAndComponentDefinitions

There were also various security fixes resulting of better integration
of security with components.


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/RuntimeInfo.py 1.1.2.5 => 1.1.2.6 ===
     
     def __init__(self, context):
-        self._context = context
-
-    def getContext(self):
-        return self._context
+        self.context = context
     
     ############################################################
     # Implementation methods for interface
@@ -39,7 +36,7 @@
     def getZopeVersion(self):
         'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
         try:
-            version_utility = getUtility(self.getContext(), IZopeVersion)
+            version_utility = getUtility(self.context, IZopeVersion)
         except ComponentLookupError:
             return ""
         return version_utility.getZopeVersion()
@@ -69,7 +66,7 @@
     
     def getUptime(self):
         'See Zope.App.OFS.ApplicationControl.IRuntimeInfo.IRuntimeInfo'
-        return time.time() - self.getContext().getStartTime()
+        return time.time() - self.context.getStartTime()
 
     #
     ############################################################


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/application-control-meta.zcml 1.1.2.2 => 1.1.2.3 ===
   <directives namespace="http://namespaces.zope.org/application-control">
     <directive name="registerView"
-               attributes="name, title"
-               handler="Zope.App.OFS.ApplicationControl.metaConfigure.registerView" />
+               attributes="name title"
+               handler=".metaConfigure.registerView" />
   </directives>
 
- <include package=".ServerControl" file="server-control-meta.zcml" />
+  <include package=".ServerControl" file="server-control-meta.zcml" />
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/application-control.zcml 1.1.2.3 => 1.1.2.4 ===
 >
 
-<security:protectClass class=".ApplicationControl."
-                       permission_id="Zope.ManageApplication"
-                       interface=".IApplicationControl." />
+  <content class=".ApplicationControl.">
+    <security:require
+        permission="Zope.ManageApplication"
+        interface=".IApplicationControl." />
+  </content>
 
-<security:protectClass class=".RuntimeInfo."
-                       permission_id="Zope.ManageApplication"
-                       interface=".IRuntimeInfo." />
+  <adapter factory=".RuntimeInfo."
+           permission="Zope.ManageApplication"
+           provides=".IRuntimeInfo."
+           for=".IApplicationControl." />
 
-<adapter factory=".RuntimeInfo."
-         provides=".IRuntimeInfo."
-         for=".IApplicationControl." />
+  <utility component=".ZopeVersion.ZopeVersionUtility"
+           provides=".IZopeVersion." />
 
-<utility component=".ZopeVersion.ZopeVersionUtility"
-         provides=".IZopeVersion." />
-
-<include package=".Views" file="views.zcml" />   
-<include package=".ServerControl" file="server-control.zcml" />
+  <include package=".Views" file="views.zcml" />   
+  <include package=".ServerControl" file="server-control.zcml" />
 
 </zopeConfigure>