[Zope-Checkins] CVS: Zope3 - z3.py:1.1.2.16 zope.zcml:1.1.2.20

[Martijn Faassen]

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

Modified Files:
      Tag: Zope-3x-branch
	z3.py zope.zcml 
Log Message:
With recent reorganization of the Folder tree, it wouldn't start anymore --
I think this makes the changes to make it start. Now I only need to 
figure out what to actually do after its started -- like, how do I log
in? :)


=== Zope3/z3.py 1.1.2.15 => 1.1.2.16 ===
 from Zope.Publisher.HTTP.BrowserPayload import BrowserRequestPayload, \
      BrowserResponsePayload
-from Zope.App.OFS.RootFolder import RootFolder
+from Zope.App.OFS.Folder.RootFolder import RootFolder
 import asyncore, zLOG
 from Zope.Server import ZLogIntegration
 from Zope.Server.PublisherServers import PublisherHTTPServer


=== Zope3/zope.zcml 1.1.2.19 => 1.1.2.20 ===
  factory="Zope.App.OFS.ContainerTraverser.ContainerTraverser." />
 
-<security:protectClass name="Zope.App.OFS.FolderContents."
+<security:protectClass name="Zope.App.OFS.Folder.FolderContents."
    permission_id="Zope.View" methods="index" />
 
 <browser:view name="contents"
- for="Zope.App.OFS.Folder.IFolder."
- factory="Zope.App.OFS.FolderContents." />
+ for="Zope.App.OFS.Folder.Folder.IFolder."
+ factory="Zope.App.OFS.Folder.FolderContents." />
 
 <browser:defaultView name="view"
- for="Zope.App.OFS.Folder.IFolder."
- factory="Zope.App.OFS.FolderContents." />
+ for="Zope.App.OFS.Folder.Folder.IFolder."
+ factory="Zope.App.OFS.Folder.FolderContents." />
 
 <!--browser:defaultView name="view"
  for="Zope.App.OFS.RootFolder.IRootFolder"
- factory="Zope.App.OFS.FolderContents" /-->
+ factory="Zope.App.OFS.Folder.FolderContents" /-->
 
-<security:protectClass name="Zope.App.OFS.FolderAdder."
+<security:protectClass name="Zope.App.OFS.Folder.FolderAdder."
    permission_id="Zope.AddFolders" methods="index, confirmed, action" />
 
 <security:protectClass name="Zope.App.OFS.Folder."
    permission_id="Zope.View" />
 
 <browser:view name="adder"
- for="Zope.App.OFS.Folder.IFolder."
- factory="Zope.App.OFS.FolderAdder." />
+ for="Zope.App.OFS.Folder.Folder.IFolder."
+ factory="Zope.App.OFS.Folder.FolderAdder." />
 
 <adapter factory="Zope.App.OFS.ContainerTraversable."
          provides="Zope.App.Traversing.ITraversable."