[Zope-Checkins] CVS: Zope3/lib/python/Zope/App - app-meta.zcml:1.1.2.2 app.zcml:1.1.2.4

[Jim Fulton]

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

Modified Files:
      Tag: Zope-3x-branch
	app-meta.zcml app.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/App/app-meta.zcml 1.1.2.1 => 1.1.2.2 ===
    xmlns:browser='http://namespaces.zope.org/browser'
 >
-<include package="Zope.App.ZMI" file="zmi-meta.zcml" />
-<include package="Zope.App.Security" file="security-meta.zcml" />
+<include package=".ZMI" file="zmi-meta.zcml" />
+<include package=".Security" file="security-meta.zcml" />
 
 </zopeConfigure>


=== Zope3/lib/python/Zope/App/app.zcml 1.1.2.3 => 1.1.2.4 ===
    xmlns:browser='http://namespaces.zope.org/browser'
 >
-<include package="Zope.App.ZMI" file="zmi.zcml" />
-<include package="Zope.App.OFS" file="ofs.zcml" />
-<include package="Zope.App.Security" file="security.zcml" />
-<include package="Zope.App.Traversing" file="traversing.zcml" />
-<include package="Zope.App.ZopePublication" file="zopepublication.zcml" />
-<include package="Zope.App.Undo" file="undo.zcml" />
+<include package=".ZMI" file="zmi.zcml" />
+<include package=".OFS" file="ofs.zcml" />
+<include package=".Security" file="security.zcml" />
+<include package=".Traversing" file="traversing.zcml" />
+<include package=".ZopePublication" file="zopepublication.zcml" />
+<include package=".Undo" file="undo.zcml" />
 
 </zopeConfigure>