Workflow (server-side) groups support

- assignment of groups to pooled tasks
- retrieve group members added to javascript

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4805 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2007-01-12 12:20:00 +00:00
parent 26faea4e62
commit 7dccfe18fb
15 changed files with 486 additions and 48 deletions

View File

@@ -549,17 +549,22 @@
<bean id="dictionaryBootstrap" parent="dictionaryModelBootstrap" depends-on="resourceBundles">
<property name="models">
<list>
<!-- System models -->
<value>alfresco/model/dictionaryModel.xml</value>
<value>alfresco/model/systemModel.xml</value>
<value>org/alfresco/repo/security/authentication/userModel.xml</value>
<!-- Content models -->
<value>alfresco/model/contentModel.xml</value>
<value>alfresco/model/bpmModel.xml</value>
<value>alfresco/model/wcmModel.xml</value>
<value>alfresco/model/forumModel.xml</value>
<!-- Content models -->
<value>alfresco/model/applicationModel.xml</value>
<value>alfresco/model/wcmAppModel.xml</value>
<value>alfresco/model/forumModel.xml</value>
<!-- Implementation models -->
<value>org/alfresco/repo/security/authentication/userModel.xml</value>
<value>org/alfresco/repo/action/actionModel.xml</value>
<value>org/alfresco/repo/rule/ruleModel.xml</value>
<value>org/alfresco/repo/version/version_model.xml</value>

View File

@@ -91,6 +91,18 @@ ok> var <varName>[*] person <varValue>
var bpm:assignee* person admin,fred
ok> var <varName>[*] group <varValue>
Define or update a (usr:authorityContainer) node ref variable.
<varName> variable name
[*] if specified, define a collection
<varValue> variable value (comma-seperate to specify a list of values)
e.g.
var bpm:groupAssignee group GROUP_Engineering
ok> var <varName> package <itemCount>
Define or update a (bpm:workflowPackage) node ref variable.

View File

@@ -12,6 +12,8 @@
<import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d" />
<!-- Import Alfresco Content Domain Model Definitions -->
<import uri="http://www.alfresco.org/model/content/1.0" prefix="cm" />
<!-- Import User Model Definitions -->
<import uri="http://www.alfresco.org/model/user/1.0" prefix="usr"/>
</imports>
<namespaces>
@@ -310,6 +312,29 @@
</associations>
</aspect>
<!-- -->
<!-- Single Group Assignee -->
<!-- -->
<aspect name="bpm:groupAssignee">
<associations>
<association name="bpm:groupAssignee">
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<!-- TODO: Refactor when group is pulled into content model -->
<class>usr:authorityContainer</class>
<mandatory>true</mandatory>
<many>false</many>
</target>
</association>
</associations>
</aspect>
<!-- -->
<!-- A collection of content routed through a workflow. -->
<!-- -->

View File

@@ -70,6 +70,9 @@
<property name="serviceRegistry">
<ref bean="ServiceRegistry"/>
</property>
<property name="authorityDAO">
<ref bean="authorityDAO"/>
</property>
</bean>
<bean id="sessionScript" parent="baseScriptImplementation" class="org.alfresco.repo.jscript.Session">

View File

@@ -34,6 +34,8 @@
<property name="nodeService" ref="NodeService"/>
<property name="namespaceService" ref="namespaceService"/>
<property name="personService" ref="PersonService"/>
<property name="authorityDAO" ref="authorityDAO"/>
<property name="transactionService" ref="transactionComponent"/>
<property name="fileFolderService" ref="FileFolderService"/>
</bean>
@@ -87,6 +89,8 @@
<property name="namespaceService" ref="namespaceService"/>
<property name="nodeService" ref="nodeService"/>
<property name="personService" ref="personService"/>
<property name="authorityService" ref="authorityService"/>
<property name="authorityDAO" ref="authorityDAO"/>
<property name="serviceRegistry" ref="ServiceRegistry"/>
<property name="companyHomeStore"><value>${spaces.store}</value></property>
<property name="companyHomePath"><value>/${spaces.company_home.childname}</value></property>

View File

@@ -56,7 +56,7 @@
<task-node name="serialreview">
<task name="wcmwf:reviewTask">
<assignment class="org.alfresco.repo.workflow.jbpm.AlfrescoAssignment">
<actor>#{bpm_assignees[wcmwf_approveCnt]}</actor>
<actor>#{bpm_assignees.get(wcmwf_approveCnt)}</actor>
</assignment>
</task>

View File

@@ -24,6 +24,13 @@
</mandatory-aspects>
</type>
<type name="wf:submitGroupReviewTask">
<parent>bpm:startTask</parent>
<mandatory-aspects>
<aspect>bpm:groupAssignee</aspect>
</mandatory-aspects>
</type>
<type name="wf:submitParallelReviewTask">
<parent>bpm:startTask</parent>
<properties>