[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder - Folder.py:1.4 configure.zcml:1.7

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/Folder
In directory cvs.zope.org:/tmp/cvs-serv5741/lib/python/Zope/App/OFS/Content/Folder

Modified Files:
	Folder.py configure.zcml 
Log Message:
Removed dependcies of:

  Zope.ComponentArchitecture
  Zope.Configuration
  Zope.Exceptions
  Zope.Testing

on other packages, especially App, in preparation for making these
packages part of Zope 2 and useful outside of the Zope application.

In particular, all placeful service support was moved to
Zope.App.ComponentArchitecture.  

Placeful service implementors should get the nextService and
nextServiceManager functions from
Zope.App.ComponentArchitecture.NextService. 




=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Folder.py 1.3 => 1.4 ===
 
 import Persistence
 from Persistence.BTrees.OOBTree import OOBTree
-from Zope.ComponentArchitecture.ServiceManagerContainer \
+from Zope.App.ComponentArchitecture.ServiceManagerContainer \
      import ServiceManagerContainer
 
-from Zope.ComponentArchitecture.IServiceManagerContainer import \
+from Zope.App.ComponentArchitecture.IServiceManagerContainer import \
      IServiceManagerContainer
 from types import StringTypes
 from Zope.App.OFS.Annotation.IAnnotatable import IAnnotatable


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/configure.zcml 1.6 => 1.7 ===
       title="Folder"
       description="Minimal folder" />
   <allow
-      interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
+      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
   <require
       permission="Zope.ManageServices"
-      interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
+      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
   <require
       permission="Zope.View"
       interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
@@ -39,11 +39,11 @@
 
   <allow
       interface="
-Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
+Zope.App.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
   <require
       permission="Zope.ManageServices"
       interface="
-Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
+Zope.App.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
   <require
       permission="Zope.View"
       interface="Zope.App.OFS.Container.IContainer.IReadContainer" />