[Checkins] SVN: zope.app.http/trunk/ Replaced a testing dependency on zope.app.securitypolicy with one on zope.securitypolicy.

[Hanno Schlichting]

Log message for revision 116449:
  Replaced a testing dependency on zope.app.securitypolicy with one on zope.securitypolicy.
  

Changed:
  U   zope.app.http/trunk/CHANGES.txt
  U   zope.app.http/trunk/setup.py
  U   zope.app.http/trunk/src/zope/app/http/ftesting.zcml

-=-
Modified: zope.app.http/trunk/CHANGES.txt
===================================================================
--- zope.app.http/trunk/CHANGES.txt	2010-09-16 12:16:43 UTC (rev 116448)
+++ zope.app.http/trunk/CHANGES.txt	2010-09-16 12:17:52 UTC (rev 116449)
@@ -5,9 +5,9 @@
 3.9 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Replaced a testing dependency on zope.app.securitypolicy with one on
+  zope.securitypolicy.
 
-
 3.8 (2010-04-19)
 ----------------
 

Modified: zope.app.http/trunk/setup.py
===================================================================
--- zope.app.http/trunk/setup.py	2010-09-16 12:16:43 UTC (rev 116448)
+++ zope.app.http/trunk/setup.py	2010-09-16 12:17:52 UTC (rev 116449)
@@ -54,10 +54,10 @@
       namespace_packages=['zope', 'zope.app'],
       extras_require=dict(
           test=['zope.app.testing',
-                'zope.app.securitypolicy',
                 'zope.app.file',
                 'zope.app.zcmlfiles',
                 'zope.app.wsgi >= 3.9.0',
+                'zope.securitypolicy',
                 'zope.site',
                 'zope.login',]),
       install_requires=['setuptools',

Modified: zope.app.http/trunk/src/zope/app/http/ftesting.zcml
===================================================================
--- zope.app.http/trunk/src/zope/app/http/ftesting.zcml	2010-09-16 12:16:43 UTC (rev 116448)
+++ zope.app.http/trunk/src/zope/app/http/ftesting.zcml	2010-09-16 12:17:52 UTC (rev 116449)
@@ -11,27 +11,17 @@
 
   <include package="zope.app.zcmlfiles" />
   <include package="zope.app.authentication" />
-  <include package="zope.app.securitypolicy" />
   <include package="zope.app.file" />
   <include package="zope.login" />
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
   <role id="zope.Manager" title="Site Manager" />
-
   <grantAll role="zope.Manager" />
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
 
-  <!-- Principal that tests generally run as -->
   <principal
-      id="zope.mgr"
-      title="Manager"
-      login="mgr"
-      password="mgrpw" />
-
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
       id="zope.globalmgr"
       title="Manager"
       login="globalmgr"