[Checkins] SVN: zope.file/trunk/ Move browser zcml to separate file.

[Patrick Strawderman]

Log message for revision 113356:
  Move browser zcml to separate file.
  

Changed:
  U   zope.file/trunk/CHANGES.txt
  A   zope.file/trunk/src/zope/file/browser.zcml
  U   zope.file/trunk/src/zope/file/configure.zcml

-=-
Modified: zope.file/trunk/CHANGES.txt
===================================================================
--- zope.file/trunk/CHANGES.txt	2010-06-11 15:40:16 UTC (rev 113355)
+++ zope.file/trunk/CHANGES.txt	2010-06-11 15:44:28 UTC (rev 113356)
@@ -5,6 +5,9 @@
 0.6.0 (unreleased)
 ------------------
 
+- Move browser-related zcml to `browser.zcml` so that it easier for
+  applications to exclude it.
+
 - Import content-type parser from zope.contenttype, adding a dependency on
   that package.
 

Added: zope.file/trunk/src/zope/file/browser.zcml
===================================================================
--- zope.file/trunk/src/zope/file/browser.zcml	                        (rev 0)
+++ zope.file/trunk/src/zope/file/browser.zcml	2010-06-11 15:44:28 UTC (rev 113356)
@@ -0,0 +1,58 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser"
+    i18n_domain="zope.file"
+    >
+
+  <browser:view
+      for=".interfaces.IFile"
+      name="download"
+      class=".download.Download"
+      permission="zope.View"
+      />
+
+  <browser:view
+      for=".interfaces.IFile"
+      name="inline"
+      class=".download.Inline"
+      permission="zope.View"
+      />
+
+  <browser:view
+      for=".interfaces.IFile"
+      name="display"
+      class=".download.Display"
+      permission="zope.View"
+      />
+
+  <browser:view
+      for=".interfaces.IFile"
+      menu="zmi_views" title="Upload"
+      name="edit.html"
+      class=".upload.Reupload"
+      permission="zope.ManageContent"
+      />
+
+  <browser:view
+      for=".interfaces.IFile"
+      menu="zmi_views" title="Content Type"
+      name="contenttype.html"
+      class=".contenttype.ContentTypeForm"
+      permission="zope.ManageContent"
+      />
+
+  <browser:view
+      for="zope.browser.interfaces.IAdding"
+      name="zope.file.File"
+      class=".upload.Upload"
+      permission="zope.ManageContent"
+      />
+
+  <browser:addMenuItem
+      for="zope.browser.interfaces.IAdding"
+      view="zope.file.File"
+      title="Zope File"
+      class="zope.file.file.File"
+      permission="zope.ManageContent"
+      />
+</configure>

Modified: zope.file/trunk/src/zope/file/configure.zcml
===================================================================
--- zope.file/trunk/src/zope/file/configure.zcml	2010-06-11 15:40:16 UTC (rev 113355)
+++ zope.file/trunk/src/zope/file/configure.zcml	2010-06-11 15:44:28 UTC (rev 113356)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configure
     xmlns="http://namespaces.zope.org/zope"
-    xmlns:browser="http://namespaces.zope.org/browser"
     i18n_domain="zope.file"
     >
 
@@ -49,61 +48,10 @@
            zope.mimetype.interfaces.IContentTypeChangedEvent"
       />
 
-
-  <browser:view
-      for=".interfaces.IFile"
-      name="download"
-      class=".download.Download"
-      permission="zope.View"
-      />
-
-  <browser:view
-      for=".interfaces.IFile"
-      name="inline"
-      class=".download.Inline"
-      permission="zope.View"
-      />
-
-  <browser:view
-      for=".interfaces.IFile"
-      name="display"
-      class=".download.Display"
-      permission="zope.View"
-      />
-
-  <browser:view
-      for=".interfaces.IFile"
-      menu="zmi_views" title="Upload"
-      name="edit.html"
-      class=".upload.Reupload"
-      permission="zope.ManageContent"
-      />
-
-  <browser:view
-      for=".interfaces.IFile"
-      menu="zmi_views" title="Content Type"
-      name="contenttype.html"
-      class=".contenttype.ContentTypeForm"
-      permission="zope.ManageContent"
-      />
-
-  <browser:view
-      for="zope.browser.interfaces.IAdding"
-      name="zope.file.File"
-      class=".upload.Upload"
-      permission="zope.ManageContent"
-      />
-
-  <browser:addMenuItem
-      for="zope.browser.interfaces.IAdding"
-      view="zope.file.File"
-      title="Zope File"
-      class="zope.file.file.File"
-      permission="zope.ManageContent"
-      />
-
   <class class=".download.DownloadResult">
     <allow interface="zope.publisher.http.IResult"/>
   </class>
 
+  <include file="browser.zcml" />
+
 </configure>