[Zope3-checkins] SVN: Zope3/branches/3.3/src/zope/ Move some configuration items from zope.app.publisher to zope.publisher

[Philipp von Weitershausen]

Log message for revision 69028:
  Move some configuration items from zope.app.publisher to zope.publisher
  now that zope.publisher has its own configure.zcml. Especially the apidoc
  directive is important since it will now work when zope.publisher and zope.app
  aren't installed in the same package tree.
  

Changed:
  U   Zope3/branches/3.3/src/zope/app/publisher/browser/configure.zcml
  U   Zope3/branches/3.3/src/zope/app/publisher/configure.zcml
  U   Zope3/branches/3.3/src/zope/publisher/configure.zcml

-=-
Modified: Zope3/branches/3.3/src/zope/app/publisher/browser/configure.zcml
===================================================================
--- Zope3/branches/3.3/src/zope/app/publisher/browser/configure.zcml	2006-07-07 14:39:18 UTC (rev 69027)
+++ Zope3/branches/3.3/src/zope/app/publisher/browser/configure.zcml	2006-07-07 14:56:38 UTC (rev 69028)
@@ -5,9 +5,6 @@
 <interface
   interface="zope.app.publisher.interfaces.browser.IMenuItemType" />
 
-<interface
-  interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
-
 <utility
     name="Browser Skins"
     component=".vocabulary.BrowserSkinsVocabulary"

Modified: Zope3/branches/3.3/src/zope/app/publisher/configure.zcml
===================================================================
--- Zope3/branches/3.3/src/zope/app/publisher/configure.zcml	2006-07-07 14:39:18 UTC (rev 69027)
+++ Zope3/branches/3.3/src/zope/app/publisher/configure.zcml	2006-07-07 14:56:38 UTC (rev 69028)
@@ -7,21 +7,6 @@
   <include package=".xmlrpc" />
   <include file="http.zcml" />
 
-  <interface interface="zope.publisher.interfaces.xmlrpc.IXMLRPCRequest" />
 
-  <configure 
-      xmlns:zcml="http://namespaces.zope.org/zcml"
-      zcml:condition="have apidoc" 
-      xmlns="http://namespaces.zope.org/apidoc"
-      >
-
-    <bookchapter
-        id="zopepublisherhttpresults.txt"
-        title="Creating HTTP Results"
-        doc_path="../../publisher/httpresults.txt"
-        />
-
-  </configure>
-
 </configure>
 

Modified: Zope3/branches/3.3/src/zope/publisher/configure.zcml
===================================================================
--- Zope3/branches/3.3/src/zope/publisher/configure.zcml	2006-07-07 14:39:18 UTC (rev 69027)
+++ Zope3/branches/3.3/src/zope/publisher/configure.zcml	2006-07-07 14:56:38 UTC (rev 69028)
@@ -1,8 +1,24 @@
-<configure xmlns="http://namespaces.zope.org/zope">
+<configure 
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:apidoc="http://namespaces.zope.org/apidoc"
+    xmlns:zcml="http://namespaces.zope.org/zcml"
+    >
+
+  <interface interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
+  <interface interface="zope.publisher.interfaces.xmlrpc.IXMLRPCRequest" />
+
   <adapter factory=".xmlrpc.ListPreMarshaller" />
   <adapter factory=".xmlrpc.TuplePreMarshaller" />
   <adapter factory=".xmlrpc.FaultPreMarshaller" />
   <adapter factory=".xmlrpc.DateTimePreMarshaller" />
   <adapter factory=".xmlrpc.PythonDateTimePreMarshaller" />
   <adapter factory=".xmlrpc.DictPreMarshaller" />
+
+  <apidoc:bookchapter
+      zcml:condition="have apidoc"
+      id="zopepublisherhttpresults.txt"
+      title="Creating HTTP Results"
+      doc_path="publisher/httpresults.txt"
+      />
+
 </configure>