[Zope3-checkins] CVS: Zope3/src/zope/app/container - configure.zcml:1.19

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/container
In directory cvs.zope.org:/tmp/cvs-serv13194/src/zope/app/container

Modified Files:
	configure.zcml 
Log Message:
Got rid of the zope-container decorators/adapters.

Added the INameChooser adapter.

Moved the location-relavent event definitions from event to container.


=== Zope3/src/zope/app/container/configure.zcml 1.18 => 1.19 ===
--- Zope3/src/zope/app/container/configure.zcml:1.18	Fri Sep  5 14:43:20 2003
+++ Zope3/src/zope/app/container/configure.zcml	Sun Sep 21 13:31:29 2003
@@ -31,45 +31,6 @@
       for="zope.app.interfaces.container.IReadContainer"
       />
 
-  <!-- Decorators for different flavours of container -->
-  <adapter
-      factory="zope.app.container.zopecontainer.ZopeItemContainerDecorator"
-      provides="zope.app.interfaces.context.IZopeContextWrapper"
-      for="zope.app.interfaces.container.IItemContainer"
-      />
-  <adapter
-      factory="
-      zope.app.container.zopecontainer.ZopeSimpleReadContainerDecorator"
-      provides="zope.app.interfaces.context.IZopeContextWrapper"
-      for="zope.app.interfaces.container.ISimpleReadContainer"
-      />
-  <adapter
-      factory="
-      zope.app.container.zopecontainer.ZopeReadContainerDecorator"
-      provides="zope.app.interfaces.context.IZopeContextWrapper"
-      for="zope.app.interfaces.container.IReadContainer"
-      />
-  <adapter
-      factory="
-      zope.app.container.zopecontainer.ZopeItemWriteContainerDecorator"
-      provides="zope.app.interfaces.context.IZopeContextWrapper"
-      for="zope.app.interfaces.container.IItemWriteContainer"
-      />
-  <adapter
-      factory="zope.app.container.zopecontainer.ZopeContainerDecorator"
-      provides="zope.app.interfaces.context.IZopeContextWrapper"
-      for="zope.app.interfaces.container.IContainer"
-      />
-
-  <!-- XXX There is a sticky question of what permission 'rename' should have.
-           See src/zope/app/context.txt for further discussion.
-    -->
-  <class class="zope.app.container.zopecontainer.ZopeContainerDecorator">
-    <require
-        attributes="rename"
-        permission="zope.ManageServices"
-        />
-  </class>
 
   <adapter
       factory="zope.app.container.size.ContainerSized"
@@ -77,9 +38,15 @@
       for="zope.app.interfaces.container.IReadContainer"
       />
 
+  <adapter
+      provides="zope.app.interfaces.container.INameChooser"
+      for="zope.app.interfaces.container.IWriteContainer"
+      factory=".contained.NameChooser"
+      />
+
   <event:subscribe
       subscriber=".dependency.CheckDependency"
-      event_types="zope.app.interfaces.event.IObjectRemovedEvent"
+      event_types="zope.app.interfaces.container.IObjectRemovedEvent"
       />
 
 </configure>