[Checkins] SVN: grok/branches/sylvain-testlayers/s Clean up zope.app.publisher from ZCML. Cannot quite let it go

[Martijn Faassen]

Log message for revision 111486:
  Clean up zope.app.publisher from ZCML. Cannot quite let it go
  yet from dependencies, however, due to XMLRPC support.
  

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-27 15:03:39 UTC (rev 111485)
+++ grok/branches/sylvain-testlayers/setup.py	2010-04-27 15:09:02 UTC (rev 111486)
@@ -60,6 +60,7 @@
                       'zope.annotation',
                       'zope.app.http',
                       'zope.app.publication',
+                      'zope.browserpage',
                       'zope.app.publisher',
                       'zope.catalog',
                       'zope.component',

Modified: grok/branches/sylvain-testlayers/src/grok/configure.zcml
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/configure.zcml	2010-04-27 15:03:39 UTC (rev 111485)
+++ grok/branches/sylvain-testlayers/src/grok/configure.zcml	2010-04-27 15:09:02 UTC (rev 111486)
@@ -4,7 +4,6 @@
     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" />
@@ -18,9 +17,9 @@
   <include package="zope.app.appsetup" />
   <include package="zope.app.http" />
   <include package="zope.app.publication" />
-  <include package="zope.app.publisher" />
   <include package="zope.app.wsgi" />
   <include package="zope.annotation" />
+  <include package="zope.browserpage" />
   <include package="zope.catalog" />
   <include package="zope.component" />
   <include package="zope.componentvocabulary" />