[Zope3-checkins] CVS: Zope3/src/zope/app/workflow/stateful -
configure.zcml:1.6 contentworkflow.py:1.10 definition.py:1.11
instance.py:1.17 testobject.zcml:1.3 xmlimportexport.py:1.8
Philipp von Weitershausen
philikon at philikon.de
Fri Feb 27 11:51:11 EST 2004
Update of /cvs-repository/Zope3/src/zope/app/workflow/stateful
In directory cvs.zope.org:/tmp/cvs-serv22977/workflow/stateful
Modified Files:
configure.zcml contentworkflow.py definition.py instance.py
testobject.zcml xmlimportexport.py
Log Message:
Centralized the workflow interfaces and browser views in
zope.app.workflow.
=== Zope3/src/zope/app/workflow/stateful/configure.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/workflow/stateful/configure.zcml:1.5 Fri Aug 1 16:41:03 2003
+++ Zope3/src/zope/app/workflow/stateful/configure.zcml Fri Feb 27 11:50:39 2004
@@ -13,9 +13,9 @@
<require
permission="zope.workflow.ManageProcessDefinitions"
interface="
- zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+ zope.app.workflow.interfaces.stateful.IStatefulProcessDefinition"
set_schema="
- zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+ zope.app.workflow.interfaces.stateful.IStatefulProcessDefinition"
/>
<require
permission="zope.workflow.ManageProcessDefinitions"
@@ -40,7 +40,7 @@
/>
<require
permission="zope.workflow.ManageProcessDefinitions"
- interface="zope.app.interfaces.workflow.stateful.IStatefulStatesContainer"
+ interface="zope.app.workflow.interfaces.stateful.IStatefulStatesContainer"
/>
<implements
interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
@@ -56,8 +56,8 @@
/>
<require
permission="zope.workflow.ManageProcessDefinitions"
- interface="zope.app.interfaces.workflow.stateful.IState"
- set_schema="zope.app.interfaces.workflow.stateful.IState"
+ interface="zope.app.workflow.interfaces.stateful.IState"
+ set_schema="zope.app.workflow.interfaces.stateful.IState"
/>
<implements
interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
@@ -74,7 +74,7 @@
<require
permission="zope.workflow.ManageProcessDefinitions"
interface=
- "zope.app.interfaces.workflow.stateful.IStatefulTransitionsContainer"
+ "zope.app.workflow.interfaces.stateful.IStatefulTransitionsContainer"
/>
<implements
interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
@@ -90,8 +90,8 @@
/>
<require
permission="zope.workflow.ManageProcessDefinitions"
- interface="zope.app.interfaces.workflow.stateful.ITransition"
- set_schema="zope.app.interfaces.workflow.stateful.ITransition"
+ interface="zope.app.workflow.interfaces.stateful.ITransition"
+ set_schema="zope.app.workflow.interfaces.stateful.ITransition"
/>
<implements
interface="zope.app.interfaces.annotation.IAttributeAnnotatable"
@@ -108,19 +108,19 @@
/>
<require
permission="zope.ManageServices"
- interface="zope.app.interfaces.workflow.stateful.IContentWorkflowsManager"
+ interface="zope.app.workflow.interfaces.stateful.IContentWorkflowsManager"
attributes="cpRegistry"
/>
</content>
<!-- Stateful workflow import/Export -->
<workflow:importHandler
- interface="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+ interface="zope.app.workflow.interfaces.stateful.IStatefulProcessDefinition"
factory=".xmlimportexport.XMLImportHandler"
/>
<workflow:exportHandler
- interface="zope.app.interfaces.workflow.stateful.IStatefulProcessDefinition"
+ interface="zope.app.workflow.interfaces.stateful.IStatefulProcessDefinition"
factory=".xmlimportexport.XMLExportHandler"
/>
=== Zope3/src/zope/app/workflow/stateful/contentworkflow.py 1.9 => 1.10 ===
--- Zope3/src/zope/app/workflow/stateful/contentworkflow.py:1.9 Fri Feb 20 11:57:34 2004
+++ Zope3/src/zope/app/workflow/stateful/contentworkflow.py Fri Feb 27 11:50:40 2004
@@ -27,9 +27,9 @@
from zope.app.interfaces.event import IObjectCreatedEvent
from zope.app.services.servicenames import EventSubscription, Workflows
-from zope.app.interfaces.workflow import IProcessInstanceContainer
-from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
-from zope.app.interfaces.workflow.stateful import IContentWorkflowsManager
+from zope.app.workflow.interfaces import IProcessInstanceContainer
+from zope.app.workflow.interfaces import IProcessInstanceContainerAdaptable
+from zope.app.workflow.interfaces.stateful import IContentWorkflowsManager
from zope.interface import implements, providedBy
from zope.app.container.contained import Contained
@@ -112,13 +112,13 @@
return names
def register(self, iface, name):
- """See zope.app.interfaces.workflows.stateful.IContentProcessRegistry"""
+ """See zope.app.workflow.interfacess.stateful.IContentProcessRegistry"""
if iface not in self._registry.keys():
self._registry[iface] = ()
self._registry[iface] += (name,)
def unregister(self, iface, name):
- """See zope.app.interfaces.workflows.stateful.IContentProcessRegistry"""
+ """See zope.app.workflow.interfacess.stateful.IContentProcessRegistry"""
names = list(self._registry[iface])
names = filter(lambda n: n != name, names)
if not names:
@@ -127,7 +127,7 @@
self._registry[iface] = tuple(names)
def getProcessNamesForInterface(self, iface):
- """See zope.app.interfaces.workflows.stateful.IContentProcessRegistry"""
+ """See zope.app.workflow.interfacess.stateful.IContentProcessRegistry"""
return self._registry.get(iface, ())
def getInterfacesForProcessName(self, name):
=== Zope3/src/zope/app/workflow/stateful/definition.py 1.10 => 1.11 ===
--- Zope3/src/zope/app/workflow/stateful/definition.py:1.10 Fri Feb 20 11:57:34 2004
+++ Zope3/src/zope/app/workflow/stateful/definition.py Fri Feb 27 11:50:40 2004
@@ -20,13 +20,13 @@
from persistent import Persistent
from persistent.dict import PersistentDict
+from zope.interface import implements
from zope.app.interfaces.container import IReadContainer
-from zope.app.interfaces.workflow.stateful import IStatefulProcessDefinition
-from zope.app.interfaces.workflow.stateful import IState, ITransition, INITIAL
-from zope.app.interfaces.workflow.stateful import IStatefulStatesContainer
-from zope.app.interfaces.workflow.stateful import IStatefulTransitionsContainer
-from zope.interface import implements
+from zope.app.workflow.interfaces.stateful import IStatefulProcessDefinition
+from zope.app.workflow.interfaces.stateful import IState, ITransition, INITIAL
+from zope.app.workflow.interfaces.stateful import IStatefulStatesContainer
+from zope.app.workflow.interfaces.stateful import IStatefulTransitionsContainer
from zope.app.container.contained import Contained
from zope.app.workflow.definition import ProcessDefinition
=== Zope3/src/zope/app/workflow/stateful/instance.py 1.16 => 1.17 ===
--- Zope3/src/zope/app/workflow/stateful/instance.py:1.16 Fri Feb 20 11:57:34 2004
+++ Zope3/src/zope/app/workflow/stateful/instance.py Fri Feb 27 11:50:40 2004
@@ -22,13 +22,13 @@
from zope.app import zapi
from zope.app.event import publish
-from zope.app.interfaces.workflow.stateful import AUTOMATIC
-from zope.app.interfaces.workflow.stateful import IAfterTransitionEvent
-from zope.app.interfaces.workflow.stateful import IBeforeTransitionEvent
-from zope.app.interfaces.workflow.stateful import IRelevantDataChangeEvent
-from zope.app.interfaces.workflow.stateful import IStatefulProcessInstance
-from zope.app.interfaces.workflow.stateful import ITransitionEvent
-from zope.app.interfaces.workflow.stateful import \
+from zope.app.workflow.interfaces.stateful import AUTOMATIC
+from zope.app.workflow.interfaces.stateful import IAfterTransitionEvent
+from zope.app.workflow.interfaces.stateful import IBeforeTransitionEvent
+from zope.app.workflow.interfaces.stateful import IRelevantDataChangeEvent
+from zope.app.workflow.interfaces.stateful import IStatefulProcessInstance
+from zope.app.workflow.interfaces.stateful import ITransitionEvent
+from zope.app.workflow.interfaces.stateful import \
IBeforeRelevantDataChangeEvent, IAfterRelevantDataChangeEvent
from zope.app.traversing import getParent
from zope.app.workflow.instance import ProcessInstance
@@ -168,7 +168,7 @@
data = property(getData)
def initialize(self):
- """See zope.app.interfaces.workflow.IStatefulProcessInstance"""
+ """See zope.app.workflow.interfaces.IStatefulProcessInstance"""
pd = self.getProcessDefinition()
clean_pd = removeAllProxies(pd)
self._status = clean_pd.getInitialStateName()
@@ -187,13 +187,13 @@
self._checkAndFireAuto(clean_pd)
def getOutgoingTransitions(self):
- """See zope.app.interfaces.workflow.IStatefulProcessInstance"""
+ """See zope.app.workflow.interfaces.IStatefulProcessInstance"""
pd = self.getProcessDefinition()
clean_pd = removeAllProxies(pd)
return self._outgoingTransitions(clean_pd)
def fireTransition(self, id):
- """See zope.app.interfaces.workflow.IStatefulProcessInstance"""
+ """See zope.app.workflow.interfaces.IStatefulProcessInstance"""
pd = self.getProcessDefinition()
clean_pd = removeAllProxies(pd)
if not id in self._outgoingTransitions(clean_pd):
=== Zope3/src/zope/app/workflow/stateful/testobject.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/workflow/stateful/testobject.zcml:1.2 Fri Aug 22 16:02:22 2003
+++ Zope3/src/zope/app/workflow/stateful/testobject.zcml Fri Feb 27 11:50:40 2004
@@ -9,7 +9,7 @@
interface="zope.app.interfaces.annotation.IAttributeAnnotatable"/>
<implements interface=
- "zope.app.interfaces.workflow.IProcessInstanceContainerAdaptable"/>
+ "zope.app.workflow.interfaces.IProcessInstanceContainerAdaptable"/>
<factory
id="TestObject"
=== Zope3/src/zope/app/workflow/stateful/xmlimportexport.py 1.7 => 1.8 ===
--- Zope3/src/zope/app/workflow/stateful/xmlimportexport.py:1.7 Fri Aug 15 20:44:34 2003
+++ Zope3/src/zope/app/workflow/stateful/xmlimportexport.py Fri Feb 27 11:50:40 2004
@@ -18,21 +18,23 @@
from xml.sax import parse
from xml.sax.handler import ContentHandler
-from zope.app.interfaces.dublincore import IZopeDublinCore
-from zope.app.interfaces.workflow.stateful \
- import IStatefulProcessDefinition
-from zope.app.interfaces.workflow import IProcessDefinitionImportHandler
-from zope.app.interfaces.workflow import IProcessDefinitionExportHandler
-from zope.app.pagetemplate.viewpagetemplatefile \
- import ViewPageTemplateFile
-from zope.app.services.servicenames import Permissions
-from zope.app.workflow.stateful.definition import State, Transition
from zope.component import getAdapter, getService
from zope.configuration.name import resolve
from zope.interface import implements
from zope.proxy import removeAllProxies
from zope.security.checker import CheckerPublic
from zope.security.proxy import trustedRemoveSecurityProxy
+
+from zope.app.interfaces.dublincore import IZopeDublinCore
+from zope.app.workflow.interfaces.stateful \
+ import IStatefulProcessDefinition
+from zope.app.workflow.interfaces import IProcessDefinitionImportHandler
+from zope.app.workflow.interfaces import IProcessDefinitionExportHandler
+from zope.app.pagetemplate.viewpagetemplatefile \
+ import ViewPageTemplateFile
+from zope.app.services.servicenames import Permissions
+from zope.app.workflow.stateful.definition import State, Transition
+
__metaclass__ = type
More information about the Zope3-Checkins
mailing list