[Zope3-checkins] CVS: Zope3/src/zope/configuration - meta.zcml:1.4 xmlconfig.py:1.16

[Martijn Faassen]

Update of /cvs-repository/Zope3/src/zope/configuration
In directory cvs.zope.org:/tmp/cvs-serv25533/zope/configuration

Modified Files:
	meta.zcml xmlconfig.py 
Log Message:
zopeConfigure renamed to configure everywhere in ZCML, as 
zopeConfigure is deprecated and hampers ZCML schema efforts.


=== Zope3/src/zope/configuration/meta.zcml 1.3 => 1.4 ===
--- Zope3/src/zope/configuration/meta.zcml:1.3	Sun May 18 14:06:44 2003
+++ Zope3/src/zope/configuration/meta.zcml	Fri Aug 22 16:02:22 2003
@@ -1,4 +1,4 @@
-<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
+<configure xmlns='http://namespaces.zope.org/zope'>
 
   <!-- zope.configure -->
   <directives namespace="http://namespaces.zope.org/zope">
@@ -6,4 +6,4 @@
        handler="zope.configuration.metaconfigure.hook" />
   </directives>
 
-</zopeConfigure>
+</configure>


=== Zope3/src/zope/configuration/xmlconfig.py 1.15 => 1.16 ===
--- Zope3/src/zope/configuration/xmlconfig.py:1.15	Sun Aug 17 02:08:49 2003
+++ Zope3/src/zope/configuration/xmlconfig.py	Fri Aug 22 16:02:22 2003
@@ -103,13 +103,13 @@
 
     >>> print info
     File "tests//sample.zcml", line 1.0-7.0
-      <zopeConfigure xmlns='http://namespaces.zope.org/zope'>
+      <configure xmlns='http://namespaces.zope.org/zope'>
         <!-- zope.configure -->
         <directives namespace="http://namespaces.zope.org/zope">
           <directive name="hook" attributes="name implementation module"
              handler="zope.configuration.metaconfigure.hook" />
         </directives>
-      </zopeConfigure>
+      </configure>
 
 
     """
@@ -381,6 +381,7 @@
     config.defineSimpleDirective(
         context, "includeOverrides", IInclude, includeOverrides, namespace="*")
 
+    # XXX zopeConfigure is deprecated; use configure in new ZCML instead
     config.defineGroupingDirective(
         context,
         name="zopeConfigure",