[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/Folder - configure.zcml:1.6

[Stephan Richter]

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

Modified Files:
	configure.zcml 
Log Message:
- Added descriptions to last Services

- Removed old-style menu entries

- Started more aggressivly to convert ZCML to Steve's style suggestions


=== Zope3/lib/python/Zope/App/OFS/Content/Folder/configure.zcml 1.5 => 1.6 ===
-<zopeConfigure xmlns='http://namespaces.zope.org/zope'>
+<zopeConfigure xmlns="http://namespaces.zope.org/zope">
 
-  <!-- Simple Folder Directives -->
+<!-- Simple Folder Directives -->
 
-  <content class=".Folder.">
-    <implements interface="Zope.App.OFS.Container.IContentContainer." />
-    <factory
-        id="Folder"
-        permission="Zope.ManageContent"
-        title="Folder"
-        description="Minimal folder" />
-    <allow
-        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" 
-        />
-    <require
-        permission="Zope.ManageServices"
-        interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" 
-        />
-    <require
-        permission="Zope.View"
-        interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
-    <require
-        permission="Zope.ManageContent"
-        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." />
-  </content>
-
-  <!-- Loaded Folder Directives -->
-  <content class=".LoadedFolder.">
-    <implements interface="Zope.App.OFS.Container.IContentContainer." />
-    <factory
-        id="LoadedFolder"
-        permission="Zope.ManageContent"
-        title="Loaded Folder"
-        description="A Folder having all the goodies." />
-
-    <allow
-        interface="
-Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer
-         " 
-        />
-    <require
-        permission="Zope.ManageServices"
-        interface="
-Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer
-        " 
-        />
-    <require
-        permission="Zope.View"
-        interface="Zope.App.OFS.Container.IContainer.IReadContainer"
-        />
-    <require
-        permission="Zope.ManageContent"
-        interface="Zope.App.OFS.Container.IContainer.IWriteContainer"
-        />
-    <require
-        permission="Zope.View"
-        interface="
-               Zope.App.OFS.Container.IOrderedContainer.IReadOrderedContainer"
-         />
-    <require
-        permission="Zope.ManageContent"
-        interface="
-        Zope.App.OFS.Container.IOrderedContainer.IWriteOrderedContainer"
-        />
-    <require
-        permission="Zope.View"
-        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." />
+<content class=".Folder.">
+  <implements interface="Zope.App.OFS.Container.IContentContainer." />
+  <factory
+      id="Folder"
+      permission="Zope.ManageContent"
+      title="Folder"
+      description="Minimal folder" />
+  <allow
+      interface="Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
+  <require
+      permission="Zope.ManageServices"
+      interface="Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
+  <require
+      permission="Zope.View"
+      interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
+  <require
+      permission="Zope.ManageContent"
+      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." />
+</content>
+
+<!-- Loaded Folder Directives -->
+<content class=".LoadedFolder.">
+  <implements interface="Zope.App.OFS.Container.IContentContainer." />
+  <factory
+      id="LoadedFolder"
+      permission="Zope.ManageContent"
+      title="Loaded Folder"
+      description="A Folder having all the goodies." />
+
+  <allow
+      interface="
+Zope.ComponentArchitecture.IServiceManagerContainer.IReadServiceManagerContainer" />
+  <require
+      permission="Zope.ManageServices"
+      interface="
+Zope.ComponentArchitecture.IServiceManagerContainer.IWriteServiceManagerContainer" />
+  <require
+      permission="Zope.View"
+      interface="Zope.App.OFS.Container.IContainer.IReadContainer" />
+  <require
+      permission="Zope.ManageContent"
+      interface="Zope.App.OFS.Container.IContainer.IWriteContainer" />
+  <require
+      permission="Zope.View"
+      interface="
+           Zope.App.OFS.Container.IOrderedContainer.IReadOrderedContainer" />
+  <require
+      permission="Zope.ManageContent"
+      interface="
+      Zope.App.OFS.Container.IOrderedContainer.IWriteOrderedContainer" />
+  <require
+      permission="Zope.View"
+      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." />
 
-  <!-- Further Directives -->
+<!-- Further Directives -->
 
-  <include package=".Views" />
+<include package=".Views" />
 
 </zopeConfigure>