[Checkins] SVN: zope.app.publisher/trunk/s Complete move to zope.site

[Christian Theune]

Log message for revision 95607:
  Complete move to zope.site
  

Changed:
  U   zope.app.publisher/trunk/setup.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/support.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_resource.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/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2009-01-30 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/setup.py	2009-01-30 21:55:25 UTC (rev 95607)
@@ -58,6 +58,7 @@
                         'zope.pagetemplate',
                         'zope.publisher',
                         'zope.schema',
+			'zope.site',
                         'zope.security',
                         'zope.traversing',
                         ],

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml	2009-01-30 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/configure.zcml	2009-01-30 21:55:25 UTC (rev 95607)
@@ -65,7 +65,7 @@
 
 <browser:page
     name=""
-    for="zope.app.component.interfaces.ISite"
+    for="zope.location.interfaces.ISite"
     class="zope.app.publisher.browser.resources.Resources"
     permission="zope.Public"
     allowed_interface="zope.publisher.interfaces.browser.IBrowserPublisher"

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/support.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/support.py	2009-01-30 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/support.py	2009-01-30 21:55:25 UTC (rev 95607)
@@ -15,18 +15,20 @@
 
 $Id$
 """
+
 import zope.component
+import zope.location.interfaces
 from zope.interface import implements
 from zope.traversing.interfaces import IContainmentRoot
 
 from zope.app.component.hooks import setSite
-from zope.app.component.interfaces import ISite
 
 from zope.app.publisher.browser.menu import BrowserMenu
 
 class Site:
-    implements(ISite, IContainmentRoot)
 
+    implements(zope.location.interfaces.ISite, IContainmentRoot)
+
     def getSiteManager(self):
         return zope.component.getGlobalSiteManager()
 
@@ -43,6 +45,6 @@
         setSite()
         super(SiteHandler, self).tearDown()
 
+
 class M1(BrowserMenu):
     pass
-

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py	2009-01-30 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py	2009-01-30 21:55:25 UTC (rev 95607)
@@ -29,9 +29,9 @@
 from zope.security.proxy import removeSecurityProxy
 from zope.traversing.interfaces import IContainmentRoot
 
+import zope.location.interfaces
 import zope.app.publisher.browser
 from zope.app.component.tests.views import IC
-from zope.app.component.interfaces import ISite
 from zope.app.publisher.browser.tests import support
 from zope.app.testing.placelesssetup import PlacelessSetup
 

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_resource.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_resource.py	2009-01-30 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_resource.py	2009-01-30 21:55:25 UTC (rev 95607)
@@ -21,7 +21,7 @@
 
 from zope.publisher.browser import TestRequest
 
-from zope.app.component.interfaces import ISite
+import zope.location.interfaces
 from zope.app.publisher.browser.resource import Resource
 from zope.app.publisher.browser.tests import support
 from zope.app.testing.placelesssetup import PlacelessSetup
@@ -53,7 +53,9 @@
         # fake IAbsoluteURL adapter
         def resourceBase(site, request):
             return 'http://cdn.example.com'
-        component.provideAdapter(resourceBase, (ISite, TestRequest), 
+        component.provideAdapter(
+            resourceBase,
+            (zope.location.interfaces.ISite, TestRequest),
             IAbsoluteURL, 'resource')
 
         req = TestRequest()
@@ -66,6 +68,3 @@
 
 def test_suite():
     return unittest.makeSuite(TestResource)
-
-if __name__ == '__main__':
-    unittest.main(defaultTest="test_suite")

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 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/README.txt	2009-01-30 21:55:25 UTC (rev 95607)
@@ -175,7 +175,7 @@
   ...   <include package="zope.app.publisher.xmlrpc" file="meta.zcml" />
   ...
   ...   <xmlrpc:view
-  ...       for="zope.site.folder.IFolder"
+  ...       for="zope.site.interfaces.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.site.folder.IFolder"
+  ...       for="zope.site.interfaces.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.site.folder.IFolder"
+  ...       for="zope.site.interfaces.IFolder"
   ...       methods="epoch"
   ...       class="zope.app.publisher.xmlrpc.README.DateTimeDemo"
   ...       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 20:24:09 UTC (rev 95606)
+++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_functional.py	2009-01-30 21:55:25 UTC (rev 95607)
@@ -22,7 +22,7 @@
 import zope.publisher.interfaces.xmlrpc
 from zope.testing import renormalizing
 
-import zope.site.folder
+import zope.site.interfaces
 from zope.app.testing import functional, setup
 from zope.app.publisher.testing import AppPublisherLayer