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

[Guido van Rossum]

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

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/content/configure.zcml 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/content/configure.zcml:1.1.2.3	Tue Dec 24 11:25:58 2002
+++ Zope3/src/zope/app/content/configure.zcml	Tue Dec 24 14:26:47 2002
@@ -1,4 +1,7 @@
-<zopeConfigure xmlns="http://namespaces.zope.org/zope">
+<zopeConfigure
+   xmlns='http://namespaces.zope.org/zope'
+   xmlns:browser='http://namespaces.zope.org/browser'
+>
 
 <!-- Simple Folder Directives -->
 
@@ -47,14 +50,6 @@
 
 </content>
 
-<include package=".Views" />
-
-</zopeConfigure>
-
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'
->
   <permission id="zope.AddImages" title="Add Images" />
 
   <content class="zope.app.content.image.Image">
@@ -106,13 +101,6 @@
 
   </content>
 
-  <include package=".Views" />
-
-</zopeConfigure>
-
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
->
 
 <content class="zope.app.content.zpt.ZPTPage">
   <factory
@@ -152,14 +140,6 @@
          provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
          for="zope.app.content.zpt.IZPTPage" />
 
-<include package=".Views" />
-
-</zopeConfigure>
-
-<zopeConfigure
-   xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'
->
 
   <content class="zope.app.content.dtmlpage.DTMLPage">
 
@@ -183,24 +163,6 @@
 
   </content>
 
-  <include package=".Views" />
-
-</zopeConfigure>
-
-<zopeConfigure
-   xmlns="http://namespaces.zope.org/zope"
-   xmlns:vfs="http://namespaces.zope.org/vfs">
-
-  <include package=".File" />
-  <include package=".Folder" />
-  <include package=".Image" />
-  <include package=".ZPTPage" />
-  <include package=".DTMLPage" />
-  <include package=".SQLScript" />
-
-</zopeConfigure>
-
-<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
 
 <content class="zope.app.content.file.File">
 
@@ -224,7 +186,7 @@
 
 </content>
 
-<content class="zope.app.content.18nfile.I18nFile">
+<content class="zope.app.content.i18nfile.I18nFile">
   <factory
       id="zope.app.content.I18nFile"
       permission="zope.ManageContent"
@@ -251,14 +213,6 @@
          provides="zope.app.interfaces.index.text.interfaces.ISearchableText"
          for="zope.app.interfaces.content.file.IReadFile" />
 
-<include package=".Views" />
-
-</zopeConfigure>
-
-
-
-<zopeConfigure xmlns="http://namespaces.zope.org/zope">
-
   <!-- SQL Script Directives -->
 
   <permission id="zope.AddSQLScripts" title="Add SQL Scripts" />
@@ -273,8 +227,8 @@
 
     <require
         permission = "zope.ManageContent"
-        interface = ".ISQLScript."
-        set_schema = ".ISQLScript."
+        interface = "zope.app.interfaces.content.sql.ISQLScript."
+        set_schema = "zope.app.interfaces.content.sql.ISQLScript."
         />
 
     <require
@@ -306,6 +260,5 @@
 
   <!-- Further Directives -->
 
-  <include package=".Views" />
 
 </zopeConfigure>