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

[Jim Fulton]

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

Modified Files:
      Tag: ZopeDublinCore-branch
	Folder.py configure.zcml 
Log Message:
Commiting branch prior to merge

=== Zope3/lib/python/Zope/App/OFS/Content/Folder/Folder.py 1.4 => 1.4.2.1 ===
--- Zope3/lib/python/Zope/App/OFS/Content/Folder/Folder.py:1.4	Thu Aug  1 14:42:09 2002
+++ Zope3/lib/python/Zope/App/OFS/Content/Folder/Folder.py	Fri Oct  4 13:30:09 2002
@@ -31,7 +31,7 @@
 class Folder(Persistence.Persistent, ServiceManagerContainer):
     """The standard Zope Folder implementation."""
 
-    __implements__ = IFolder, IAnnotatable
+    __implements__ = IFolder
     
     def __init__(self):
         self.data = OOBTree()


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/configure.zcml 1.7.2.1 => 1.7.2.2 ===
--- Zope3/lib/python/Zope/App/OFS/Content/Folder/configure.zcml:1.7.2.1	Thu Oct  3 18:16:50 2002
+++ Zope3/lib/python/Zope/App/OFS/Content/Folder/configure.zcml	Fri Oct  4 13:30:09 2002
@@ -3,79 +3,105 @@
 <!-- Simple Folder Directives -->
 
 <content class=".Folder.">
+
   <implements interface="Zope.App.OFS.Container.IContentContainer." />
-  <implements interface="Zope.App.DublinCore.IZopeDublinCoreAnnotatable." />
+
+  <implements interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
   
   <factory
       id="Folder"
       permission="Zope.ManageContent"
       title="Folder"
       description="Minimal folder" />
+
   <allow
-      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
+      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.Read"
+      />
+
   <require
       permission="Zope.ManageServices"
-      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
+      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.Write"
+      />
+
   <require
       permission="Zope.View"
-      interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
+      interface="Zope.App.OFS.Container.IContainer.IReadContainer" 
+      />
+
   <require
       permission="Zope.ManageContent"
-      interface="Zope.App.OFS.Container.IContainer.IWriteContainer" />
+      interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
+      />
+
 </content>
 
 <!-- XXX Do we really need RootFolder? -->
+
 <content class=".RootFolder.">
+
   <implements interface="Zope.App.OFS.Container.IContentContainer." />
+
   <require like_class=".Folder." />
+
+  <implements interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
+
 </content>
 
 <!-- Loaded Folder Directives -->
+
 <content class=".LoadedFolder.">
+
+  <implements interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
+
   <implements interface="Zope.App.OFS.Container.IContentContainer." />
-  <implements interface="Zope.App.DublinCore.IZopeDublinCoreAnnotatable." />
+
   <factory
       id="LoadedFolder"
       permission="Zope.ManageContent"
       title="Loaded Folder"
-      description="A Folder having all the goodies." />
+      description="A Folder having all the goodies."
+      />
 
   <allow
-      interface="
-Zope.App.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
+      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.Read"
+      />
+
   <require
       permission="Zope.ManageServices"
-      interface="
-Zope.App.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
+      interface="Zope.App.ComponentArchitecture.IServiceManagerContainer.Write"
+      />
+
   <require
       permission="Zope.View"
-      interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
+      interface="Zope.App.OFS.Container.IContainer.IReadContainer"
+      />
+
   <require
       permission="Zope.ManageContent"
-      interface="Zope.App.OFS.Container.IContainer.IWriteContainer" />
+      interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
+      />
+
   <require
       permission="Zope.View"
-      interface="
-           Zope.App.OFS.Container.IOrderedContainer.IReadOrderedContainer" />
+      interface="Zope.App.OFS.Container.IOrderedContainer.Read" 
+      />
+
   <require
       permission="Zope.ManageContent"
       interface="
-      Zope.App.OFS.Container.IOrderedContainer.IWriteOrderedContainer" />
+      Zope.App.OFS.Container.IOrderedContainer.Write" />
+
   <require
       permission="Zope.View"
-      interface="Zope.App.OFS.Container.IContainerLimit.IReadContainerLimit" />
+      interface="Zope.App.OFS.Container.IContainerLimit.IReadContainerLimit"
+      />
+
   <require
       permission="Zope.ManageContent"
-      interface=
-          "Zope.App.OFS.Container.IContainerLimit.IWriteContainerLimit" />
-</content>
-
-<adapter
-    factory="Zope.App.OFS.Annotation.AttributeAnnotations."
-    provides="Zope.App.OFS.Annotation.IAnnotations."
-    for=".Folder.IFolder." />
+      interface="Zope.App.OFS.Container.IContainerLimit.IWriteContainerLimit"
+      />
 
-<!-- Further Directives -->
+</content>
 
 <include package=".Views" />