[Checkins] SVN: zc.resourcelibrary/trunk/ use zope.site instead of zope.app.component.

[Alex Smith]

Log message for revision 100544:
  
  use zope.site instead of zope.app.component.
  

Changed:
  U   zc.resourcelibrary/trunk/CHANGES.txt
  U   zc.resourcelibrary/trunk/setup.py
  U   zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py
  U   zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py

-=-
Modified: zc.resourcelibrary/trunk/CHANGES.txt
===================================================================
--- zc.resourcelibrary/trunk/CHANGES.txt	2009-05-29 20:55:52 UTC (rev 100543)
+++ zc.resourcelibrary/trunk/CHANGES.txt	2009-05-29 22:21:56 UTC (rev 100544)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.1.1 (unreleased)
+------------------
+
+- Use ``zope.site`` instead of ``zope.app.component``.  Removes direct
+  dependency on ``zope.app.component``.
+
 1.1.0 (2009-05-05)
 ------------------
 

Modified: zc.resourcelibrary/trunk/setup.py
===================================================================
--- zc.resourcelibrary/trunk/setup.py	2009-05-29 20:55:52 UTC (rev 100543)
+++ zc.resourcelibrary/trunk/setup.py	2009-05-29 22:21:56 UTC (rev 100544)
@@ -63,7 +63,6 @@
                 'zope.testing',
                 ]),
       install_requires=['setuptools',
-                        'zope.app.component',
                         'zope.app.publication',
                         'zope.app.publisher',
                         'zope.component',
@@ -71,6 +70,7 @@
                         'zope.interface',
                         'zope.publisher',
                         'zope.security',
+                        'zope.site',
                         'zope.tales',
                         'zope.traversing',
                         ],

Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py	2009-05-29 20:55:52 UTC (rev 100543)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/publication.py	2009-05-29 22:21:56 UTC (rev 100544)
@@ -21,7 +21,7 @@
 from zope.publisher.browser import BrowserRequest, BrowserResponse
 from zope.publisher.browser import isHTML
 from zope.location.interfaces import ISite
-from zope.app.component.hooks import getSite
+from zope.site.hooks import getSite
 from zope.component import queryMultiAdapter
 from zope.component import getMultiAdapter
 from zope.component import getSiteManager

Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py	2009-05-29 20:55:52 UTC (rev 100543)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/tests.py	2009-05-29 22:21:56 UTC (rev 100544)
@@ -18,9 +18,9 @@
 from zc.resourcelibrary import publication
 from zc.resourcelibrary import tal
 from zope.app.testing import functional
-from zope.app.component.hooks import setSite
-from zope.app.component.hooks import getSite
+from zope.site.hooks import getSite
 from zope.configuration import xmlconfig
+from zope.site.hooks import setSite
 import zope.interface
 from zope.pagetemplate import pagetemplate
 import zope.publisher.interfaces.browser
@@ -31,7 +31,6 @@
 import zope.security.management
 
 
-
 class TestFactory:
 
     zope.interface.implements(