inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unbreaks workflow on WCM-DEV.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-10-19 21:44:00 +00:00
parent dd5c46339e
commit f005180276
4 changed files with 346 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/alfresco/bootstrap-context.xml
View File

@@ -164,19 +164,19 @@
<prop key="engineId">jbpm</prop> <prop key="engineId">jbpm</prop>
<prop key="location">alfresco/workflow/review_processdefinition.xml</prop> <prop key="location">alfresco/workflow/review_processdefinition.xml</prop>
<prop key="mimetype">text/xml</prop> <prop key="mimetype">text/xml</prop>
<prop key="redeploy">true</prop> <prop key="redeploy">false</prop>
</props> </props>
<props> <props>
<prop key="engineId">jbpm</prop> <prop key="engineId">jbpm</prop>
<prop key="location">alfresco/workflow/adhoc_processdefinition.xml</prop> <prop key="location">alfresco/workflow/adhoc_processdefinition.xml</prop>
<prop key="mimetype">text/xml</prop> <prop key="mimetype">text/xml</prop>
<prop key="redeploy">true</prop> <prop key="redeploy">false</prop>
</props> </props>
</list> </list>
</property> </property>
<property name="models"> <property name="models">
<list> <list>
<value>alfresco/model/workflowModel.xml</value> <value>alfresco/workflow/workflowModel.xml</value>
</list> </list>
</property> </property>
<property name="labels"> <property name="labels">

1
config/alfresco/core-services-context.xml
View File

@@ -422,7 +422,6 @@
<value>alfresco/model/applicationModel.xml</value> <value>alfresco/model/applicationModel.xml</value>
<value>alfresco/model/forumModel.xml</value> <value>alfresco/model/forumModel.xml</value>
<value>alfresco/model/recordsModel.xml</value> <value>alfresco/model/recordsModel.xml</value>
<value>alfresco/model/workflowModel.xml</value>
<!-- Implementation models --> <!-- Implementation models -->
<value>org/alfresco/repo/security/authentication/userModel.xml</value> <value>org/alfresco/repo/security/authentication/userModel.xml</value>

520
config/alfresco/model/bpmModel.xml
View File

@@ -2,269 +2,355 @@
<model name="bpm:businessprocessmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0"> <model name="bpm:businessprocessmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>Business Process Model</description> <description>Business Process Model</description>
<author>Alfresco</author> <author>Alfresco</author>
<version>1.0</version> <version>1.0</version>
<!-- Imports are required to allow references to definitions in other models --> <!-- Imports are required to allow references to definitions in other models -->
<imports> <imports>
<!-- Import Alfresco Dictionary Definitions --> <!-- Import Alfresco Dictionary Definitions -->
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/> <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d" />
<!-- Import Alfresco Content Domain Model Definitions --> <!-- Import Alfresco Content Domain Model Definitions -->
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/> <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm" />
</imports> </imports>
<namespaces> <namespaces>
<namespace uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/> <namespace uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm" />
</namespaces> </namespaces>
<constraints> <constraints>
<constraint name="bpm:allowedPriority" type="LIST"> <constraint name="bpm:allowedPriority" type="LIST">
<parameter name="allowedValues"> <parameter name="allowedValues">
<!-- TODO: Determine if priority values can be mapped to human-readable strings --> <!-- TODO: Determine if priority values can be mapped to human-readable strings -->
<list> <list>
<value>1</value> <value>1</value>
<value>2</value> <value>2</value>
<value>3</value> <value>3</value>
</list> </list>
</parameter> </parameter>
</constraint> </constraint>
<constraint name="bpm:allowedStatus" type="LIST"> <constraint name="bpm:allowedStatus" type="LIST">
<parameter name="allowedValues"> <parameter name="allowedValues">
<!-- TODO: Determine if status values can be mapped to human-readable strings --> <!-- TODO: Determine if status values can be mapped to human-readable strings -->
<list> <list>
<value>Not Yet Started</value> <value>Not Yet Started</value>
<value>In Progress</value> <value>In Progress</value>
<value>On Hold</value> <value>On Hold</value>
<value>Cancelled</value> <value>Cancelled</value>
<value>Completed</value> <value>Completed</value>
</list> </list>
</parameter> </parameter>
</constraint> </constraint>
<constraint name="bpm:percentage" type="MINMAX"> <constraint name="bpm:percentage" type="MINMAX">
<parameter name="minValue"><value>0</value></parameter> <parameter name="minValue">
<parameter name="maxValue"><value>100</value></parameter> <value>0</value>
</constraint> </parameter>
<parameter name="maxValue">
<value>100</value>
</parameter>
</constraint>
</constraints> </constraints>
<types> <types>
<!-- --> <!-- -->
<!-- Base definition for all Tasks --> <!-- Base definition for all Tasks -->
<!-- --> <!-- -->
<type name="bpm:task"> <type name="bpm:task">
<title>Task</title> <parent>cm:content</parent>
<description>Task</description>
<parent>cm:content</parent>
<properties> <properties>
<!-- --> <!-- -->
<!-- Assignment --> <!-- Assignment -->
<!-- --> <!-- -->
<!-- Note: Implemented via cm:ownable aspect --> <!-- Note: Implemented via cm:ownable aspect -->
<!-- --> <!-- -->
<!-- Task Identifier --> <!-- Task Identifier -->
<!-- --> <!-- -->
<property name="bpm:taskId"> <property name="bpm:taskId">
<title>Task Identifier</title> <type>d:long</type>
<type>d:long</type> <protected>true</protected>
<protected>true</protected> <mandatory>true</mandatory>
<mandatory>true</mandatory> </property>
</property>
<!-- --> <!-- Task Description -->
<!-- Task Dates --> <property name="bpm:description">
<!-- --> <type>d:text</type>
<property name="bpm:startDate"> </property>
<title>Start Date</title>
<type>d:date</type>
<protected>true</protected>
</property>
<property name="bpm:completionDate">
<title>End Date</title>
<type>d:date</type>
<protected>true</protected>
</property>
<property name="bpm:dueDate">
<title>Due Date</title>
<type>d:date</type>
</property>
<!-- --> <!-- -->
<!-- Task Progress --> <!-- Task Dates -->
<!-- --> <!-- -->
<property name="bpm:status"> <property name="bpm:startDate">
<title>Status</title> <type>d:date</type>
<type>d:text</type> <protected>true</protected>
<mandatory>true</mandatory> </property>
<default>Not Yet Started</default> <property name="bpm:completionDate">
<constraints> <type>d:date</type>
<constraint ref="bpm:allowedStatus"/> <protected>true</protected>
</constraints> </property>
</property> <property name="bpm:dueDate">
<property name="bpm:priority"> <type>d:date</type>
<title>Priority</title> </property>
<type>d:int</type>
<mandatory>true</mandatory>
<default>2</default>
<constraints>
<constraint ref="bpm:allowedPriority"/>
</constraints>
</property>
<property name="bpm:percentComplete">
<title>Percentage Complete</title>
<type>d:int</type>
<mandatory>true</mandatory>
<default>0</default>
<constraints>
<constraint ref="bpm:percentage"/>
</constraints>
</property>
<!-- --> <!-- -->
<!-- Task Notes --> <!-- Task Progress -->
<!-- --> <!-- -->
<!-- Note: Implemented via cm:content property : see 'fm:post' --> <property name="bpm:status">
<type>d:text</type>
<mandatory>true</mandatory>
<default>Not Yet Started</default>
<constraints>
<constraint ref="bpm:allowedStatus" />
</constraints>
</property>
<property name="bpm:priority">
<type>d:int</type>
<mandatory>true</mandatory>
<default>2</default>
<constraints>
<constraint ref="bpm:allowedPriority" />
</constraints>
</property>
<property name="bpm:percentComplete">
<type>d:int</type>
<mandatory>true</mandatory>
<default>0</default>
<constraints>
<constraint ref="bpm:percentage" />
</constraints>
</property>
</properties> <!-- -->
<!-- Task Notes -->
<!-- -->
<!-- Note: Implemented via cm:content property : see 'fm:post' -->
<associations> </properties>
<!-- List of users who may potentially get assigned to the task --> <associations>
<association name="bpm:pooledActors">
<title>Pooled Users</title>
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>cm:person</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</association>
</associations> <!-- List of users who may potentially get assigned to the task -->
<association name="bpm:pooledActors">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>cm:person</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</association>
<mandatory-aspects> </associations>
<aspect>cm:ownable</aspect>
</mandatory-aspects> <mandatory-aspects>
</type> <aspect>cm:ownable</aspect>
</mandatory-aspects>
</type>
<!-- --> <!-- -->
<!-- The base for all Tasks assigned via a Workflow --> <!-- The base for all Tasks assigned via a Workflow -->
<!-- --> <!-- -->
<type name="bpm:workflowTask"> <type name="bpm:workflowTask">
<title>Workflow Task</title> <parent>bpm:task</parent>
<description>Task assigned via Workflow</description>
<parent>bpm:task</parent>
<properties> <properties>
<!-- Task Context --> <!-- Task Context -->
<!-- e.g. Space, Document --> <!-- e.g. Space, Document -->
<property name="bpm:context"> <property name="bpm:context">
<title>Task Context</title> <type>d:noderef</type>
<type>d:noderef</type> </property>
</property>
<!-- Task Outcome --> <!-- Task Outcome -->
<property name="bpm:outcome"> <property name="bpm:outcome">
<title>Task Outcome</title> <type>d:text</type><!-- Transition id -->
<type>d:text</type> <!-- Transition id --> </property>
</property>
<!-- Items within package marked as complete --> <!-- Items within package marked as complete -->
<property name="bpm:completedItems"> <property name="bpm:completedItems">
<type>d:noderef</type> <type>d:noderef</type>
<multiple>true</multiple> <multiple>true</multiple>
</property> </property>
<!-- Applicable actions for workflow package --> <!-- Applicable actions for workflow package -->
<property name="bpm:packageActionGroup"> <property name="bpm:packageActionGroup">
<type>d:text</type> <type>d:text</type>
</property> <!-- NOTE: empty default specified, therefore no actions -->
<default></default>
</property>
<!-- Applicable actions for workflow package item --> <!-- Applicable actions for workflow package item -->
<property name="bpm:packageItemActionGroup"> <property name="bpm:packageItemActionGroup">
<type>d:text</type> <type>d:text</type>
<default>workflow_item_read_actions</default> <default>read_package_item_actions</default>
</property> </property>
</properties>
<associations> </properties>
<association name="bpm:package"> <associations>
<title>Workflow Package</title>
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>bpm:workflowPackage</class>
<mandatory>true</mandatory>
<many>false</many>
</target>
</association>
</associations> <association name="bpm:package">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>bpm:workflowPackage</class>
<mandatory>true</mandatory>
<many>false</many>
</target>
</association>
</type> </associations>
</type>
<!-- -->
<!-- Default Start Task -->
<!-- -->
<type name="bpm:startTask">
<parent>bpm:workflowTask</parent>
<properties>
<!-- Description for the workflow as a whole -->
<property name="bpm:workflowDescription">
<type>d:text</type>
</property>
<!-- Due date for the workflow as a whole -->
<property name="bpm:workflowDueDate">
<type>d:date</type>
</property>
<!-- Priority for the workflow as a whole -->
<property name="bpm:workflowPriority">
<type>d:int</type>
<default>2</default>
<constraints>
<constraint ref="bpm:allowedPriority" />
</constraints>
</property>
</properties>
<overrides>
<property name="bpm:packageActionGroup">
<default>add_package_item_actions</default>
</property>
<property name="bpm:packageItemActionGroup">
<default>edit_and_remove_package_item_actions</default>
</property>
</overrides>
</type>
</types> </types>
<aspects> <aspects>
<!-- --> <!-- -->
<!-- A collection of content routed through a workflow. --> <!-- Single Task Assignee -->
<!-- --> <!-- -->
<!-- Note: this aspect should be applied to a container such as -->
<!-- a folder, versioned folder or layered folder. -->
<!-- -->
<aspect name="bpm:workflowPackage"> <aspect name="bpm:assignee">
<title>Workflow Package</title> <associations>
<properties> <association name="bpm:assignee">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>cm:person</class>
<mandatory>true</mandatory>
<many>false</many>
</target>
</association>
<!-- --> </associations>
<!-- Associated Workflow --> </aspect>
<!-- -->
<property name="bpm:workflowDefinitionId">
<title>Workflow Definition Id</title>
<type>d:text</type>
</property>
<property name="bpm:workflowDefinitionName">
<title>Workflow Definition Name</title>
<type>d:text</type>
</property>
<property name="bpm:workflowInstanceId">
<title>Workflow Instance Id</title>
<type>d:text</type>
</property>
<!-- TODO: Define properties (replicated from Workflow/Task Engine) for --> <!-- -->
<!-- search within Alfresco e.g. task info, workflow info ... --> <!-- Multiple Task Assignees -->
<!-- -->
</properties> <aspect name="bpm:assignees">
<associations>
<!-- Commentary --> <association name="bpm:assignees">
<!-- Note: Implement tracking of comments via fm:discussable aspect --> <source>
<!-- Note: Haven't made this aspect mandatory as this would force creation --> <mandatory>false</mandatory>
<!-- of forum folder against each package, even if there aren't any --> <many>false</many>
<!-- comments --> </source>
<target>
<class>cm:person</class>
<mandatory>true</mandatory>
<many>true</many>
</target>
</association>
</aspect> </associations>
</aspect>
</aspects> <!-- -->
<!-- A collection of content routed through a workflow. -->
<!-- -->
<!-- Note: this aspect should be applied to a container such as -->
<!-- a folder, versioned folder or layered folder. -->
<!-- -->
<aspect name="bpm:workflowPackage">
<properties>
<!-- Created by Workflow Service (true), or provided from outside (false) -->
<property name="bpm:isSystemPackage">
<type>d:boolean</type>
</property>
<!-- -->
<!-- Associated Workflow -->
<!-- -->
<property name="bpm:workflowDefinitionId">
<type>d:text</type>
</property>
<property name="bpm:workflowDefinitionName">
<type>d:text</type>
</property>
<property name="bpm:workflowInstanceId">
<type>d:text</type>
</property>
<!-- TODO: Define properties (replicated from Workflow/Task Engine) for -->
<!-- search within Alfresco e.g. task info, workflow info ... -->
</properties>
<!-- Commentary -->
<!-- Note: Implement tracking of comments via fm:discussable aspect -->
<!-- Note: Haven't made this aspect mandatory as this would force creation -->
<!-- of forum folder against each package, even if there aren't any -->
<!-- comments -->
</aspect>
</aspects>
</model> </model>

23
config/alfresco/workflow/workflowModel.xml
View File

@@ -19,19 +19,18 @@
<type name="wf:submitReviewTask"> <type name="wf:submitReviewTask">
<parent>bpm:startTask</parent> <parent>bpm:startTask</parent>
<mandatory-aspects>
<aspect>bpm:assignee</aspect>
</mandatory-aspects>
</type> </type>
<type name="wf:reviewTask"> <type name="wf:reviewTask">
<parent>bpm:workflowTask</parent> <parent>bpm:workflowTask</parent>
<overrides> <overrides>
<property name="bpm:packageItemActionGroup"> <property name="bpm:packageItemActionGroup">
<default>workflow_item_edit_actions</default> <default>edit_package_item_actions</default>
</property> </property>
</overrides> </overrides>
</type> </type>
@@ -39,21 +38,29 @@
<!-- Adhoc Tasks --> <!-- Adhoc Tasks -->
<!-- --> <!-- -->
<type name="wf:submitAdhocTask"> <type name="wf:submitAdhocTask">
<parent>bpm:startTask</parent> <parent>bpm:startTask</parent>
<properties> <properties>
<property name="wf:notifyMe"> <property name="wf:notifyMe">
<type>d:boolean</type> <type>d:boolean</type>
<default>false</default> <default>false</default>
</property> </property>
</properties> </properties>
<mandatory-aspects>
<aspect>bpm:assignee</aspect>
</mandatory-aspects>
</type> </type>
<type name="wf:adhocTask"> <type name="wf:adhocTask">
<parent>bpm:workflowTask</parent> <parent>bpm:workflowTask</parent>
<overrides>
<property name="bpm:packageActionGroup">
<default>add_package_item_actions</default>
</property>
<property name="bpm:packageItemActionGroup">
<default>edit_package_item_actions</default>
</property>
</overrides>
</type> </type>
<type name="wf:completedAdhocTask"> <type name="wf:completedAdhocTask">