Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -123,6 +123,17 @@
</child-association>
</associations>
</aspect>
<aspect name="app:feedsource">
<title>Feed Source</title>
<properties>
<property name="app:template">
<title>Feed Template</title>
<type>d:noderef</type>
<mandatory>false</mandatory>
</property>
</properties>
</aspect>
</aspects>

View File

@@ -0,0 +1,270 @@
<?xml version="1.0" encoding="UTF-8"?>
<model name="bpm:businessprocessmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<description>Business Process Model</description>
<author>Alfresco</author>
<version>1.0</version>
<!-- Imports are required to allow references to definitions in other models -->
<imports>
<!-- Import Alfresco Dictionary Definitions -->
<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"/>
</imports>
<namespaces>
<namespace uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
</namespaces>
<constraints>
<constraint name="bpm:allowedPriority" type="LIST">
<parameter name="allowedValues">
<!-- TODO: Determine if priority values can be mapped to human-readable strings -->
<list>
<value>1</value>
<value>2</value>
<value>3</value>
</list>
</parameter>
</constraint>
<constraint name="bpm:allowedStatus" type="LIST">
<parameter name="allowedValues">
<!-- TODO: Determine if status values can be mapped to human-readable strings -->
<list>
<value>Not Yet Started</value>
<value>In Progress</value>
<value>On Hold</value>
<value>Cancelled</value>
<value>Completed</value>
</list>
</parameter>
</constraint>
<constraint name="bpm:percentage" type="MINMAX">
<parameter name="minValue"><value>0</value></parameter>
<parameter name="maxValue"><value>100</value></parameter>
</constraint>
</constraints>
<types>
<!-- -->
<!-- Base definition for all Tasks -->
<!-- -->
<type name="bpm:task">
<title>Task</title>
<description>Task</description>
<parent>cm:content</parent>
<properties>
<!-- -->
<!-- Assignment -->
<!-- -->
<!-- Note: Implemented via cm:ownable aspect -->
<!-- -->
<!-- Task Identifier -->
<!-- -->
<property name="bpm:taskId">
<title>Task Identifier</title>
<type>d:long</type>
<protected>true</protected>
<mandatory>true</mandatory>
</property>
<!-- -->
<!-- Task Dates -->
<!-- -->
<property name="bpm:startDate">
<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 -->
<!-- -->
<property name="bpm:status">
<title>Status</title>
<type>d:text</type>
<mandatory>true</mandatory>
<default>Not Yet Started</default>
<constraints>
<constraint ref="bpm:allowedStatus"/>
</constraints>
</property>
<property name="bpm:priority">
<title>Priority</title>
<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 -->
<!-- -->
<!-- Note: Implemented via cm:content property : see 'fm:post' -->
</properties>
<associations>
<!-- List of users who may potentially get assigned to the task -->
<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>
<mandatory-aspects>
<aspect>cm:ownable</aspect>
</mandatory-aspects>
</type>
<!-- -->
<!-- The base for all Tasks assigned via a Workflow -->
<!-- -->
<type name="bpm:workflowTask">
<title>Workflow Task</title>
<description>Task assigned via Workflow</description>
<parent>bpm:task</parent>
<properties>
<!-- Task Context -->
<!-- e.g. Space, Document -->
<property name="bpm:context">
<title>Task Context</title>
<type>d:noderef</type>
</property>
<!-- Task Outcome -->
<property name="bpm:outcome">
<title>Task Outcome</title>
<type>d:text</type> <!-- Transition id -->
</property>
<!-- Items within package marked as complete -->
<property name="bpm:completedItems">
<type>d:noderef</type>
<multiple>true</multiple>
</property>
<!-- Applicable actions for workflow package -->
<property name="bpm:packageActionGroup">
<type>d:text</type>
</property>
<!-- Applicable actions for workflow package item -->
<property name="bpm:packageItemActionGroup">
<type>d:text</type>
<default>workflow_item_read_actions</default>
</property>
</properties>
<associations>
<association name="bpm:package">
<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>
</type>
</types>
<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">
<title>Workflow Package</title>
<properties>
<!-- -->
<!-- Associated Workflow -->
<!-- -->
<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 ... -->
</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>

View File

@@ -45,11 +45,6 @@
<title>Folder</title>
<parent>cm:cmobject</parent>
<archive>true</archive>
<properties>
<property name="cm:orderedchildren">
<type>d:boolean</type>
</property>
</properties>
<associations>
<child-association name="cm:contains">
<source>
@@ -81,10 +76,6 @@
<tokenised>true</tokenised>
</index>
</property>
<property name="cm:readonly">
<type>d:boolean</type>
<mandatory>false</mandatory>
</property>
</properties>
</type>
@@ -186,8 +177,14 @@
<parent>cm:cmobject</parent>
<associations>
<child-association name="cm:categories">
<target>
<source>
<mandatory>false</mandatory>
<many>true</many>
</source>
<target>
<class>cm:category</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
</associations>
@@ -201,8 +198,14 @@
<parent>cm:cmobject</parent>
<associations>
<child-association name="cm:subcategories">
<source>
<mandatory>false</mandatory>
<many>true</many>
</source>
<target>
<class>cm:category</class>
<mandatory>false</mandatory>
<many>true</many>
</target>
</child-association>
</associations>
@@ -669,6 +672,10 @@
<type>d:text</type>
<multiple>true</multiple>
</property>
<property name="cm:subjectline">
<title>Subject</title>
<type>d:text</type>
</property>
<property name="cm:sentdate">
<title>Sent Date</title>
<type>d:datetime</type>

View File

@@ -41,6 +41,9 @@
<property name="sys:versionLabel">
<type>d:text</type>
</property>
<property name="sys:versionBuild">
<type>d:text</type>
</property>
<property name="sys:versionSchema">
<type>d:int</type>
<mandatory enforced="true">true</mandatory>
@@ -127,6 +130,11 @@
<title>Incomplete</title>
</aspect>
<!-- aspect to tag temporary nodes -->
<aspect name="sys:temporary">
<title>Temporary</title>
</aspect>
<!-- details stored on archived nodes -->
<aspect name="sys:archived">
<title>Archived</title>

View File

@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8"?>
<model name="wf:workflowmodel" xmlns="http://www.alfresco.org/model/dictionary/1.0">
<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"/>
<import uri="http://www.alfresco.org/model/bpm/1.0" prefix="bpm"/>
</imports>
<namespaces>
<namespace uri="http://www.alfresco.org/model/workflow/1.0" prefix="wf"/>
</namespaces>
<types>
<!-- -->
<!-- Basic Review & Approve Tasks -->
<!-- -->
<type name="wf:submitReviewTask">
<title>Submit Review Task</title>
<parent>bpm:workflowTask</parent>
<properties>
<property name="wf:reviewDueDate">
<title>Review Due Date</title>
<type>d:date</type>
</property>
<property name="wf:reviewPriority">
<title>Review Priority</title>
<type>d:int</type>
<default>2</default>
<constraints>
<constraint ref="bpm:allowedPriority"/>
</constraints>
</property>
</properties>
<associations>
<association name="wf:reviewer">
<title>Reviewer</title>
<source>
<mandatory>false</mandatory>
<many>false</many>
</source>
<target>
<class>cm:person</class>
<mandatory>true</mandatory>
<many>false</many>
</target>
</association>
</associations>
<overrides>
<property name="bpm:packageActionGroup">
<default>workflow_collection_actions</default>
</property>
<property name="bpm:packageItemActionGroup">
<default>workflow_item_collection_actions</default>
</property>
</overrides>
</type>
<type name="wf:reviewTask">
<title>Review Task</title>
<parent>bpm:workflowTask</parent>
<overrides>
<property name="bpm:packageItemActionGroup">
<default>workflow_item_edit_actions</default>
</property>
</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:completedAdhocTask">
<title>Completed Adhoc Task</title>
<parent>wf:baseAdhocTask</parent>
</type>
</types>
</model>