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

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	zope.zcml 
Log Message:
Merged in changes from contextual-directives branch.

Now, a leading dot in a dotted name implies the package the include
file was included from. It still defaults to ZopeProducts if a file 
was not included via a package.

A few of the config files have been convered to use the
shorthand. The rest still can be converted.

I also checked this against Step 6 in the tutorial, which I will check
in in a moment.


=== Zope3/lib/python/Zope/zope.zcml 1.1.2.3 => 1.1.2.4 ===
   
 <!-- Standard configuration directives -->
-<include package="Zope.App" file="app-meta.zcml" />
-<include package="Zope.ComponentArchitecture" file="component-meta.zcml" />
-<include package="Zope.Publisher.Browser" file="browser-meta.zcml" />
+<include package=".App" file="app-meta.zcml" />
+<include package=".ComponentArchitecture" file="component-meta.zcml" />
+<include package=".Publisher.Browser" file="browser-meta.zcml" />
 
 
 <!-- Standard Permissions -->
@@ -23,9 +23,9 @@
    title="Manage Services" />
 
 <!-- Configuration -->
-<include package="Zope.App" file="app.zcml" />
-<include package="Zope.I18n" file="i18n.zcml" />
-<include package="Zope.ComponentArchitecture" file="component.zcml" />
+<include package=".App" file="app.zcml" />
+<include package=".I18n" file="i18n.zcml" />
+<include package=".ComponentArchitecture" file="component.zcml" />
 
 
 </zopeConfigure>