[Checkins] SVN: zope.app.publisher/trunk/ Remove a testing dependency on zope.app.securitypolicy.

[Hanno Schlichting]

Log message for revision 116367:
  Remove a testing dependency on zope.app.securitypolicy.
  

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

-=-
Modified: zope.app.publisher/trunk/CHANGES.txt
===================================================================
--- zope.app.publisher/trunk/CHANGES.txt	2010-09-14 10:21:28 UTC (rev 116366)
+++ zope.app.publisher/trunk/CHANGES.txt	2010-09-14 11:14:51 UTC (rev 116367)
@@ -5,9 +5,8 @@
 3.10.2 (unreleased)
 ===================
 
-- Nothing changed yet.
+- Remove a testing dependency on zope.app.securitypolicy.
 
-
 3.10.1 (2010-01-08)
 ===================
 
@@ -18,7 +17,6 @@
 
 - Fix test dependency on zope.container, now we depend on
   zope.container >= 3.9.
-    
 
 3.9.0 (2009-08-27)
 ==================

Modified: zope.app.publisher/trunk/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2010-09-14 10:21:28 UTC (rev 116366)
+++ zope.app.publisher/trunk/setup.py	2010-09-14 11:14:51 UTC (rev 116367)
@@ -63,9 +63,9 @@
       extras_require={
           'test': ['zope.testing',
                    'zope.app.testing',
-                   'zope.app.securitypolicy',
                    'zope.app.zcmlfiles',
                    'zope.container>=3.9',
+                   'zope.securitypolicy',
                    'zope.site',
                    'zope.login',
                    ],

Modified: zope.app.publisher/trunk/src/zope/app/publisher/ftesting.zcml
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/ftesting.zcml	2010-09-14 10:21:28 UTC (rev 116366)
+++ zope.app.publisher/trunk/src/zope/app/publisher/ftesting.zcml	2010-09-14 11:14:51 UTC (rev 116367)
@@ -11,8 +11,8 @@
 
   <include package="zope.app.zcmlfiles" />
   <include package="zope.app.authentication" />
-  <include package="zope.app.securitypolicy" />
   <include package="zope.login" />
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
@@ -20,7 +20,6 @@
   <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
@@ -28,6 +27,7 @@
       title="Manager"
       login="mgr"
       password="mgrpw" />
+  <grant role="zope.Manager" principal="zope.mgr" />
 
   <!-- A user that only has zope.View -->
   <principal
@@ -38,15 +38,6 @@
       />
   <grant permission="zope.View" principal="zope.user" />
 
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
-      id="zope.globalmgr"
-      title="Manager"
-      login="globalmgr"
-      password="globalmgrpw" />
-
-  <grant role="zope.Manager" principal="zope.globalmgr" />
-
   <include package="zope.app.publisher" />
 
 </configure>