Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.

doc/CHANGES.rst

@@ -11,6 +11,8 @@ Trunk (unreleased)
 Restructuring
 +++++++++++++
 
+- Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.
+
 - Moved ``Products/Five/event.zcml`` into the OFS package.
 
 - Removed no longer maintained ``configure, make, make install`` related

src/Products/Five/configure.zcml

@@ -5,10 +5,10 @@
   <include file="permissions.zcml" />
   <include file="i18n.zcml" />
   <include file="deprecated.zcml"/>
-  <include file="publisher.zcml"/>
   <include file="traversing.zcml"/>
 
   <include package="OFS "/>
+  <include package="ZPublisher" />
 
   <include package=".component" />
   <include package=".browser" />

src/Products/Five/publisher.zcml

 <configure xmlns="http://namespaces.zope.org/zope">
 
-  <interface interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
-
-  <interface
-      interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
-      type="zope.publisher.interfaces.browser.IBrowserSkinType"
-      />
-
-  <class class="ZPublisher.HTTPRequest.HTTPRequest">
-    <implements
-        interface="zope.annotation.interfaces.IAttributeAnnotatable"
-        />
-  </class>
-
-  <adapter
-      name="default"
-      factory="zope.publisher.browser.getDefaultSkin"
-      for="zope.publisher.interfaces.browser.IBrowserRequest"
-      provides="zope.publisher.interfaces.IDefaultSkin"
-      />
+  <include package="ZPublisher" file="publisher.zcml"/>
 
 </configure>

src/ZPublisher/configure.zcml

+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <include file="publisher.zcml"/>
+
+</configure>

src/ZPublisher/publisher.zcml

+<configure xmlns="http://namespaces.zope.org/zope">
+
+  <interface interface="zope.publisher.interfaces.browser.IBrowserSkinType" />
+
+  <interface
+      interface="zope.publisher.interfaces.browser.IDefaultBrowserLayer"
+      type="zope.publisher.interfaces.browser.IBrowserSkinType"
+      />
+
+  <class class="ZPublisher.HTTPRequest.HTTPRequest">
+    <implements
+        interface="zope.annotation.interfaces.IAttributeAnnotatable"
+        />
+  </class>
+
+  <adapter
+      name="default"
+      factory="zope.publisher.browser.getDefaultSkin"
+      for="zope.publisher.interfaces.browser.IBrowserRequest"
+      provides="zope.publisher.interfaces.IDefaultSkin"
+      />
+
+</configure>