[Checkins] SVN: zope.app.publisher/trunk/ Use zope.site instead of zope.folder.

[Martijn Faassen]

Log message for revision 95593:
  Use zope.site instead of zope.folder.
  

Changed:
  U   zope.app.publisher/trunk/CHANGES.txt
  U   zope.app.publisher/trunk/setup.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/README.txt
  U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_functional.py

-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt	2009-01-30 16:56:21 UTC (rev 95592)
+++ zope.app.publisher/trunk/CHANGES.txt	2009-01-30 17:05:44 UTC (rev 95593)
@@ -7,6 +7,8 @@
 
 - Use zope.container instead of zope.app.container.
 
+- Use zope.site.folder instead of zope.app.folder.
+
 3.5.3 (2009-01-27)
 ==================
 

Modified: zope.app.publisher/trunk/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2009-01-30 16:56:21 UTC (rev 95592)
+++ zope.app.publisher/trunk/setup.py	2009-01-30 17:05:44 UTC (rev 95593)
@@ -65,7 +65,8 @@
           'test': ['zope.testing',
                    'zope.app.testing',
                    'zope.app.securitypolicy',
-                   'zope.app.zcmlfiles'],
+                   'zope.app.zcmlfiles',
+                   'zope.site'],
           },
 
       zip_safe = False,

Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/README.txt
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/README.txt	2009-01-30 16:56:21 UTC (rev 95592)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/README.txt	2009-01-30 17:05:44 UTC (rev 95593)
@@ -28,7 +28,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.interfaces.IFolder"
   ...       methods="contents"
   ...       class="zope.app.publisher.xmlrpc.README.FolderListing"
   ...       permission="zope.ManageContent"
@@ -44,7 +44,7 @@
   ... Content-Length: 73
   ... Content-Type: application/x-www-form-urlencoded
   ...
-  ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f1""")
+  ... type_name=BrowserAdd__zope.site.folder.Folder&new_value=f1""")
   HTTP/1.1 303 See Other
   ...
 
@@ -54,7 +54,7 @@
   ... Content-Length: 73
   ... Content-Type: application/x-www-form-urlencoded
   ...
-  ... type_name=BrowserAdd__zope.app.folder.folder.Folder&new_value=f2""")
+  ... type_name=BrowserAdd__zope.site.folder.Folder&new_value=f2""")
   HTTP/1.1 303 See Other
   ...
 
@@ -125,7 +125,7 @@
   ...
   ...   <xmlrpc:view
   ...       name="listing"
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.folder.IFolder"
   ...       methods="contents"
   ...       class="zope.app.publisher.xmlrpc.README.FolderListing"
   ...       permission="zope.ManageContent"
@@ -175,7 +175,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.folder.IFolder"
   ...       methods="add"
   ...       class="zope.app.publisher.xmlrpc.README.ParameterDemo"
   ...       permission="zope.ManageContent"
@@ -219,7 +219,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.folder.IFolder"
   ...       methods="your_fault"
   ...       class="zope.app.publisher.xmlrpc.README.FaultDemo"
   ...       permission="zope.ManageContent"
@@ -265,7 +265,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.folder.IFolder"
   ...       methods="epoch"
   ...       class="zope.app.publisher.xmlrpc.README.DateTimeDemo"
   ...       permission="zope.ManageContent"
@@ -310,7 +310,7 @@
   ...
   ...   <xmlrpc:view
   ...       name="index"
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.interfaces.IFolder"
   ...       methods="public protected"
   ...       class="zope.app.publisher.xmlrpc.README.ProtectedView"
   ...       />
@@ -364,7 +364,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.app.folder.folder.IFolder"
+  ...       for="zope.site.interfaces.IFolder"
   ...       methods="your_exception"
   ...       class="zope.app.publisher.xmlrpc.README.ExceptionDemo"
   ...       permission="zope.ManageContent"

Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_functional.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_functional.py	2009-01-30 16:56:21 UTC (rev 95592)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_functional.py	2009-01-30 17:05:44 UTC (rev 95593)
@@ -22,7 +22,7 @@
 import zope.publisher.interfaces.xmlrpc
 from zope.testing import renormalizing
 
-import zope.app.folder.folder
+import zope.site.folder
 from zope.app.testing import functional, setup
 from zope.app.publisher.testing import AppPublisherLayer
 
@@ -38,7 +38,7 @@
     # (OK, we could get it if we want. Maybe later.)
 
     zope.component.provideAdapter(None, (
-        zope.app.folder.folder.IFolder,
+        zope.site.interfaces.IFolder,
         zope.publisher.interfaces.xmlrpc.IXMLRPCRequest
         ), zope.interface, 'contents')