[Zope-Checkins] CVS: Zope3 - site.zcml:1.1.2.1 zope.zcml:1.1.2.10

[Guido van Rossum]

Update of /cvs-repository/Zope3
In directory cvs.zope.org:/tmp/cvs-serv7417

Modified Files:
      Tag: Zope-3x-branch
	zope.zcml 
Added Files:
      Tag: Zope-3x-branch
	site.zcml 
Log Message:
refactor zope.zcml into a site.zcml, under control of the site manager,
and a zope.zcml, under control of Zope.
Also added registration of BasicAuthAdapter to zope.zcml.
Also changed feature into addapter and presentation into view, in zope.zcml.

=== Added File Zope3/site.zcml ===
<zopeConfigure
   xmlns='http://namespaces.zope.org/zope'
>

<include file="zope.zcml" />

<include file="products.zcml" />

</zopeConfigure>


=== Zope3/zope.zcml 1.1.2.9 => 1.1.2.10 ===
 >
 
-<feature component="Zope.App.Traversing.Traverser"
+<adapter component="Zope.App.Traversing.Traverser"
          provides="Zope.App.Traversing.ITraverser"
          />
     <!-- Ultimately, this should be registered only for IWrapper, but that
          won't work like that just now.
          for="Zope.ContextWrapper.IWrapper" /> -->
 
-<feature component="Zope.App.Traversing.DefaultTraversable"
+<adapter component="Zope.App.Traversing.DefaultTraversable"
     provides="Zope.App.Traversing.ITraversable" />
 
 <security:definePermission name="Add folders" />
@@ -22,33 +22,35 @@
                   title="Son of Folder"
                   description="Minimal folder" />
 
-<browser:presentation name="_traverse" 
+<browser:view name="_traverse" 
  component="Zope.App.ZopePublication.Traversers.DefaultTraverser" />
 
-<browser:presentation name="_traverse" 
+<browser:view name="_traverse" 
  for="Zope.App.OFS.IContainer"
  component="Zope.App.OFS.ContainerTraverser.ContainerTraverser" />
 
-<browser:presentation name="contents"
+<browser:view name="contents"
  for="Zope.App.OFS.Folder.IFolder"
  component="Zope.App.OFS.FolderContents" />
 
-<browser:defaultPresentation name="view"
+<browser:defaultView name="view"
  for="Zope.App.OFS.Folder.IFolder"
  component="Zope.App.OFS.FolderContents" />
 
-<!--browser:defaultPresentation name="view"
+<!--browser:defaultView name="view"
  for="Zope.App.OFS.RootFolder.IRootFolder"
  component="Zope.App.OFS.FolderContents" /-->
 
-<browser:presentation name="adder"
+<browser:view name="adder"
  for="Zope.App.OFS.Folder.IFolder"
  component="Zope.App.OFS.FolderAdder" />
 
-<feature component="Zope.App.OFS.ContainerTraversable"
+<adapter component="Zope.App.OFS.ContainerTraversable"
          provides="Zope.App.Traversing.ITraversable"
          for="Zope.App.OFS.IContainer.IReadContainer" />
 
-<include file="products.zcml" />
+<adapter component="Zope.App.Security.BasicAuthAdapter"
+         provides="Zope.App.Security.ILoginPassword"
+         for="Zope.Publisher.HTTP.IHTTPCredentials" />
 
 </zopeConfigure>