[Checkins] SVN: zope.file/trunk/s Get tests passing with newer zope packages

[Patrick Strawderman]

Log message for revision 113355:
  Get tests passing with newer zope packages

Changed:
  U   zope.file/trunk/setup.py
  U   zope.file/trunk/src/zope/file/ftesting.zcml

-=-
Modified: zope.file/trunk/setup.py
===================================================================
--- zope.file/trunk/setup.py	2010-06-11 14:44:42 UTC (rev 113354)
+++ zope.file/trunk/setup.py	2010-06-11 15:40:16 UTC (rev 113355)
@@ -65,11 +65,13 @@
       package_dir = {'': 'src'},
       namespace_packages=['zope'],
       extras_require = dict(
-          test=['zope.app.testing',
-                'zope.app.securitypolicy',
+          test=['zope.app.server',
+                'zope.app.testing',
                 'zope.app.zcmlfiles',
-                'zope.testbrowser',
-                'zope.app.server']),
+                'zope.login',
+                'zope.password',
+                'zope.securitypolicy',
+                'zope.testbrowser']),
      install_requires=['setuptools',
                        'ZODB3',
                        'zope.browser',

Modified: zope.file/trunk/src/zope/file/ftesting.zcml
===================================================================
--- zope.file/trunk/src/zope/file/ftesting.zcml	2010-06-11 14:44:42 UTC (rev 113354)
+++ zope.file/trunk/src/zope/file/ftesting.zcml	2010-06-11 15:40:16 UTC (rev 113355)
@@ -13,9 +13,12 @@
       zcml:condition="not-installed zope.app.zcmlfiles"
       package="zope.app"
       />
-  <include package="zope.app.authentication" />
+
   <include package="zope.app.server" />
 
+  <include package="zope.login"/>
+  <include package="zope.password"/>
+  
   <include package="zope.mimetype" file="meta.zcml"/>
   <include package="zope.mimetype"/>
   <include package="zope.file"/>
@@ -23,8 +26,8 @@
 
   <!-- Security -->
 
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />