[Zope3-checkins] CVS: Zope3/src/zope/app - configure.zcml:1.1.2.4

[Guido van Rossum]

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

Modified Files:
      Tag: NameGeddon-branch
	configure.zcml 
Log Message:
Fixed up a large number of zcml files.
Not enough to get z3.py to run though...

=== Zope3/src/zope/app/configure.zcml 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/configure.zcml:1.1.2.3	Tue Dec 24 13:59:12 2002
+++ Zope3/src/zope/app/configure.zcml	Tue Dec 24 14:26:46 2002
@@ -1,30 +1,24 @@
-<zopeConfigure xmlns='http://namespaces.zope.org/zope' >
+<zopeConfigure
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:browser='http://namespaces.zope.org/browser'
+>
 
   <include file="meta.zcml" />
 
-  <include package="zope.app.componentarchitecture" />
+  <include package="zope.app.component" />
   <include package="zope.app.event" />
   <include package="zope.app.i18n" />
   <include package="zope.app.security" />
   <include package="zope.app.publisher" />
-  <include package="zope.app.browser.skins.basic" />
-  <include package="zope.app.RDB" />
-  <include package="zope.app.Traversing" />
-  <include package="zope.app.ZopePublication" />
-  <include package="zope.app.Undo" />
-  <include package="zope.app.Forms" />
-  <include package="zope.app.Caching" />
-  <include package="zope.app.DublinCore" />
-  <include package="zope.app.DependencyFramework" />
-  <include package="zope.app.StartUp" />
+  <include package="zope.app.rdb" />
+  <include package="zope.app.traversing" />
+  <include package="zope.app.publication" />
+  <include package="zope.app.form" />
+  <include package="zope.app.cache" />
+  <include package="zope.app.dublincore" />
+  <include package="zope.app.startup" />
   <include package="zope.app.index" />
-
-</zopeConfigure>
-
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'
->
+  <include package="zope.app.browser.skins.basic" />
 
 <browser:view
     permission="zope.ManageContent"
@@ -34,11 +28,6 @@
    <browser:page name="undo.html" attribute="action" />
 </browser:view>
 
-</zopeConfigure>
-
-<zopeConfigure
-     xmlns='http://namespaces.zope.org/zope'>
-
 <serviceType id="SQLDatabaseConnections" interface="zope.app.interfaces.rdb.IConnectionService" />
 
 <content class="zope.app.rdb.ZopeConnection">
@@ -65,39 +54,20 @@
       attributes="__getattr__" />
 </content>
 
-<include package=".GadflyDA" />
-
-<include package=".Browser" />
-
-</zopeConfigure>
-
-<zopeConfigure
-    xmlns='http://namespaces.zope.org/zope'
->
+<!--<include package=".GadflyDA" />-->
 
   <adapter
       factory="zope.app.attributeannotations.AttributeAnnotations"
       provides="zope.app.interfaces.annotation.IAnnotations"
       for="zope.app.interfaces.annotation.IAttributeAnnotatable" />
 
-</zopeConfigure>
-
-<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
-
-<include package=".Container" />
-<include package=".Content" />
-<include package=".Services" />
-<include package=".Introspector" />
-<include package=".ApplicationControl" />
-
-<include package=".Annotation" />
+<include package=".container" />
+<include package=".content" />
+<include package=".services" />
+<include package=".introspector" />
+<include package=".applicationcontrol" />
 
-
-</zopeConfigure>
-
-<zopeConfigure 
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'>
+<include package=".annotation" />
 
   <adapter
       factory="zope.app.introspector.Introspector"
@@ -106,15 +76,9 @@
 
   <include package=".Browser" />
 
-</zopeConfigure>
-
-
-<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
-
   <adapter
       factory="zope.app.dependable.Dependable"
       provides="zope.app.interfaces.dependable.IDependable"
       for="zope.app.interfaces.annotation.IAnnotatable" />
-
 
 </zopeConfigure>