[Zope3-checkins] CVS: Zope3/src/zope/app - meta.zcml:1.1.2.2

[R. David Murray]

Update of /cvs-repository/Zope3/src/zope/app
In directory cvs.zope.org:/tmp/cvs-serv25143

Modified Files:
      Tag: NameGeddon-branch
	meta.zcml 
Log Message:
Fix names, combine appended file.


=== Zope3/src/zope/app/meta.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/meta.zcml:1.1.2.1	Mon Dec 23 14:30:56 2002
+++ Zope3/src/zope/app/meta.zcml	Tue Dec 24 13:31:35 2002
@@ -3,21 +3,15 @@
 <!-- Standard configuration directives -->
 <include package="zope.configuration" file="meta.zcml" />
 
-<include package=".ComponentArchitecture" file="meta.zcml" />
-<include package=".Publisher" file="meta.zcml" />
-<include package=".Traversing" file="meta.zcml" />
-<include package=".Security" file="meta.zcml" />
-<include package=".Forms.Browser" file="meta.zcml" />
-<include package=".OFS" file="meta.zcml" />
-<include package=".ContentDirective" file="meta.zcml" />
+<include package="zope.app.component" file="meta.zcml" />
+<include package="zope.app.publisher" file="meta.zcml" />
+<include package="zope.app.traversing" file="meta.zcml" />
+<include package="zope.app.security" file="meta.zcml" />
+<include package="zope.app.form" file="meta.zcml" />
+<include package="zope.app.contentdirective" file="meta.zcml" />
 <include package="zope.app.event" file="meta.zcml" />
-<include package=".i18n" file="meta.zcml" />
-<include package=".StartUp" file="meta.zcml" />
-
-</zopeConfigure>
-
-<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
-
-  <include package=".ApplicationControl" file="meta.zcml" />
+<include package="zope.app.i18n" file="meta.zcml" />
+<include package="zope.app.startup" file="meta.zcml" />
+<include package="zope.app.applicationcontrol" file="meta.zcml" />
 
 </zopeConfigure>