[Checkins] SVN: zope.app.file/trunk/ Use zope.site instead of zope.app.folder. Add missing dependency.

[Sylvain Viollon]

Log message for revision 95576:
  Use zope.site instead of zope.app.folder. Add missing dependency.
  
  

Changed:
  U   zope.app.file/trunk/CHANGES.txt
  U   zope.app.file/trunk/setup.py
  U   zope.app.file/trunk/src/zope/app/file/configure.zcml

-=-
Modified: zope.app.file/trunk/CHANGES.txt
===================================================================
--- zope.app.file/trunk/CHANGES.txt	2009-01-30 15:26:00 UTC (rev 95575)
+++ zope.app.file/trunk/CHANGES.txt	2009-01-30 15:40:14 UTC (rev 95576)
@@ -2,10 +2,11 @@
 CHANGES
 =======
 
-3.4.7 (unreleased)
+3.5.0 (unreleased)
 ------------------
 
-- ...
+- Replace ``zope.app.folder`` use by ``zope.site``. Add missing
+  dependency in ``setup.py``.
 
 3.4.6 (2009-01-27)
 ------------------
@@ -22,8 +23,8 @@
 3.4.4 (2008-09-05)
 ------------------
 
-- Bug: Get actual filename instead of full filesystem path when adding file/image
-  using Internet Explorer.
+- Bug: Get actual filename instead of full filesystem path when adding
+  file/image using Internet Explorer.
 
 3.4.3 (2008-06-18)
 ------------------

Modified: zope.app.file/trunk/setup.py
===================================================================
--- zope.app.file/trunk/setup.py	2009-01-30 15:26:00 UTC (rev 95575)
+++ zope.app.file/trunk/setup.py	2009-01-30 15:40:14 UTC (rev 95576)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.file',
-      version = '3.4.7dev',
+      version = '3.5.0dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='File and Image -- Zope 3 Content Components',
@@ -69,6 +69,7 @@
                         'zope.interface',
                         'zope.publisher',
                         'zope.schema',
+                        'zope.site',
                         'zope.size',
                         ],
       include_package_data = True,

Modified: zope.app.file/trunk/src/zope/app/file/configure.zcml
===================================================================
--- zope.app.file/trunk/src/zope/app/file/configure.zcml	2009-01-30 15:26:00 UTC (rev 95575)
+++ zope.app.file/trunk/src/zope/app/file/configure.zcml	2009-01-30 15:40:14 UTC (rev 95576)
@@ -6,15 +6,15 @@
 
   <!-- setting up content types -->
 
-  <interface 
-      interface=".interfaces.IFile" 
+  <interface
+      interface=".interfaces.IFile"
       type="zope.app.content.interfaces.IContentType"
-      /> 
+      />
 
-  <interface 
-      interface=".interfaces.IImage" 
+  <interface
+      interface=".interfaces.IImage"
       type="zope.app.content.interfaces.IContentType"
-      /> 
+      />
 
   <permission
       id="zope.AddImages"
@@ -74,26 +74,28 @@
       for=".interfaces.IImage"
       />
 
-  <adapter 
+  <adapter
       for=".interfaces.IFile"
       provides="zope.filerepresentation.interfaces.IReadFile"
       factory=".file.FileReadFile"
       permission="zope.View"
       />
 
-  <adapter 
+  <adapter
       for=".interfaces.IFile"
       provides="zope.filerepresentation.interfaces.IWriteFile"
       factory=".file.FileWriteFile"
       permission="zope.ManageContent"
       />
 
+  <!-- FIXME: This should be register on an higher level container
+  than folder -->
   <adapter
-      for="zope.app.folder.interfaces.IFolder"
-      provides="zope.filerepresentation.interfaces.IFileFactory"
-      factory=".image.FileFactory"
-      permission="zope.ManageContent"
-      />
+     for="zope.site.interfaces.IFolder"
+     provides="zope.filerepresentation.interfaces.IFileFactory"
+     factory=".image.FileFactory"
+     permission="zope.ManageContent"
+     />
 
 
   <!-- include browser package -->