[Checkins] SVN: z3c.dav/trunk/src/z3c/dav/ Merge the z3-configure.zcml file into the configure.zcml file most of the

[Michael Kerrin]

Log message for revision 75729:
  Merge the z3-configure.zcml file into the configure.zcml file most of the
  functionality configured here as being moved off into its own package.
  

Changed:
  U   z3c.dav/trunk/src/z3c/dav/configure.zcml
  D   z3c.dav/trunk/src/z3c/dav/z3-configure.zcml

-=-
Modified: z3c.dav/trunk/src/z3c/dav/configure.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/configure.zcml	2007-05-13 20:45:57 UTC (rev 75728)
+++ z3c.dav/trunk/src/z3c/dav/configure.zcml	2007-05-13 21:02:50 UTC (rev 75729)
@@ -228,10 +228,40 @@
      />
 
   <!--
-      Zope3 support for WebDAV
+      Zope3 support for WebDAV. Since zope.app.folder is the only content
+      component that is a dependency of zope.app.zcmlfiles we will include
+      support for it directly in this package. The default ZODB root folder
+      is also a zope.app.folder object so that is another reason this is the
+      only content object supported directly by z3c.dav.
+
+      Other content objects are supported from within the z3c.davapp namespace.
+      Although you will probable need to do some work to support any custom
+      content types.
     -->
-  <include file="z3-configure.zcml" />
+  <adapter
+     for="zope.app.folder.interfaces.IFolder
+          zope.publisher.interfaces.http.IHTTPRequest"
+     factory=".adapters.DAVDublinCore"
+     />
 
+  <adapter
+     for="zope.app.folder.interfaces.IFolder"
+     factory=".adapters.OpaqueProperties"
+     trusted="1"
+     />
+
+  <class class=".adapters.OpaqueProperties">
+    <require
+       permission="zope.Public"
+       attributes="getAllProperties hasProperty getProperty"
+       />
+
+    <require
+       permission="zope.ManageContent"
+       attributes="setProperty removeProperty"
+       />
+  </class>
+
   <configure
      xmlns:zcml="http://namespaces.zope.org/zcml"
      zcml:condition="have apidoc"

Deleted: z3c.dav/trunk/src/z3c/dav/z3-configure.zcml
===================================================================
--- z3c.dav/trunk/src/z3c/dav/z3-configure.zcml	2007-05-13 20:45:57 UTC (rev 75728)
+++ z3c.dav/trunk/src/z3c/dav/z3-configure.zcml	2007-05-13 21:02:50 UTC (rev 75729)
@@ -1,34 +0,0 @@
-<configure xmlns="http://namespaces.zope.org/zope">
-
-  <!--
-      Zope3 webdav support - this should all be in a seperate Zope3 package.
-    -->
-
-  <!--
-      The folder package is a dependency of the zcmlfiles package
-  -->
-  <adapter
-     for="zope.app.folder.interfaces.IFolder
-          zope.publisher.interfaces.http.IHTTPRequest"
-     factory=".adapters.DAVDublinCore"
-     />
-
-  <adapter
-     for="zope.app.folder.interfaces.IFolder"
-     factory=".adapters.OpaqueProperties"
-     trusted="1"
-     />
-
-  <class class=".adapters.OpaqueProperties">
-    <require
-       permission="zope.Public"
-       attributes="getAllProperties hasProperty getProperty"
-       />
-
-    <require
-       permission="zope.ManageContent"
-       attributes="setProperty removeProperty"
-       />
-  </class>
-
-</configure>