[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl - ServerControl.py:1.1.2.3 server-control-meta.zcml:1.1.2.2 server-control.zcml:1.1.2.4

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	ServerControl.py server-control-meta.zcml server-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/ServerControl/ServerControl.py 1.1.2.2 => 1.1.2.3 ===
     """simple shutdown logger"""
     zLOG.LOG("ServerControl", zLOG.INFO, "Server is going to be shut down.")
-
-ServerController = ServerController = ServerControl()


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/server-control-meta.zcml 1.1.2.1 => 1.1.2.2 ===
 
-  <!-- Zope.App.OFS.ApplicationControl -->
   <directives namespace="http://namespaces.zope.org/server-control">
     <directive name="registerShutdownHook"
-               attributes="call, priority, name"
-               handler="Zope.App.OFS.ApplicationControl.ServerControl.metaConfigure.registerShutdownHook" />
+               attributes="call priority name"
+               handler=".metaConfigure.registerShutdownHook" />
   </directives>
 
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ServerControl/server-control.zcml 1.1.2.3 => 1.1.2.4 ===
 >
 
-<security:protectClass class=".ServerControl."
-                       permission_id="Zope.ManageApplication"
-                       interface=".IServerControl." />
+  <utility factory=".ServerControl.ServerControl"
+           permission="Zope.ManageApplication"
+           provides=".IServerControl." />
 
-<utility component=".ServerControl.ServerController" provides=".IServerControl." />
+  <!-- Hint: Here you see how to register something on Zope shutdown -->
+  <server-control:registerShutdownHook
+       name="Shutdown logger"
+       priority="0"
+       call=".ServerControl.shutdownLogger"
+       />
 
-<!-- Hint: Here you see how to register something on Zope shutdown -->
-<server-control:registerShutdownHook name="Shutdown logger" priority="0" call=".ServerControl.shutdownLogger" />
+  <include package=".Views" file="views.zcml" />
 
-<include package=".Views" file="views.zcml" />
 </zopeConfigure>