Workflow:

- Addition of start date and end date to Workflow Instance API Object
- Support redeploy (force if already there) of process definition in WorkflowDeployer bean
- Addition of Ad-hoc Task Workflow example definition for Workflow Administration WIKI page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@3604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2006-08-24 18:49:29 +00:00
parent b08f6848a3
commit 4b19979671
8 changed files with 199 additions and 27 deletions

View File

@@ -124,20 +124,6 @@
</property>
</bean>
<!-- Workflow Deployment -->
<bean id="workflowBootstrap" parent="workflowDeployer">
<property name="workflowDefinitions">
<list>
<props>
<prop key="engineId">jbpm</prop>
<prop key="location">org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml</prop>
<prop key="mimetype">text/xml</prop>
</props>
</list>
</property>
</bean>
<!-- Descriptor Service -->
<bean id="descriptorComponent" class="org.alfresco.repo.descriptor.DescriptorServiceImpl">

View File

@@ -41,3 +41,28 @@ wf_review.task.wf_approvedTask.title=Approved
wf_review.task.wf_approvedTask.description=Approved
wf_review.node.end.title=End
wf_review.node.end.description=End
#
# Adhoc Task Workflow
#
wf_adhoc.workflow.title=Adhoc Task
wf_adhoc.workflow.description=Assign task to colleague
# Adhoc Task Definitions
wf_workflowmodel.type.wf_submitAdhocTask.title=Submit Adhoc Task
wf_workflowmodel.type.wf_submitAdhocTask.description=Allocate task to colleague
wf_workflowmodel.property.wf_adhocDescription.title=Task Description
wf_workflowmodel.property.wf_adhocDescription.description=Description of what needs to be achieved
wf_workflowmodel.property.wf_adhocDueDate.description=Task Due Date
wf_workflowmodel.property.wf_adhocPriority.title=Task Priority
wf_workflowmodel.property.wf_notifyMe.title=Notify Me
wf_workflowmodel.property.wf_notifyMe.description=Notify me when task is complete
wf_workflowmodel.association.wf_assignee.title=Assignee
wf_workflowmodel.association.wf_assignee.description=Who's doing the task
wf_workflowmodel.type.wf_adhocTask.title=Adhoc Task
wf_workflowmodel.type.wf_adhocTask.description=Adhoc Task allocated by colleague
wf_workflowmodel.type.wf_completedTask.title=Adhoc Task Completed
wf_workflowmodel.type.wf_completedTask.description=Adhoc Task Completed

View File

@@ -2,10 +2,6 @@
<model name="wf:workflowmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>Content-oriented Workflows Model</description>
<author>Alfresco</author>
<version>0.1</version>
<imports>
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
@@ -75,10 +71,6 @@
</type>
<!-- -->
<!-- Basic Review & Approve Tasks -->
<!-- -->
<type name="wf:reviewTask">
<title>Review Task</title>
@@ -93,6 +85,75 @@
</overrides>
</type>
<!-- -->
<!-- Adhoc Tasks -->
<!-- -->
<type name="wf:baseAdhocTask">
<parent>bpm:workflowTask</parent>
<properties>
<property name="wf:adhocDescription">
<title>Description</title>
<type>d:text</type>
</property>
</properties>
</type>
<type name="wf:submitAdhocTask">
<title>Submit Adhoc Task</title>
<parent>wf:baseAdhocTask</parent>
<properties>
<property name="wf:adhocDueDate">
<title>Due Date</title>
<type>d:date</type>
</property>
<property name="wf:adhocPriority">
<title>Priority</title>
<type>d:int</type>
<default>2</default>
<constraints>
<constraint ref="bpm:allowedPriority"/>
</constraints>
</property>
<property name="wf:notifyMe">
<title>Email Notification</title>
<type>d:boolean</type>
</property>
</properties>
<associations>
<association name="wf:assignee">
<title>Assignee</title>
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>cm:person</class>
<mandatory>true</mandatory>
<many>false</many>
</target>
</association>
</associations>
</type>
<type name="wf:adhocTask">
<title>Adhoc Task</title>
<parent>wf:baseAdhocTask</parent>
</type>
<type name="wf:completedTask">
<title>Completed Adhoc Task</title>
<parent>wf:baseAdhocTask</parent>
</type>
</types>

View File

@@ -7,6 +7,25 @@
<!-- Workflow Definitions -->
<!-- -->
<bean id="workflow.workflowBootstrap" parent="workflowDeployer">
<property name="workflowDefinitions">
<list>
<props>
<prop key="engineId">jbpm</prop>
<prop key="location">org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml</prop>
<prop key="mimetype">text/xml</prop>
<prop key="redeploy">false</prop>
</props>
<props>
<prop key="engineId">jbpm</prop>
<prop key="location">org/alfresco/repo/workflow/jbpm/adhoc_task_processdefinition.xml</prop>
<prop key="mimetype">text/xml</prop>
<prop key="redeploy">false</prop>
</props>
</list>
</property>
</bean>
<bean id="workflow.dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="dictionaryBootstrap">
<property name="models">
<list>
@@ -22,16 +41,16 @@
</property>
</bean>
<!-- -->
<!-- Workflow Service Implementation -->
<!-- -->
<bean id="workflowDeployer" class="org.alfresco.repo.workflow.WorkflowDeployer" abstract="true">
<property name="transactionService" ref="transactionComponent"/>
<property name="authenticationComponent" ref="authenticationComponent" />
<property name="workflowService" ref="WorkflowService" />
</bean>
<!-- -->
<!-- Workflow Service Implementation -->
<!-- -->
<bean id="workflowServiceImpl" class="org.alfresco.repo.workflow.WorkflowServiceImpl">
<property name="BPMEngineRegistry" ref="bpm_engineRegistry"/>
<property name="workflowPackageComponent" ref="workflowPackageImpl"/>