-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'flowable6.x' of github.com:flowable/flowable-engine int…
…o flowable-release-6.8.1
- Loading branch information
Showing
20 changed files
with
1,820 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
255 changes: 254 additions & 1 deletion
255
.../src/main/java/org/flowable/cmmn/engine/impl/runtime/AbstractCmmnDynamicStateManager.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1,169 changes: 1,169 additions & 0 deletions
1,169
...cmmn-engine/src/test/java/org/flowable/cmmn/test/migration/CaseInstanceMigrationTest.java
Large diffs are not rendered by default.
Oops, something went wrong.
25 changes: 25 additions & 0 deletions
25
...urces/org/flowable/cmmn/test/migration/exitsentry-onpart-eventdeferred-extratask.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry On Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"/> | ||
| <planItem id="planItem3" name="Task 3" definitionRef="humanTask3"/> | ||
| <sentry id="sentrycmmnExitSentry_1"> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_1" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_2" sourceRef="planItem2"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask3" name="Task 3" flowable:assignee="${initiator}"/> | ||
|
|
||
| <exitCriterion id="cmmnExitSentry_1" sentryRef="sentrycmmnExitSentry_1" /> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
23 changes: 23 additions & 0 deletions
23
.../test/resources/org/flowable/cmmn/test/migration/exitsentry-onpart-eventdeferred.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry On Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"/> | ||
| <sentry id="sentrycmmnExitSentry_1"> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_1" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_2" sourceRef="planItem2"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
|
|
||
| <exitCriterion id="cmmnExitSentry_1" sentryRef="sentrycmmnExitSentry_1" /> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
23 changes: 23 additions & 0 deletions
23
...st/resources/org/flowable/cmmn/test/migration/exitsentry-onpart-id-eventdeferred.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry On Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"/> | ||
| <sentry id="sentrycmmnExitSentry_1"> | ||
| <planItemOnPart id="sentryOnPart1cmmnExitSentry_1" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <planItemOnPart id="sentryOnPart2cmmnExitSentry_2" sourceRef="planItem2"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
|
|
||
| <exitCriterion id="cmmnExitSentry_1" sentryRef="sentrycmmnExitSentry_1" /> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
30 changes: 30 additions & 0 deletions
30
...org/flowable/cmmn/test/migration/exitsentry-stage-onpart-eventdeferred-extratask.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry On Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Stage" definitionRef="expandedStage1"> | ||
| <exitCriterion id="cmmnExitSentry_1" sentryRef="sentrycmmnExitSentry_1" /> | ||
| </planItem> | ||
| <sentry id="sentrycmmnExitSentry_1"> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_1" sourceRef="stagePlanItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_2" sourceRef="stagePlanItem2"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <stage id="expandedStage1"> | ||
| <planItem id="stagePlanItem1" name="Stage task 1" definitionRef="stageHumanTask1" /> | ||
| <planItem id="stagePlanItem2" name="Stage task 2" definitionRef="stageHumanTask2" /> | ||
| <planItem id="stagePlanItem3" name="Stage task 3" definitionRef="stageHumanTask3" /> | ||
| <humanTask id="stageHumanTask1" name="Stage task 1" flowable:assignee="${initiator}" /> | ||
| <humanTask id="stageHumanTask2" name="Stage task 2" flowable:assignee="${initiator}" /> | ||
| <humanTask id="stageHumanTask3" name="Stage task 3" flowable:assignee="${initiator}" /> | ||
| </stage> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
28 changes: 28 additions & 0 deletions
28
...resources/org/flowable/cmmn/test/migration/exitsentry-stage-onpart-eventdeferred.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry On Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Stage" definitionRef="expandedStage1"> | ||
| <exitCriterion id="cmmnExitSentry_1" sentryRef="sentrycmmnExitSentry_1" /> | ||
| </planItem> | ||
| <sentry id="sentrycmmnExitSentry_1"> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_1" sourceRef="stagePlanItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <planItemOnPart id="sentryOnPartcmmnExitSentry_2" sourceRef="stagePlanItem2"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <stage id="expandedStage1" name="Stage"> | ||
| <planItem id="stagePlanItem1" name="Stage task 1" definitionRef="stageHumanTask1" /> | ||
| <planItem id="stagePlanItem2" name="Stage task 2" definitionRef="stageHumanTask2" /> | ||
| <humanTask id="stageHumanTask1" name="Stage task 1" flowable:assignee="${initiator}" /> | ||
| <humanTask id="stageHumanTask2" name="Stage task 2" flowable:assignee="${initiator}" /> | ||
| </stage> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
22 changes: 22 additions & 0 deletions
22
...resources/org/flowable/cmmn/test/migration/sentry-ifpart-eventdeferred-extratask.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry If Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"> | ||
| <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry"></entryCriterion> | ||
| </planItem> | ||
| <planItem id="planItem3" name="Task 3" definitionRef="humanTask3"/> | ||
| <sentry id="sentrycmmnEntrySentry"> | ||
| <ifPart id="ifpart1"> | ||
| <condition><![CDATA[${vars:equals(var1, 'test')}]]></condition> | ||
| </ifPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask3" name="Task 3" flowable:assignee="${initiator}"/> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
20 changes: 20 additions & 0 deletions
20
.../src/test/resources/org/flowable/cmmn/test/migration/sentry-ifpart-eventdeferred.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry If Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"> | ||
| <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry"></entryCriterion> | ||
| </planItem> | ||
| <sentry id="sentrycmmnEntrySentry"> | ||
| <ifPart id="ifpart1"> | ||
| <condition><![CDATA[${vars:equals(var1, 'test')}]]></condition> | ||
| </ifPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
23 changes: 23 additions & 0 deletions
23
...ources/org/flowable/cmmn/test/migration/twosentry-ifpart-condition-eventdeferred.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry If Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"> | ||
| <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry"></entryCriterion> | ||
| </planItem> | ||
| <sentry id="sentrycmmnEntrySentry"> | ||
| <planItemOnPart id="sentryOnPartcmmnEntrySentry_2" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <ifPart id="ifpart1"> | ||
| <condition><![CDATA[${vars:equals(var1, 'test2')}]]></condition> | ||
| </ifPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
25 changes: 25 additions & 0 deletions
25
...ources/org/flowable/cmmn/test/migration/twosentry-ifpart-eventdeferred-extratask.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry If Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"> | ||
| <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry"></entryCriterion> | ||
| </planItem> | ||
| <planItem id="planItem3" name="Task 3" definitionRef="humanTask3"/> | ||
| <sentry id="sentrycmmnEntrySentry"> | ||
| <planItemOnPart id="sentryOnPartcmmnEntrySentry_2" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <ifPart id="ifpart2"> | ||
| <condition><![CDATA[${vars:equals(var1, 'test')}]]></condition> | ||
| </ifPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask3" name="Task 3" flowable:assignee="${initiator}"/> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
23 changes: 23 additions & 0 deletions
23
...c/test/resources/org/flowable/cmmn/test/migration/twosentry-ifpart-eventdeferred.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry If Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"> | ||
| <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry"></entryCriterion> | ||
| </planItem> | ||
| <sentry id="sentrycmmnEntrySentry"> | ||
| <planItemOnPart id="sentryOnPartcmmnEntrySentry_2" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <ifPart id="ifpart1"> | ||
| <condition><![CDATA[${vars:equals(var1, 'test')}]]></condition> | ||
| </ifPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
23 changes: 23 additions & 0 deletions
23
...ine/src/test/resources/org/flowable/cmmn/test/migration/twosentry-ifpart-onevent.cmmn.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <definitions xmlns="http://www.omg.org/spec/CMMN/20151109/MODEL" | ||
| xmlns:flowable="http://flowable.org/cmmn" | ||
| targetNamespace="http://flowable.org/cmmn"> | ||
| <case id="testCase" name="Sentry If Part Test Case" flowable:initiatorVariableName="initiator"> | ||
| <casePlanModel id="onecaseplanmodel1" name="Case plan model"> | ||
| <planItem id="planItem1" name="Task 1" definitionRef="humanTask1"/> | ||
| <planItem id="planItem2" name="Task 2" definitionRef="humanTask2"> | ||
| <entryCriterion id="cmmnEntrySentry_1" sentryRef="sentrycmmnEntrySentry"></entryCriterion> | ||
| </planItem> | ||
| <sentry id="sentrycmmnEntrySentry" flowable:triggerMode="onEvent"> | ||
| <planItemOnPart id="sentryOnPartcmmnEntrySentry_2" sourceRef="planItem1"> | ||
| <standardEvent>complete</standardEvent> | ||
| </planItemOnPart> | ||
| <ifPart id="ifpart1"> | ||
| <condition><![CDATA[${vars:equals(var1, 'test')}]]></condition> | ||
| </ifPart> | ||
| </sentry> | ||
| <humanTask id="humanTask1" name="Task 1" flowable:assignee="${initiator}"/> | ||
| <humanTask id="humanTask2" name="Task 2" flowable:assignee="${initiator}"/> | ||
| </casePlanModel> | ||
| </case> | ||
| </definitions> |
Oops, something went wrong.