Index: main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 6295)
+++ main/waeup.sirp/trunk/src/waeup/sirp/applicants/workflow.py	(revision 6295)
@@ -0,0 +1,129 @@
+"""Workflow for applicants.
+"""
+import grok
+from hurry.workflow.workflow import Transition, Workflow, WorkflowVersions
+from hurry.workflow.workflow import WorkflowInfo, WorkflowState, NullCondition
+from hurry.workflow.interfaces import MANUAL, AUTOMATIC, SYSTEM
+from hurry.workflow.interfaces import IWorkflow, IWorkflowState, IWorkflowInfo
+from hurry.workflow.interfaces import IWorkflowVersions
+from waeup.sirp.applicants.interfaces import IApplicantBaseData
+
+INITIALIZED = 'initialized'
+STARTED = 'started'
+SUBMITTED = 'submitted'
+ADMITTED = 'admitted'
+NOT_ADMITTED = 'not admitted'
+CREATED = 'created'
+
+def create_workflow():
+    init_transition = Transition(
+        transition_id = 'init',
+        title = 'Initialize',
+        source = None,
+        condition = NullCondition,
+        destination = INITIALIZED)
+
+    start_transition = Transition(
+        transition_id = 'start',
+        title = 'Start',
+        source = INITIALIZED,
+        destination = STARTED)
+
+    submit_transition = Transition(
+        transition_id = 'submit',
+        title = 'Submit',
+        source = STARTED,
+        destination = SUBMITTED)
+
+    admit_transition = Transition(
+        transition_id = 'admit',
+        title = 'Admit',
+        source = SUBMITTED,
+        destination = ADMITTED)
+
+    defer_transition = Transition(
+        transition_id = 'defer',
+        title = 'Defer',
+        source = SUBMITTED,
+        destination = NOT_ADMITTED)
+
+    create_transition = Transition(
+        transition_id = 'create',
+        title = 'Create Student',
+        source = ADMITTED,
+        destination = CREATED)
+
+    #final_transition = Transition(
+    #    transition_id = 'finalize',
+    #    title = 'Delete',
+    #    source = ADMITTED,
+    #    destination = None)
+
+    return [init_transition, start_transition, submit_transition, admit_transition,
+        defer_transition, create_transition,]
+
+
+class ApplicationWorkflow(Workflow):
+    """A hurry.workflow Workflow with more appropriate error messages.
+    """
+    grok.provides(IWorkflow)
+    def __init__(self):
+        super(Workflow, self).__init__()
+        self.refresh(create_workflow())
+
+    def getTransition(self, source, transition_id):
+        from hurry.workflow.interfaces import\
+            InvalidTransitionError, ConditionFailedError
+
+        transition = self._id_transitions[transition_id]
+        if transition.source != source:
+            raise InvalidTransitionError(
+                "Transition '%s' requires '%s' as source state (is: '%s')" % (
+                    transition_id, transition.source, source))
+        return transition
+
+
+class ApplicationWorkflowNullVersions(WorkflowVersions):
+    """A workflow versions manager that does not handle versions.
+
+    Sounds odd, but the default implementation of
+    :class:`hurry.workflow.workflow.WorkflowVersions` is a base
+    implementation that raises :exc:`NotImplemented` exceptions for
+    most of the methods defined below.
+
+    If we want to register a versionless workflow, an utility
+    implementing IWorkflowVersions is looked up nevertheless by
+    WorkflowInfo and WorkflowState components so we **have** to
+    provide workflow versions, even if we do not support versioned
+    workflows.
+
+    This implementation returns empty result sets for any requests,
+    but does not raise :exc:`NotImplemented`.
+    """
+    def getVersions(self, state, id):
+        return []
+
+    def getVersionsWithAutomaticTransitions(self):
+        return []
+
+    def hasVersion(self, id, state):
+        return False
+
+    def hasVersionId(self, id):
+        return False
+
+# Register global utilities for workflows and workflow versions...
+grok.global_utility(ApplicationWorkflow, IWorkflow)
+grok.global_utility(ApplicationWorkflowNullVersions, IWorkflowVersions)
+
+class WorkflowState(grok.Adapter, WorkflowState):
+    """An adapter to adapt Applicant objects to workflow states.
+    """
+    grok.context(IApplicantBaseData)
+    grok.provides(IWorkflowState)
+    
+class WorkflowInfo(grok.Adapter, WorkflowInfo):
+    """Adapter to adapt Applicant objects to workflow info objects.
+    """
+    grok.context(IApplicantBaseData)
+    grok.provides(IWorkflowInfo)
Index: main/waeup.sirp/trunk/src/waeup/sirp/workflow.py
===================================================================
--- main/waeup.sirp/trunk/src/waeup/sirp/workflow.py	(revision 6294)
+++ 	(revision )
@@ -1,129 +1,0 @@
-"""Workflow for applicants.
-"""
-import grok
-from hurry.workflow.workflow import Transition, Workflow, WorkflowVersions
-from hurry.workflow.workflow import WorkflowInfo, WorkflowState, NullCondition
-from hurry.workflow.interfaces import MANUAL, AUTOMATIC, SYSTEM
-from hurry.workflow.interfaces import IWorkflow, IWorkflowState, IWorkflowInfo
-from hurry.workflow.interfaces import IWorkflowVersions
-from waeup.sirp.applicants.interfaces import IApplicantBaseData
-
-INITIALIZED = 'initialized'
-STARTED = 'started'
-SUBMITTED = 'submitted'
-ADMITTED = 'admitted'
-NOT_ADMITTED = 'not admitted'
-CREATED = 'created'
-
-def create_workflow():
-    init_transition = Transition(
-        transition_id = 'init',
-        title = 'Initialize',
-        source = None,
-        condition = NullCondition,
-        destination = INITIALIZED)
-
-    start_transition = Transition(
-        transition_id = 'start',
-        title = 'Start',
-        source = INITIALIZED,
-        destination = STARTED)
-
-    submit_transition = Transition(
-        transition_id = 'submit',
-        title = 'Submit',
-        source = STARTED,
-        destination = SUBMITTED)
-
-    admit_transition = Transition(
-        transition_id = 'admit',
-        title = 'Admit',
-        source = SUBMITTED,
-        destination = ADMITTED)
-
-    defer_transition = Transition(
-        transition_id = 'defer',
-        title = 'Defer',
-        source = SUBMITTED,
-        destination = NOT_ADMITTED)
-
-    create_transition = Transition(
-        transition_id = 'create',
-        title = 'Create Student',
-        source = ADMITTED,
-        destination = CREATED)
-
-    #final_transition = Transition(
-    #    transition_id = 'finalize',
-    #    title = 'Delete',
-    #    source = ADMITTED,
-    #    destination = None)
-
-    return [init_transition, start_transition, submit_transition, admit_transition,
-        defer_transition, create_transition,]
-
-
-class ApplicationWorkflow(Workflow):
-    """A hurry.workflow Workflow with more appropriate error messages.
-    """
-    grok.provides(IWorkflow)
-    def __init__(self):
-        super(Workflow, self).__init__()
-        self.refresh(create_workflow())
-
-    def getTransition(self, source, transition_id):
-        from hurry.workflow.interfaces import\
-            InvalidTransitionError, ConditionFailedError
-
-        transition = self._id_transitions[transition_id]
-        if transition.source != source:
-            raise InvalidTransitionError(
-                "Transition '%s' requires '%s' as source state (is: '%s')" % (
-                    transition_id, transition.source, source))
-        return transition
-
-
-class ApplicationWorkflowNullVersions(WorkflowVersions):
-    """A workflow versions manager that does not handle versions.
-
-    Sounds odd, but the default implementation of
-    :class:`hurry.workflow.workflow.WorkflowVersions` is a base
-    implementation that raises :exc:`NotImplemented` exceptions for
-    most of the methods defined below.
-
-    If we want to register a versionless workflow, an utility
-    implementing IWorkflowVersions is looked up nevertheless by
-    WorkflowInfo and WorkflowState components so we **have** to
-    provide workflow versions, even if we do not support versioned
-    workflows.
-
-    This implementation returns empty result sets for any requests,
-    but does not raise :exc:`NotImplemented`.
-    """
-    def getVersions(self, state, id):
-        return []
-
-    def getVersionsWithAutomaticTransitions(self):
-        return []
-
-    def hasVersion(self, id, state):
-        return False
-
-    def hasVersionId(self, id):
-        return False
-
-# Register global utilities for workflows and workflow versions...
-grok.global_utility(ApplicationWorkflow, IWorkflow)
-grok.global_utility(ApplicationWorkflowNullVersions, IWorkflowVersions)
-
-class WorkflowState(grok.Adapter, WorkflowState):
-    """An adapter to adapt Applicant objects to workflow states.
-    """
-    grok.context(IApplicantBaseData)
-    grok.provides(IWorkflowState)
-    
-class WorkflowInfo(grok.Adapter, WorkflowInfo):
-    """Adapter to adapt Applicant objects to workflow info objects.
-    """
-    grok.context(IApplicantBaseData)
-    grok.provides(IWorkflowInfo)
