[Zope3-checkins] CVS: Zope3/src/zope/app/services - configure.zcml:1.28.10.1

Steve Alexander steve@cat-box.net
Thu, 15 May 2003 10:50:00 -0400


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

Modified Files:
      Tag: stevea-decorators-branch
	configure.zcml 
Log Message:
More work on Decorators.
Converted existing tests to use decorators instead of ZopeContainerAdapter.


=== Zope3/src/zope/app/services/configure.zcml 1.28 => 1.28.10.1 ===
--- Zope3/src/zope/app/services/configure.zcml:1.28	Tue Apr 22 12:54:32 2003
+++ Zope3/src/zope/app/services/configure.zcml	Thu May 15 10:49:30 2003
@@ -139,6 +139,7 @@
       permission="zope.ManageServices"
       interface="zope.app.interfaces.container.IContainer"
       />
+  <decorate decorator="zope.app.container.contextdecorator" type="context" />
 </content>
 
 <content class="zope.app.services.role.Role">
@@ -199,6 +200,10 @@
 <!-- Service Manager -->
 
   <content class="zope.app.services.service.ServiceManager">
+    <decorate
+        decorator="zope.app.container.contextdecorator"
+        type="context"
+        />
     <require
         permission="zope.View"
         interface="zope.app.interfaces.container.IReadContainer" />
@@ -244,6 +249,10 @@
     <implements
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
 
+    <decorate
+        decorator="zope.app.container.contextdecorator"
+        type="context"
+        />
     </content>
 
   <content class="zope.app.services.folder.SiteManagementFolder">
@@ -257,16 +266,19 @@
         />
     <implements
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-
+    <decorate
+        decorator="zope.app.container.contextdecorator"
+        type="context"
+        />
     </content>
 
 <!-- Configuration Manager -->
 
   <content class="zope.app.services.configuration.ConfigurationManager">
     <factory
-        id = "zope.app.services.ConfigurationManager"
-        permission = "zope.ManageServices"
-        title = "Configuration Manager" />
+        id="zope.app.services.ConfigurationManager"
+        permission="zope.ManageServices"
+        title="Configuration Manager" />
     <require
         permission="zope.View"
         interface="zope.app.interfaces.container.IReadContainer" />
@@ -276,12 +288,16 @@
         zope.app.interfaces.container.IWriteContainer
         zope.app.interfaces.services.configuration.IOrderedContainer
         zope.app.interfaces.container.IDeleteNotifiable
-        " 
+        "
         />
     <implements
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
         />
-    </content>
+    <decorate
+        decorator="zope.app.container.contextdecorator"
+        type="context"
+        />
+  </content>
 
 <!-- Modules -->
 
@@ -315,7 +331,12 @@
         />
     <implements
         interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-    </content>
+
+    <decorate
+        decorator="zope.app.container.contextdecorator"
+        type="context"
+        />
+  </content>
 
 <!-- Connection Service -->
 
@@ -427,8 +448,11 @@
     <require
         permission="zope.ManageServices"
         interface="zope.app.interfaces.container.IContainer" />
-
-    </content>
+    <decorate
+        decorator="zope.app.container.contextdecorator"
+        type="context"
+        />
+  </content>
 
   <content class="zope.app.services.auth.User">
     <factory id="User" permission="zope.ManageServices" />