[Zope-CVS] CVS: Packages3/workflow/stateful - configure.zcml:1.5 contentworkflow.py:1.4

[Ulrich Eck]

Update of /cvs-repository/Packages3/workflow/stateful
In directory cvs.zope.org:/tmp/cvs-serv20767/stateful

Modified Files:
	configure.zcml contentworkflow.py 
Log Message:
checkpoint (updates for use-config/local-utility-branch changes)
(ATTENTION: this will not work until Jim has merged the local-utility-branch)
Updated everything to match the current configuration machinery


=== Packages3/workflow/stateful/configure.zcml 1.4 => 1.5 ===
--- Packages3/workflow/stateful/configure.zcml:1.4	Fri Feb  7 16:50:52 2003
+++ Packages3/workflow/stateful/configure.zcml	Wed Mar 19 12:00:43 2003
@@ -1,106 +1,109 @@
-<zopeConfigure
-   xmlns="http://namespaces.zope.org/zope">
-
-<!-- Stateful ProcessDefintion -->
-
-<content class="zope.app.workflow.stateful.definition.StatefulProcessDefinition">
-  <factory
-      id="StatefulProcessDefinition"
-      permission="zope.workflow.ManageProcessDefinitions"
-      />
-  <require
-      permission="zope.workflow.ManageProcessDefinitions"
-      interface="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
-      set_schema="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition" 
-      />
-  <require
-      permission="zope.workflow.ManageProcessDefinitions"
-      interface="zope.app.interfaces.container.IReadContainer" 
-      />
-  <implements 
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
-      />
-</content>
-
-
-
-<!-- States Container -->
-
-<content class="zope.app.workflow.stateful.definition.StatesContainer">
-  <factory
-      id="StatefulStatesContainer"
-      permission="zope.workflow.ManageProcessDefinitions"
-      />
-  <require
-      permission="zope.workflow.ManageProcessDefinitions"
-      interface="zope.app.interfaces.workflow.stateful.IStatefulStatesContainer" 
-      />
-  <implements 
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
-      />
-</content>
-
-<!-- State -->
-
-<content class="zope.app.workflow.stateful.definition.State">
-  <factory
-      id="StatefulState"
-      permission="zope.workflow.ManageProcessDefinitions"
-      />
-  <require
-      permission="zope.workflow.ManageProcessDefinitions"
-      interface="zope.app.interfaces.workflow.stateful.IState"
-      set_schema="zope.app.interfaces.workflow.stateful.IState"
-      />
-  <implements 
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
-      />
-</content>
-
-<!-- Transitions Container -->
-
-<content class="zope.app.workflow.stateful.definition.TransitionsContainer">
-  <factory
-      id="StatefulTransitionsContainer"
-      permission="zope.workflow.ManageProcessDefinitions"
-      />
-  <require
-      permission="zope.workflow.ManageProcessDefinitions"
-      interface="zope.app.interfaces.workflow.stateful.IStatefulTransitionsContainer" 
-      />
-  <implements 
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
-      />
-</content>
-
-<!-- Transition -->
-
-<content class="zope.app.workflow.stateful.definition.Transition">
-  <factory
-      id="StatefulTransition"
-      permission="zope.workflow.ManageProcessDefinitions"
-      />
-  <require
-      permission="zope.workflow.ManageProcessDefinitions"
-      interface="zope.app.interfaces.workflow.stateful.ITransition" 
-      set_schema="zope.app.interfaces.workflow.stateful.ITransition"
-      />
-  <implements 
-      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
-      />
-</content>
-
-<!-- ContentWorkflowsUtility -->
-
-<content class="zope.app.workflow.stateful.contentworkflow.ContentWorkflowsUtility">
-  <require
-    permission="zope.ManageServices"
-    interface="zope.app.interfaces.workflow.stateful.IContentWorkflowsUtility"
-    />
-  <factory
-    id="ContentWorkflowsUtility"
-    permission="zope.ManageServices"
-    />
-</content>
-
-</zopeConfigure>
+<zopeConfigure
+   xmlns="http://namespaces.zope.org/zope">
+
+<!-- Stateful ProcessDefintion -->
+
+<content class="zope.app.workflow.stateful.definition.StatefulProcessDefinition">
+  <factory
+      id="StatefulProcessDefinition"
+      permission="zope.workflow.ManageProcessDefinitions"
+      />
+  <require
+      permission="zope.workflow.ManageProcessDefinitions"
+      interface="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+      set_schema="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition" 
+      />
+  <require
+      permission="zope.workflow.ManageProcessDefinitions"
+      interface="zope.app.interfaces.container.IReadContainer" 
+      />
+  <implements 
+      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
+      />
+  <implements 
+      interface="zope.app.interfaces.services.configuration.IUseConfigurable" 
+      />
+</content>
+
+
+
+<!-- States Container -->
+
+<content class="zope.app.workflow.stateful.definition.StatesContainer">
+  <factory
+      id="StatefulStatesContainer"
+      permission="zope.workflow.ManageProcessDefinitions"
+      />
+  <require
+      permission="zope.workflow.ManageProcessDefinitions"
+      interface="zope.app.interfaces.workflow.stateful.IStatefulStatesContainer" 
+      />
+  <implements 
+      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
+      />
+</content>
+
+<!-- State -->
+
+<content class="zope.app.workflow.stateful.definition.State">
+  <factory
+      id="StatefulState"
+      permission="zope.workflow.ManageProcessDefinitions"
+      />
+  <require
+      permission="zope.workflow.ManageProcessDefinitions"
+      interface="zope.app.interfaces.workflow.stateful.IState"
+      set_schema="zope.app.interfaces.workflow.stateful.IState"
+      />
+  <implements 
+      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
+      />
+</content>
+
+<!-- Transitions Container -->
+
+<content class="zope.app.workflow.stateful.definition.TransitionsContainer">
+  <factory
+      id="StatefulTransitionsContainer"
+      permission="zope.workflow.ManageProcessDefinitions"
+      />
+  <require
+      permission="zope.workflow.ManageProcessDefinitions"
+      interface="zope.app.interfaces.workflow.stateful.IStatefulTransitionsContainer" 
+      />
+  <implements 
+      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
+      />
+</content>
+
+<!-- Transition -->
+
+<content class="zope.app.workflow.stateful.definition.Transition">
+  <factory
+      id="StatefulTransition"
+      permission="zope.workflow.ManageProcessDefinitions"
+      />
+  <require
+      permission="zope.workflow.ManageProcessDefinitions"
+      interface="zope.app.interfaces.workflow.stateful.ITransition" 
+      set_schema="zope.app.interfaces.workflow.stateful.ITransition"
+      />
+  <implements 
+      interface="zope.app.interfaces.annotation.IAttributeAnnotatable" 
+      />
+</content>
+
+<!-- ContentWorkflowsUtility -->
+
+<content class="zope.app.workflow.stateful.contentworkflow.ContentWorkflowsUtility">
+  <require
+    permission="zope.ManageServices"
+    interface="zope.app.interfaces.workflow.stateful.IContentWorkflowsUtility"
+    />
+  <factory
+    id="ContentWorkflowsUtility"
+    permission="zope.ManageServices"
+    />
+</content>
+
+</zopeConfigure>


=== Packages3/workflow/stateful/contentworkflow.py 1.3 => 1.4 ===
--- Packages3/workflow/stateful/contentworkflow.py:1.3	Mon Feb 24 12:57:39 2003
+++ Packages3/workflow/stateful/contentworkflow.py	Wed Mar 19 12:00:43 2003
@@ -28,7 +28,7 @@
 
 from zope.app.interfaces.event import ISubscriber
 from zope.app.interfaces.event import IObjectCreatedEvent
-from zope.app.services.servicenames import Events, Workflows
+from zope.app.services.servicenames import EventSubscription, Workflows
 
 from zope.app.interfaces.workflow import IProcessInstanceContainer
 from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
@@ -110,7 +110,7 @@
 
     def _getChannel(self, channel):
         if channel is None:
-            channel = getService(self, Events)
+            channel = getService(self, EventSubscription)
         return channel
     _getChannel = ContextMethod(_getChannel)