[Checkins] SVN: zope.app.apidoc/trunk/ Made most tests work again. There's still something incompatible

[Martijn Faassen]

Log message for revision 95577:
  Made most tests work again. There's still something incompatible
  with ZODB 3.8.0 but it's unlikely that was caused by our refactoring.
  

Changed:
  U   zope.app.apidoc/trunk/CHANGES.txt
  U   zope.app.apidoc/trunk/setup.py
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.zcml
  U   zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt

-=-
Modified: zope.app.apidoc/trunk/CHANGES.txt
===================================================================
--- zope.app.apidoc/trunk/CHANGES.txt	2009-01-30 15:40:14 UTC (rev 95576)
+++ zope.app.apidoc/trunk/CHANGES.txt	2009-01-30 15:46:31 UTC (rev 95577)
@@ -7,6 +7,9 @@
 
 - Use zope.container instead of zope.app.container.
 
+- Use zope.site instead of zope.app.component and zope.app.folder (in
+  at least a few places).
+
 3.5.0 (2009-01-17)
 ------------------
 

Modified: zope.app.apidoc/trunk/setup.py
===================================================================
--- zope.app.apidoc/trunk/setup.py	2009-01-30 15:40:14 UTC (rev 95576)
+++ zope.app.apidoc/trunk/setup.py	2009-01-30 15:46:31 UTC (rev 95577)
@@ -84,6 +84,7 @@
         'zope.configuration',
         'zope.deprecation',
         'zope.i18n',
+        'zope.site',
         'zope.interface',
         'zope.location',
         'zope.proxy',

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.zcml
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.zcml	2009-01-30 15:40:14 UTC (rev 95576)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/bookmodule/book.zcml	2009-01-30 15:46:31 UTC (rev 95577)
@@ -75,7 +75,7 @@
         />
   </configure>
 
-  <configure package="zope.app.component">
+  <configure package="zope.site">
     <bookchapter
         id="local"
         title="Local Component Architecture"

Modified: zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt
===================================================================
--- zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt	2009-01-30 15:40:14 UTC (rev 95576)
+++ zope.app.apidoc/trunk/src/zope/app/apidoc/codemodule/browser/README.txt	2009-01-30 15:46:31 UTC (rev 95577)
@@ -473,7 +473,7 @@
 root folder:
 
   >>> rootFolder
-  <zope.app.folder.folder.Folder object at ...>
+  <zope.site.folder.Folder object at ...>
 
 Now we instantiate the view
 
@@ -505,8 +505,7 @@
   >>> ifaces = inspect.getDirectlyProvidedInterfaces()
   >>> ifaces.sort()
   >>> ifaces
-  ['zope.app.folder.interfaces.IRootFolder',
-   'zope.location.interfaces.ISite']
+  ['zope.location.interfaces.ISite', 'zope.site.interfaces.IRootFolder']
 
 The ``getProvidedInterfaces()`` and ``getBases()`` method simply forwards its
 request to the class documentation view. Thus the next method is