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

[Hanno Schlichting]

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

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

-=-
Modified: zope.app.applicationcontrol/trunk/CHANGES.txt
===================================================================
--- zope.app.applicationcontrol/trunk/CHANGES.txt	2010-09-17 11:29:57 UTC (rev 116490)
+++ zope.app.applicationcontrol/trunk/CHANGES.txt	2010-09-17 11:33:19 UTC (rev 116491)
@@ -5,7 +5,8 @@
 3.5.8 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Replaced a testing dependency on zope.app.securitypolicy with one on
+  zope.securitypolicy.
 
 
 3.5.7 (2010-07-08)

Modified: zope.app.applicationcontrol/trunk/setup.py
===================================================================
--- zope.app.applicationcontrol/trunk/setup.py	2010-09-17 11:29:57 UTC (rev 116490)
+++ zope.app.applicationcontrol/trunk/setup.py	2010-09-17 11:33:19 UTC (rev 116491)
@@ -54,12 +54,12 @@
         test=['zope.app.appsetup',
               'zope.app.authentication',
               'zope.app.component',
-              'zope.app.securitypolicy',
               'zope.app.testing',
               'zope.app.zcmlfiles',
-              'zope.testbrowser',
               'zope.login',
               'zope.publisher>=3.12',
+              'zope.securitypolicy',
+              'zope.testbrowser',
               ]),
     package_dir = {'': 'src'},
     packages=find_packages('src'),

Modified: zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/ftesting.zcml
===================================================================
--- zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/ftesting.zcml	2010-09-17 11:29:57 UTC (rev 116490)
+++ zope.app.applicationcontrol/trunk/src/zope/app/applicationcontrol/ftesting.zcml	2010-09-17 11:33:19 UTC (rev 116491)
@@ -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" />
@@ -22,12 +22,12 @@
   <grantAll role="zope.Manager" />
 
   <!-- Principal that tests generally run as -->
-
   <principal
       id="zope.manager"
       title="Manager"
       login="mgr"
       password="mgrpw" />
+  <grant role="zope.Manager" principal="zope.manager" />
 
   <!-- Bootstrap principal used to make local grant to the principal above -->
   <principal
@@ -36,7 +36,6 @@
       login="globalmgr"
       password="globalmgrpw" />
 
-  <grant role="zope.Manager" principal="zope.manager" />
   <grant role="zope.Manager" principal="zope.globalmgr" />
 
 </configure>