[Zope-Checkins] CVS: Zope3/lib/python/Zope - zope.zcml:1.1.2.9

[Gary Poster]

Update of /cvs-repository/Zope3/lib/python/Zope
In directory cvs.zope.org:/tmp/cvs-serv19265

Modified Files:
      Tag: Zope-3x-branch
	zope.zcml 
Log Message:
This commit sets up the hook tag so that it actually works, and uses the new functionality to better divide up the labor of the ComponentArchitecture.  The placeless ComponentArchitecture code for getService is still there, but the placeful code has been moved to the ServiceManager section.  A few other hooks are also set up in ComponentArchitecture, and a few changes made in preparation for a later update of some placeful services.

The ServiceManager test was altered to use the newly moved placeful getService code.

Other hooks can now be set up and used using this hopefully helpful mechanism.



=== Zope3/lib/python/Zope/zope.zcml 1.1.2.8 => 1.1.2.9 ===
   
 <!-- Standard configuration directives -->
+<include package=".Configuration" file="configuration-meta.zcml" />
 <include package=".App" file="app-meta.zcml" />
 <include package=".ComponentArchitecture" file="component-meta.zcml" />
 <include package=".Publisher" file="publisher-meta.zcml" />
@@ -26,9 +27,9 @@
    title="Manage Application" />
 
 <!-- Configuration -->
+<include package=".ComponentArchitecture" file="component.zcml" />
 <include package=".App" file="app.zcml" />
 <include package=".I18n" file="i18n.zcml" />
-<include package=".ComponentArchitecture" file="component.zcml" />
 <include package=".Publisher" file="publisher.zcml" />
 <include package=".StartUp" file="startup-registry.zcml" />