[Checkins] SVN: grok/branches/sylvain-testlayers/s Grok now runs most tests without zope.app.zcmlfiles. Some tests

[Martijn Faassen]

Log message for revision 111460:
  Grok now runs most tests without zope.app.zcmlfiles. Some tests 
  fail as they assume the ZMI, but most of the tests work. Probably
  some more dependencies can be eliminated.
  

Changed:
  U   grok/branches/sylvain-testlayers/setup.py
  U   grok/branches/sylvain-testlayers/src/grok/configure.zcml

-=-
Modified: grok/branches/sylvain-testlayers/setup.py
===================================================================
--- grok/branches/sylvain-testlayers/setup.py	2010-04-26 21:51:23 UTC (rev 111459)
+++ grok/branches/sylvain-testlayers/setup.py	2010-04-26 22:14:41 UTC (rev 111460)
@@ -58,10 +58,10 @@
                       'z3c.testsetup',
                       'zc.catalog',
                       'zope.annotation',
+                      'zope.app.http',
                       'zope.app.publication',
                       'zope.app.publisher',
                       'zope.app.renderer',
-                      'zope.app.zcmlfiles',
                       'zope.catalog',
                       'zope.component',
                       'zope.container',

Modified: grok/branches/sylvain-testlayers/src/grok/configure.zcml
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/configure.zcml	2010-04-26 21:51:23 UTC (rev 111459)
+++ grok/branches/sylvain-testlayers/src/grok/configure.zcml	2010-04-26 22:14:41 UTC (rev 111460)
@@ -3,30 +3,47 @@
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:grok="http://namespaces.zope.org/grok">
 
+  <include package="zope.app.publication" file="meta.zcml" />
+  <include package="zope.app.publisher" file="meta.zcml" />
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.i18n" file="meta.zcml" />
+  <include package="zope.principalregistry" file="meta.zcml" />
+  <include package="zope.publisher" file="meta.zcml" />
   <include package="zope.security" file="meta.zcml" />
-  <include package="zope.i18n" file="meta.zcml" />
   <include package="zope.securitypolicy" file="meta.zcml" />
-  <include package="zope.app.zcmlfiles" file="meta.zcml" />
+
   <include package="grok" file="meta.zcml" />
 
+  <include package="zope.app.appsetup" />
+  <include package="zope.app.http" />
+  <include package="zope.app.publication" />
+  <include package="zope.app.publisher" />
+  <include package="zope.app.renderer" />
+  <include package="zope.app.wsgi" />
+  <include package="zope.annotation" />
   <include package="zope.catalog" />
+  <include package="zope.component" />
+  <include package="zope.componentvocabulary" />
+  <include package="zope.contentprovider" />
   <include package="zope.copypastemove" />
-  <include package="zope.contentprovider" />
   <include package="zope.formlib" />
+  <include package="zope.i18n.locales" />
   <include package="zope.intid" />
-  <include package="zope.i18n.locales" />
   <include package="zope.keyreference" />
+  <include package="zope.location" />
+  <include package="zope.login" />
   <include package="zope.password" />
+  <include package="zope.principalregistry" />
   <include package="zope.publisher" />
+  <include package="zope.security " />
   <include package="zope.securitypolicy" />
   <include package="zope.session" />
+  <include package="zope.site" />
   <include package="zope.size" />
   <include package="zope.traversing" />
   <include package="zope.traversing.browser" />
 
-  <include package="zope.app.zcmlfiles" />
-  <include package="zope.app.renderer" />
-
   <include package="grokcore.view" />
   <include package="grokcore.viewlet" />
   <include package="grokcore.formlib" />