Skip to content
This repository was archived by the owner on Nov 9, 2022. It is now read-only.

Commit f2f3640

Browse files
committed
Merge fixes from branch 'develop' into develop-9.0
2 parents cba5f25 + 8212c47 commit f2f3640

File tree

62 files changed

+2948
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2948
-216
lines changed

CHANGELOG.mdown

Lines changed: 416 additions & 0 deletions
Large diffs are not rendered by default.

config/webserver-settings.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
# CREATED BY YEOMAN generator-mljsworkplace!
44

5-
RESTHOST=localhost
6-
RESTPORT=8040
7-
DATABASE=workflow-content
8-
MLADMINUSER=admin
9-
MLADMINPASS=admin
10-
MLAUTH=digest
5+
export RESTHOST=127.0.0.1
6+
export RESTPORT=8040
7+
export DATABASE=workflow-content
8+
export MLADMINUSER=admin
9+
export MLADMINPASS=admin
10+
export MLAUTH=digest
1111
MLDEFAULTUSER=nobody
1212
WEBPORT=5001
1313
ALERTPORT=5002
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- origin at X=0.0 Y=0.0 -->
3+
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="_GqqWIBraEeiDzsBG-Hp4NA" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.4.2.Final-v20171109-1930-B1">
4+
<bpmn2:itemDefinition id="ItemDefinition_18" isCollection="false" structureRef="xs:boolean"/>
5+
<bpmn2:process id="Process_1" name="Process 1" isExecutable="false">
6+
<bpmn2:startEvent id="StartEvent_1" name="Start">
7+
<bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
8+
</bpmn2:startEvent>
9+
<bpmn2:endEvent id="EndEvent_1" name="End">
10+
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
11+
</bpmn2:endEvent>
12+
<bpmn2:inclusiveGateway id="InclusiveGateway_1" name="InclusiveGatewayDiverging" gatewayDirection="Diverging">
13+
<bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
14+
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
15+
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
16+
</bpmn2:inclusiveGateway>
17+
<bpmn2:inclusiveGateway id="InclusiveGateway_2" name="InclusiveGatewayConverging" gatewayDirection="Converging">
18+
<bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
19+
<bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
20+
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
21+
</bpmn2:inclusiveGateway>
22+
<bpmn2:userTask id="UserTask_1" name="TaskA">
23+
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
24+
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
25+
</bpmn2:userTask>
26+
<bpmn2:userTask id="UserTask_2" name="TaskB">
27+
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
28+
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
29+
</bpmn2:userTask>
30+
<bpmn2:sequenceFlow id="SequenceFlow_1" sourceRef="InclusiveGateway_1" targetRef="UserTask_1">
31+
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1" evaluatesToTypeRef="ItemDefinition_18" language="http://www.w3.org/1999/XPath">/wf:process/wf:data/value = 'A'</bpmn2:conditionExpression>
32+
</bpmn2:sequenceFlow>
33+
<bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="InclusiveGateway_1" targetRef="UserTask_2">
34+
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_2" language="http://www.w3.org/1999/XPath">/wf:process/wf:data/value = 'B'</bpmn2:conditionExpression>
35+
</bpmn2:sequenceFlow>
36+
<bpmn2:sequenceFlow id="SequenceFlow_3" sourceRef="UserTask_1" targetRef="InclusiveGateway_2"/>
37+
<bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="UserTask_2" targetRef="InclusiveGateway_2"/>
38+
<bpmn2:sequenceFlow id="SequenceFlow_5" sourceRef="InclusiveGateway_2" targetRef="EndEvent_1"/>
39+
<bpmn2:sequenceFlow id="SequenceFlow_6" sourceRef="StartEvent_1" targetRef="InclusiveGateway_1"/>
40+
</bpmn2:process>
41+
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
42+
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
43+
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
44+
<dc:Bounds height="36.0" width="36.0" x="150.0" y="255.0"/>
45+
<bpmndi:BPMNLabel id="BPMNLabel_1" labelStyle="BPMNLabelStyle_1">
46+
<dc:Bounds height="16.0" width="29.0" x="153.0" y="291.0"/>
47+
</bpmndi:BPMNLabel>
48+
</bpmndi:BPMNShape>
49+
<bpmndi:BPMNShape id="BPMNShape_EndEvent_1" bpmnElement="EndEvent_1">
50+
<dc:Bounds height="36.0" width="36.0" x="800.0" y="255.0"/>
51+
<bpmndi:BPMNLabel id="BPMNLabel_2" labelStyle="BPMNLabelStyle_1">
52+
<dc:Bounds height="16.0" width="24.0" x="806.0" y="291.0"/>
53+
</bpmndi:BPMNLabel>
54+
</bpmndi:BPMNShape>
55+
<bpmndi:BPMNShape id="BPMNShape_InclusiveGateway_1" bpmnElement="InclusiveGateway_1" isMarkerVisible="true">
56+
<dc:Bounds height="50.0" width="50.0" x="350.0" y="248.0"/>
57+
<bpmndi:BPMNLabel id="BPMNLabel_3" labelStyle="BPMNLabelStyle_1">
58+
<dc:Bounds height="48.0" width="58.0" x="346.0" y="298.0"/>
59+
</bpmndi:BPMNLabel>
60+
</bpmndi:BPMNShape>
61+
<bpmndi:BPMNShape id="BPMNShape_InclusiveGateway_2" bpmnElement="InclusiveGateway_2" isMarkerVisible="true">
62+
<dc:Bounds height="50.0" width="50.0" x="600.0" y="248.0"/>
63+
<bpmndi:BPMNLabel id="BPMNLabel_4" labelStyle="BPMNLabelStyle_1">
64+
<dc:Bounds height="48.0" width="69.0" x="591.0" y="298.0"/>
65+
</bpmndi:BPMNLabel>
66+
</bpmndi:BPMNShape>
67+
<bpmndi:BPMNShape id="BPMNShape_UserTask_1" bpmnElement="UserTask_1" isExpanded="true">
68+
<dc:Bounds height="50.0" width="110.0" x="450.0" y="153.0"/>
69+
<bpmndi:BPMNLabel id="BPMNLabel_5" labelStyle="BPMNLabelStyle_1">
70+
<dc:Bounds height="16.0" width="39.0" x="485.0" y="170.0"/>
71+
</bpmndi:BPMNLabel>
72+
</bpmndi:BPMNShape>
73+
<bpmndi:BPMNShape id="BPMNShape_UserTask_2" bpmnElement="UserTask_2" isExpanded="true">
74+
<dc:Bounds height="50.0" width="110.0" x="450.0" y="348.0"/>
75+
<bpmndi:BPMNLabel id="BPMNLabel_6" labelStyle="BPMNLabelStyle_1">
76+
<dc:Bounds height="16.0" width="39.0" x="485.0" y="365.0"/>
77+
</bpmndi:BPMNLabel>
78+
</bpmndi:BPMNShape>
79+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="BPMNShape_InclusiveGateway_1" targetElement="BPMNShape_UserTask_1">
80+
<di:waypoint xsi:type="dc:Point" x="375.0" y="248.0"/>
81+
<di:waypoint xsi:type="dc:Point" x="375.0" y="178.0"/>
82+
<di:waypoint xsi:type="dc:Point" x="450.0" y="178.0"/>
83+
<bpmndi:BPMNLabel id="BPMNLabel_7"/>
84+
</bpmndi:BPMNEdge>
85+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="BPMNShape_InclusiveGateway_1" targetElement="BPMNShape_UserTask_2">
86+
<di:waypoint xsi:type="dc:Point" x="375.0" y="298.0"/>
87+
<di:waypoint xsi:type="dc:Point" x="375.0" y="373.0"/>
88+
<di:waypoint xsi:type="dc:Point" x="450.0" y="373.0"/>
89+
<bpmndi:BPMNLabel id="BPMNLabel_8"/>
90+
</bpmndi:BPMNEdge>
91+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="BPMNShape_UserTask_1" targetElement="BPMNShape_InclusiveGateway_2">
92+
<di:waypoint xsi:type="dc:Point" x="560.0" y="178.0"/>
93+
<di:waypoint xsi:type="dc:Point" x="625.0" y="178.0"/>
94+
<di:waypoint xsi:type="dc:Point" x="625.0" y="248.0"/>
95+
<bpmndi:BPMNLabel id="BPMNLabel_9"/>
96+
</bpmndi:BPMNEdge>
97+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="BPMNShape_UserTask_2" targetElement="BPMNShape_InclusiveGateway_2">
98+
<di:waypoint xsi:type="dc:Point" x="560.0" y="373.0"/>
99+
<di:waypoint xsi:type="dc:Point" x="625.0" y="373.0"/>
100+
<di:waypoint xsi:type="dc:Point" x="625.0" y="298.0"/>
101+
<bpmndi:BPMNLabel id="BPMNLabel_10"/>
102+
</bpmndi:BPMNEdge>
103+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="BPMNShape_InclusiveGateway_2" targetElement="BPMNShape_EndEvent_1">
104+
<di:waypoint xsi:type="dc:Point" x="650.0" y="273.0"/>
105+
<di:waypoint xsi:type="dc:Point" x="725.0" y="273.0"/>
106+
<di:waypoint xsi:type="dc:Point" x="800.0" y="273.0"/>
107+
<bpmndi:BPMNLabel id="BPMNLabel_11"/>
108+
</bpmndi:BPMNEdge>
109+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_InclusiveGateway_1">
110+
<di:waypoint xsi:type="dc:Point" x="186.0" y="273.0"/>
111+
<di:waypoint xsi:type="dc:Point" x="268.0" y="273.0"/>
112+
<di:waypoint xsi:type="dc:Point" x="350.0" y="273.0"/>
113+
<bpmndi:BPMNLabel id="BPMNLabel_12"/>
114+
</bpmndi:BPMNEdge>
115+
</bpmndi:BPMNPlane>
116+
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
117+
<dc:Font name="arial" size="9.0"/>
118+
</bpmndi:BPMNLabelStyle>
119+
</bpmndi:BPMNDiagram>
120+
</bpmn2:definitions>
Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- origin at X=0.0 Y=0.0 -->
3+
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xs="http://www.w3.org/2001/XMLSchema" id="_GqqWIBraEeiDzsBG-Hp4NA" exporter="org.eclipse.bpmn2.modeler.core" exporterVersion="1.4.2.Final-v20171109-1930-B1">
4+
<bpmn2:itemDefinition id="ItemDefinition_18" isCollection="false" structureRef="xs:boolean"/>
5+
<bpmn2:process id="Process_1" name="Process 1" isExecutable="false">
6+
<bpmn2:startEvent id="StartEvent_1" name="Start">
7+
<bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
8+
</bpmn2:startEvent>
9+
<bpmn2:endEvent id="EndEvent_1" name="End">
10+
<bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
11+
</bpmn2:endEvent>
12+
<bpmn2:inclusiveGateway id="InclusiveGateway_1" name="InclusiveGatewayDiverging" gatewayDirection="Diverging">
13+
<bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
14+
<bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
15+
<bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
16+
</bpmn2:inclusiveGateway>
17+
<bpmn2:inclusiveGateway id="InclusiveGateway_2" name="InclusiveGatewayConverging" gatewayDirection="Converging">
18+
<bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
19+
<bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
20+
<bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
21+
</bpmn2:inclusiveGateway>
22+
<bpmn2:userTask id="UserTask_1" name="TaskA">
23+
<bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
24+
<bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
25+
</bpmn2:userTask>
26+
<bpmn2:userTask id="UserTask_2" name="TaskB">
27+
<bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
28+
<bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
29+
</bpmn2:userTask>
30+
<bpmn2:sequenceFlow id="SequenceFlow_1" sourceRef="InclusiveGateway_1" targetRef="UserTask_1">
31+
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_1" evaluatesToTypeRef="ItemDefinition_18" language="http://www.w3.org/1999/XPath">/wf:process/wf:data/value1 = 'A'</bpmn2:conditionExpression>
32+
</bpmn2:sequenceFlow>
33+
<bpmn2:sequenceFlow id="SequenceFlow_2" sourceRef="InclusiveGateway_1" targetRef="UserTask_2">
34+
<bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" id="FormalExpression_2" language="http://www.w3.org/1999/XPath">/wf:process/wf:data/value2 = 'B'</bpmn2:conditionExpression>
35+
</bpmn2:sequenceFlow>
36+
<bpmn2:sequenceFlow id="SequenceFlow_3" sourceRef="UserTask_1" targetRef="InclusiveGateway_2"/>
37+
<bpmn2:sequenceFlow id="SequenceFlow_4" sourceRef="UserTask_2" targetRef="InclusiveGateway_2"/>
38+
<bpmn2:sequenceFlow id="SequenceFlow_5" sourceRef="InclusiveGateway_2" targetRef="EndEvent_1"/>
39+
<bpmn2:sequenceFlow id="SequenceFlow_6" sourceRef="StartEvent_1" targetRef="InclusiveGateway_1"/>
40+
</bpmn2:process>
41+
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
42+
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1">
43+
<bpmndi:BPMNShape id="BPMNShape_StartEvent_1" bpmnElement="StartEvent_1">
44+
<dc:Bounds height="36.0" width="36.0" x="150.0" y="255.0"/>
45+
<bpmndi:BPMNLabel id="BPMNLabel_1" labelStyle="BPMNLabelStyle_1">
46+
<dc:Bounds height="16.0" width="29.0" x="153.0" y="291.0"/>
47+
</bpmndi:BPMNLabel>
48+
</bpmndi:BPMNShape>
49+
<bpmndi:BPMNShape id="BPMNShape_EndEvent_1" bpmnElement="EndEvent_1">
50+
<dc:Bounds height="36.0" width="36.0" x="800.0" y="255.0"/>
51+
<bpmndi:BPMNLabel id="BPMNLabel_2" labelStyle="BPMNLabelStyle_1">
52+
<dc:Bounds height="16.0" width="24.0" x="806.0" y="291.0"/>
53+
</bpmndi:BPMNLabel>
54+
</bpmndi:BPMNShape>
55+
<bpmndi:BPMNShape id="BPMNShape_InclusiveGateway_1" bpmnElement="InclusiveGateway_1" isMarkerVisible="true">
56+
<dc:Bounds height="50.0" width="50.0" x="350.0" y="248.0"/>
57+
<bpmndi:BPMNLabel id="BPMNLabel_3" labelStyle="BPMNLabelStyle_1">
58+
<dc:Bounds height="48.0" width="58.0" x="346.0" y="298.0"/>
59+
</bpmndi:BPMNLabel>
60+
</bpmndi:BPMNShape>
61+
<bpmndi:BPMNShape id="BPMNShape_InclusiveGateway_2" bpmnElement="InclusiveGateway_2" isMarkerVisible="true">
62+
<dc:Bounds height="50.0" width="50.0" x="600.0" y="248.0"/>
63+
<bpmndi:BPMNLabel id="BPMNLabel_4" labelStyle="BPMNLabelStyle_1">
64+
<dc:Bounds height="48.0" width="69.0" x="591.0" y="298.0"/>
65+
</bpmndi:BPMNLabel>
66+
</bpmndi:BPMNShape>
67+
<bpmndi:BPMNShape id="BPMNShape_UserTask_1" bpmnElement="UserTask_1" isExpanded="true">
68+
<dc:Bounds height="50.0" width="110.0" x="450.0" y="153.0"/>
69+
<bpmndi:BPMNLabel id="BPMNLabel_5" labelStyle="BPMNLabelStyle_1">
70+
<dc:Bounds height="16.0" width="39.0" x="485.0" y="170.0"/>
71+
</bpmndi:BPMNLabel>
72+
</bpmndi:BPMNShape>
73+
<bpmndi:BPMNShape id="BPMNShape_UserTask_2" bpmnElement="UserTask_2" isExpanded="true">
74+
<dc:Bounds height="50.0" width="110.0" x="450.0" y="348.0"/>
75+
<bpmndi:BPMNLabel id="BPMNLabel_6" labelStyle="BPMNLabelStyle_1">
76+
<dc:Bounds height="16.0" width="39.0" x="485.0" y="365.0"/>
77+
</bpmndi:BPMNLabel>
78+
</bpmndi:BPMNShape>
79+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="BPMNShape_InclusiveGateway_1" targetElement="BPMNShape_UserTask_1">
80+
<di:waypoint xsi:type="dc:Point" x="375.0" y="248.0"/>
81+
<di:waypoint xsi:type="dc:Point" x="375.0" y="178.0"/>
82+
<di:waypoint xsi:type="dc:Point" x="450.0" y="178.0"/>
83+
<bpmndi:BPMNLabel id="BPMNLabel_7"/>
84+
</bpmndi:BPMNEdge>
85+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="BPMNShape_InclusiveGateway_1" targetElement="BPMNShape_UserTask_2">
86+
<di:waypoint xsi:type="dc:Point" x="375.0" y="298.0"/>
87+
<di:waypoint xsi:type="dc:Point" x="375.0" y="373.0"/>
88+
<di:waypoint xsi:type="dc:Point" x="450.0" y="373.0"/>
89+
<bpmndi:BPMNLabel id="BPMNLabel_8"/>
90+
</bpmndi:BPMNEdge>
91+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="BPMNShape_UserTask_1" targetElement="BPMNShape_InclusiveGateway_2">
92+
<di:waypoint xsi:type="dc:Point" x="560.0" y="178.0"/>
93+
<di:waypoint xsi:type="dc:Point" x="625.0" y="178.0"/>
94+
<di:waypoint xsi:type="dc:Point" x="625.0" y="248.0"/>
95+
<bpmndi:BPMNLabel id="BPMNLabel_9"/>
96+
</bpmndi:BPMNEdge>
97+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="BPMNShape_UserTask_2" targetElement="BPMNShape_InclusiveGateway_2">
98+
<di:waypoint xsi:type="dc:Point" x="560.0" y="373.0"/>
99+
<di:waypoint xsi:type="dc:Point" x="625.0" y="373.0"/>
100+
<di:waypoint xsi:type="dc:Point" x="625.0" y="298.0"/>
101+
<bpmndi:BPMNLabel id="BPMNLabel_10"/>
102+
</bpmndi:BPMNEdge>
103+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_5" sourceElement="BPMNShape_InclusiveGateway_2" targetElement="BPMNShape_EndEvent_1">
104+
<di:waypoint xsi:type="dc:Point" x="650.0" y="273.0"/>
105+
<di:waypoint xsi:type="dc:Point" x="725.0" y="273.0"/>
106+
<di:waypoint xsi:type="dc:Point" x="800.0" y="273.0"/>
107+
<bpmndi:BPMNLabel id="BPMNLabel_11"/>
108+
</bpmndi:BPMNEdge>
109+
<bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="BPMNShape_StartEvent_1" targetElement="BPMNShape_InclusiveGateway_1">
110+
<di:waypoint xsi:type="dc:Point" x="186.0" y="273.0"/>
111+
<di:waypoint xsi:type="dc:Point" x="268.0" y="273.0"/>
112+
<di:waypoint xsi:type="dc:Point" x="350.0" y="273.0"/>
113+
<bpmndi:BPMNLabel id="BPMNLabel_12"/>
114+
</bpmndi:BPMNEdge>
115+
</bpmndi:BPMNPlane>
116+
<bpmndi:BPMNLabelStyle id="BPMNLabelStyle_1">
117+
<dc:Font name="arial" size="9.0"/>
118+
</bpmndi:BPMNLabelStyle>
119+
</bpmndi:BPMNDiagram>
120+
</bpmn2:definitions>

documentation/INSTALL.md

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,27 @@
1-
### Roxy Installation
1+
## Installation methods
22

3-
To install via roxy, within the roxy directory, edit the properties file for the target environment - for example, ``deploy/local.properties`` and run the following commands:
3+
There are two main ways to install the marklogicworkflow project:
4+
5+
* Roxy Installation (stand-alone project, or starting point for a new project)
6+
* Add modules to existing project
7+
8+
## Roxy Installation
9+
10+
To install via roxy, edit the properties file for the target environment - for example, ``deploy/local.properties`` and run the following commands:
411

512
./ml local bootstrap
613
./ml local deploy modules
714
./ml local deploy cpf
815

9-
Note that if left as is, the [Roxy test harness](https://github.com/marklogic-community/roxy/wiki/Unit-Testing) will also be set up at http://localhost:8042/test/
16+
For more deployment details see the [Roxy project ](https://github.com/marklogic-community/roxy)
1017

11-
### Configure MIME types
18+
Note that if left as is, the [Roxy test harness](https://github.com/marklogic-community/roxy/wiki/Unit-Testing) will also be set up at http://localhost:8042/test/
1219

13-
Default filenames for SCXML and BPMN2 models are .scxml and .bpmn respectively. These aren't recognised by MarkLogic
14-
by default. Add these types are application/xml mime types in MarkLogic Server for them to be handled correctly. *This will be performed automatically via roxy bootstrap.*
20+
## Adding to an existing project
1521

1622
### Configuring a database for MarkLogic Workflow
1723

18-
You can install a MarkLogic Workflow modules database from the modules folder within this repository. Once done,
24+
You can install a MarkLogic Workflow modules database from the src/workflowengine folder within this repository. Once done,
1925
your application's app server can be configured to either use this modules database, or more likely, use a modules
2026
database whose modules database points to this database (modules database chaining).
2127

@@ -29,7 +35,21 @@ You need to ensure your content database has a Triggers database configured, and
2935

3036
*Installation including triggers and REST extensions will be performed automatically via the Roxy commands above.*
3137

32-
## Configure global process task settings
38+
### Configure MIME types
39+
40+
Default filenames for SCXML and BPMN2 models are .scxml and .bpmn respectively. These aren't recognised by MarkLogic
41+
by default. Add these types are application/xml mime types in MarkLogic Server for them to be handled correctly. *This will be performed automatically via Roxy bootstrap.*
42+
43+
### Configure Indexes
44+
45+
The project requires two range element attribute indexes:
46+
47+
* wf:process/@id
48+
* wf:process/@attachment
49+
50+
See deploy/ml-config.xml for full details. *These will be generated automatically via a Roxy bootstrap.*
51+
52+
### Configure global process task settings
3353

3454
Some tasks require global configuration. An example of this is the email task which requires SMTP settings.
3555

0 commit comments

Comments
 (0)