Skip to content

Commit ee9d2bf

Browse files
Yavor16Yavor16
authored
Replace inheritVariables with explicit in-mappings for undeployAppSubProcess (#1897)
LMCROSSITXSADEPLOY-3028
1 parent 536ab21 commit ee9d2bf

4 files changed

Lines changed: 152 additions & 5 deletions

File tree

‎multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/rollback-mta.bpmn‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,37 @@
8484
<extensionElements></extensionElements>
8585
</multiInstanceLoopCharacteristics>
8686
</callActivity>
87-
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
87+
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
88+
<extensionElements>
89+
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
90+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
91+
<flowable:in source="user" target="user"></flowable:in>
92+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
93+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
94+
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
95+
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
96+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
97+
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
98+
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
99+
<flowable:in source="mtaId" target="mtaId"></flowable:in>
100+
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
101+
<flowable:in source="phase" target="phase"></flowable:in>
102+
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
103+
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
104+
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
105+
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
106+
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
107+
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
108+
<flowable:in source="processId" target="processId"></flowable:in>
109+
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
110+
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
111+
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
112+
<flowable:in source="namespace" target="namespace"></flowable:in>
113+
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
114+
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
115+
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
116+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
117+
</extensionElements>
88118
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
89119
<extensionElements></extensionElements>
90120
</multiInstanceLoopCharacteristics>

‎multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-bg-deploy.bpmn‎

Lines changed: 62 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,37 @@
153153
<sequenceFlow id="sid-59F0AF3A-1E41-4A9D-8C78-9B94151006DE" sourceRef="detectSchemaVersionTask" targetRef="mergeDescriptorsTask"></sequenceFlow>
154154
<inclusiveGateway id="setUndeployPhaseInclusiveGateway" name="setUndeployPhaseInclusiveGateway"></inclusiveGateway>
155155
<sequenceFlow id="flow39" sourceRef="deleteSubscriptionsTask" targetRef="deleteDiscontinuedConfigurationEntriesTask"></sequenceFlow>
156-
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
156+
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
157+
<extensionElements>
158+
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
159+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
160+
<flowable:in source="user" target="user"></flowable:in>
161+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
162+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
163+
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
164+
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
165+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
166+
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
167+
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
168+
<flowable:in source="mtaId" target="mtaId"></flowable:in>
169+
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
170+
<flowable:in source="phase" target="phase"></flowable:in>
171+
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
172+
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
173+
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
174+
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
175+
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
176+
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
177+
<flowable:in source="processId" target="processId"></flowable:in>
178+
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
179+
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
180+
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
181+
<flowable:in source="namespace" target="namespace"></flowable:in>
182+
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
183+
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
184+
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
185+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
186+
</extensionElements>
157187
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
158188
<extensionElements></extensionElements>
159189
</multiInstanceLoopCharacteristics>
@@ -164,7 +194,37 @@
164194
<serviceTask id="detectApplicationsToRenameTask" name="Detect apps to rename" flowable:async="true" flowable:delegateExpression="${detectApplicationsToRenameStep}"></serviceTask>
165195
<sequenceFlow id="flow8" sourceRef="detectDeployedMtaTask" targetRef="detectApplicationsToRenameTask"></sequenceFlow>
166196
<serviceTask id="updateModulesAppNames" name="Update Modules App Names " flowable:async="true" flowable:delegateExpression="${updateModulesAppNames}"></serviceTask>
167-
<callActivity id="sid-C6BBB2C9-B681-4FAE-A33C-57CEF185997B" name="Undeploy Old Apps Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
197+
<callActivity id="sid-C6BBB2C9-B681-4FAE-A33C-57CEF185997B" name="Undeploy Old Apps Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
198+
<extensionElements>
199+
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
200+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
201+
<flowable:in source="user" target="user"></flowable:in>
202+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
203+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
204+
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
205+
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
206+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
207+
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
208+
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
209+
<flowable:in source="mtaId" target="mtaId"></flowable:in>
210+
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
211+
<flowable:in source="phase" target="phase"></flowable:in>
212+
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
213+
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
214+
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
215+
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
216+
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
217+
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
218+
<flowable:in source="processId" target="processId"></flowable:in>
219+
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
220+
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
221+
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
222+
<flowable:in source="namespace" target="namespace"></flowable:in>
223+
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
224+
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
225+
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
226+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
227+
</extensionElements>
168228
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
169229
<extensionElements></extensionElements>
170230
</multiInstanceLoopCharacteristics>

‎multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-deploy.bpmn‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,37 @@
105105
<sequenceFlow id="sid-25422585-0CF1-4EDA-A191-9FC317F996E6" sourceRef="createSubscriptionsTask" targetRef="deleteSubscriptionsTask"></sequenceFlow>
106106
<sequenceFlow id="sid-71D9747E-4053-4C4D-B8AF-714F9C35DE48" sourceRef="detectSchemaVersionTask" targetRef="mergeDescriptorsTask"></sequenceFlow>
107107
<exclusiveGateway id="shouldDeleteDiscontinuedServicesGateway" name="Should Delete Discontinued Services" default="doNotDeleteDiscontinuedServicesFlow"></exclusiveGateway>
108-
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
108+
<callActivity id="undeployAppCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
109+
<extensionElements>
110+
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
111+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
112+
<flowable:in source="user" target="user"></flowable:in>
113+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
114+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
115+
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
116+
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
117+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
118+
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
119+
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
120+
<flowable:in source="mtaId" target="mtaId"></flowable:in>
121+
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
122+
<flowable:in source="phase" target="phase"></flowable:in>
123+
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
124+
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
125+
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
126+
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
127+
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
128+
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
129+
<flowable:in source="processId" target="processId"></flowable:in>
130+
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
131+
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
132+
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
133+
<flowable:in source="namespace" target="namespace"></flowable:in>
134+
<flowable:in source="keepFiles" target="keepFiles"></flowable:in>
135+
<flowable:in source="appArchiveId" target="appArchiveId"></flowable:in>
136+
<flowable:in source="mtaExtDescriptorId" target="mtaExtDescriptorId"></flowable:in>
137+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
138+
</extensionElements>
109139
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
110140
<extensionElements></extensionElements>
111141
</multiInstanceLoopCharacteristics>

‎multiapps-controller-process/src/main/resources/org/cloudfoundry/multiapps/controller/process/xs2-undeploy.bpmn‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,34 @@
6363
</multiInstanceLoopCharacteristics>
6464
</callActivity>
6565
<exclusiveGateway id="shouldDeleteDiscontinuedServicesGateway" name="Should Delete Discontinued Services" default="doNotDeleteDiscontinuedServicesFlow"></exclusiveGateway>
66-
<callActivity id="undeployAppsCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="true" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
66+
<callActivity id="undeployAppsCallActivity" name="Undeploy App Call Activity" flowable:async="true" calledElement="undeployAppSubProcess" flowable:calledElementType="key" flowable:inheritVariables="false" flowable:completeAsync="true" flowable:fallbackToDefaultTenant="false">
67+
<extensionElements>
68+
<flowable:in source="appsToUndeploy" target="appsToUndeploy"></flowable:in>
69+
<flowable:in source="correlationId" target="correlationId"></flowable:in>
70+
<flowable:in source="user" target="user"></flowable:in>
71+
<flowable:in source="userGuid" target="userGuid"></flowable:in>
72+
<flowable:in source="__SPACE_ID" target="__SPACE_ID"></flowable:in>
73+
<flowable:in source="isSecurityEnabled" target="isSecurityEnabled"></flowable:in>
74+
<flowable:in source="externalLoggingServiceConfigurations" target="externalLoggingServiceConfigurations"></flowable:in>
75+
<flowable:in source="mtaDeploymentDescriptor" target="mtaDeploymentDescriptor"></flowable:in>
76+
<flowable:in source="completeMtaDeploymentDescriptor" target="completeMtaDeploymentDescriptor"></flowable:in>
77+
<flowable:in source="moduleToDeploy" target="moduleToDeploy"></flowable:in>
78+
<flowable:in source="mtaId" target="mtaId"></flowable:in>
79+
<flowable:in source="subprocessPhase" target="subprocessPhase"></flowable:in>
80+
<flowable:in source="phase" target="phase"></flowable:in>
81+
<flowable:in source="deployedMta" target="deployedMta"></flowable:in>
82+
<flowable:in source="idleMtaColor" target="idleMtaColor"></flowable:in>
83+
<flowable:in source="liveMtaColor" target="liveMtaColor"></flowable:in>
84+
<flowable:in source="secureExtensionDescriptorParameterNames" target="secureExtensionDescriptorParameterNames"></flowable:in>
85+
<flowable:in source="isDisposableUserProvidedServiceEnabled" target="isDisposableUserProvidedServiceEnabled"></flowable:in>
86+
<flowable:in source="disposableUserProvidedServiceName" target="disposableUserProvidedServiceName"></flowable:in>
87+
<flowable:in source="processId" target="processId"></flowable:in>
88+
<flowable:in source="useLastOperationForServiceBindingDeletion" target="useLastOperationForServiceBindingDeletion"></flowable:in>
89+
<flowable:in source="__SERVICE_ID" target="__SERVICE_ID"></flowable:in>
90+
<flowable:in source="mtaMajorSchemaVersion" target="mtaMajorSchemaVersion"></flowable:in>
91+
<flowable:in source="namespace" target="namespace"></flowable:in>
92+
<flowable:in source="appToProcess" target="appToProcess"></flowable:in>
93+
</extensionElements>
6794
<multiInstanceLoopCharacteristics isSequential="false" flowable:collection="appsToUndeploy" flowable:elementVariable="appToProcess">
6895
<extensionElements></extensionElements>
6996
</multiInstanceLoopCharacteristics>

0 commit comments

Comments
 (0)