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

Commit 8212c47

Browse files
eouthwaiteeouthwaite
authored
Merge pull request #131 from marklogic-community/feature-126-merging
Feature 126 merging
2 parents 2484de0 + 2df451c commit 8212c47

File tree

93 files changed

+9629
-557
lines changed

Some content is hidden

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

93 files changed

+9629
-557
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

‎data/examples/bpmn2/InclusiveGatewayTest-01.bpmn2‎

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>

‎data/examples/bpmn2/InclusiveGatewayTest-02.bpmn‎

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>

‎deploy/build.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ modules-prefix=/
3232
# the location of your marklogic configuration file
3333
#
3434
# config.file=${basedir}/deploy/ml-config.xml
35+
application-conf-file=
3536

3637
#
3738
# the location of your triggers configuration file

‎deploy/default.properties‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ app-role=${app-name}-role
108108
content-db=${app-name}-content
109109
modules-db=${app-name}-modules
110110

111+
# Note: purely for legacy support!
112+
app-modules-db=${modules-db}
113+
111114
#
112115
# Number of forests to create per host in the group for the content-db
113116
#
@@ -193,6 +196,12 @@ install-xcc=true
193196
#
194197
use-https=false
195198

199+
#
200+
# set this to true if you are accessing your rest server through
201+
# a proxy that uses https (but your rest server does not)
202+
#
203+
use-https-for-rest=false
204+
196205
## Security
197206
#
198207
# The authentication used for your appserver
@@ -210,13 +219,16 @@ ssl-certificate-template=
210219
#
211220
# The default values point to Roxy file
212221
#
213-
# url-rewriter=/roxy/rewrite.xqy
214-
# error-handler=/roxy/error.xqy
222+
url-rewriter=/roxy/rewrite.xqy
223+
error-handler=/roxy/error.xqy
215224
rewrite-resolves-globally=
216225

217226
# Environments recognized by Roxy
218227
environments=local,dev,prod
219228

229+
# Environments that can be wiped without confirmation
230+
wipe_environments=local
231+
220232
#
221233
# The Major version of ML server across your environments (6, 7, or 8). You can override
222234
# this value in build.properties if all of your servers are the same version
@@ -260,3 +272,19 @@ http.retry-count=3
260272
http.open-timeout=5
261273
http.read-timeout=300
262274
http.retry-delay=15
275+
276+
#
277+
# Application configuration files
278+
#
279+
application-conf-file=src/app/config/config.xqy
280+
281+
# Verified restart config
282+
#
283+
verify_retry_max=5
284+
verify_retry_interval=10
285+
286+
#
287+
# CPF Pipeline configuration file
288+
#
289+
# can be overridden from {env}.properties
290+
pipeline-config-file=${basedir}/deploy/pipeline-config.xml

‎deploy/lib/Help.rb‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,11 +213,14 @@ def self.restart
213213
214214
General options:
215215
-v, [--verbose] # Verbose output
216+
--no-verify # Skip verifying the restart
217+
--legacy # Don't use Management REST api
216218
217219
Restart the MarkLogic process in the given environment on each host in the
218220
specified group. If no group is specified, restart the MarkLogic process
219221
on each host in the group to which the target host belongs. Use 'cluster'
220-
to restart all hosts within the cluster to which the target belongs.
222+
to restart all hosts within the cluster to which the target belongs. Restart
223+
is verified by default, Management REST api is used if available.
221224
DOC
222225
end
223226

‎deploy/lib/MLClient.rb‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def MLClient.no_prompt=(no_prompt)
2828

2929
def initialize(options)
3030
@ml_username = options[:user_name]
31-
@ml_password = options[:password].xquery_unsafe
31+
@ml_password = options[:password]
3232
@logger = options[:logger] || logger
3333
@request = {}
3434

@@ -88,13 +88,15 @@ def build_request_params(url, verb)
8888
}
8989
end
9090

91-
def go(url, verb, headers = {}, params = nil, body = nil, xcc = false)
91+
def go(url, verb, headers = nil, params = nil, body = nil, xcc = false)
9292
logger.debug(%Q{[#{verb.upcase}]\t#{url}})
9393
password_prompt
9494
request_params = build_request_params(url, verb)
9595
# configure headers
96-
headers.each do |k, v|
97-
request_params[:request][k] = v
96+
if headers
97+
headers.each do |k, v|
98+
request_params[:request][k] = v
99+
end
98100
end
99101

100102
raise ExitException.new("Don't combine params and body. One or the other please") if (params && body)

‎deploy/lib/java/marklogic-xcc-9.0.1.jar‎

295 KB
Binary file not shown.

‎deploy/lib/java/xstream-1.4.10.jar‎

576 KB
Binary file not shown.

0 commit comments

Comments
 (0)