From 01fc692b85a563b0fb5f6ba5ab79ab9c3a9acce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Novotn=C3=BD?= Date: Wed, 20 Sep 2023 12:53:48 +0200 Subject: [PATCH] Revert "[JBPM-10192] SLA timers are not migrated after migrating process (#2326) (#2329)" This reverts commit 73fe39eb9e8166b6215b95b7522b9821de73731e. --- .../migration/TimerMigrationManagerTest.java | 223 ++---------------- .../migration/v1/BPMN2-SLAOnTask-v1.bpmn2 | 127 ---------- .../migration/v1/BPMN2-SLAProcess-v1.bpmn2 | 158 ------------- .../migration/v2/BPMN2-SLAOnTask-v2.bpmn2 | 127 ---------- .../migration/v2/BPMN2-SLAProcess-v2.bpmn2 | 165 ------------- 5 files changed, 25 insertions(+), 775 deletions(-) delete mode 100644 jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAOnTask-v1.bpmn2 delete mode 100644 jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAProcess-v1.bpmn2 delete mode 100644 jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAOnTask-v2.bpmn2 delete mode 100644 jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAProcess-v2.bpmn2 diff --git a/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/migration/TimerMigrationManagerTest.java b/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/migration/TimerMigrationManagerTest.java index 7ac30177c1..0c7da595c9 100644 --- a/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/migration/TimerMigrationManagerTest.java +++ b/jbpm-runtime-manager/src/test/java/org/jbpm/runtime/manager/impl/migration/TimerMigrationManagerTest.java @@ -20,11 +20,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.kie.api.runtime.manager.audit.NodeInstanceLog.TYPE_ENTER; -import static org.kie.api.runtime.manager.audit.NodeInstanceLog.TYPE_EXIT; -import static org.kie.api.runtime.process.ProcessInstance.SLA_MET; -import static org.kie.api.runtime.process.ProcessInstance.SLA_PENDING; -import static org.kie.api.runtime.process.ProcessInstance.SLA_VIOLATED; import static org.kie.api.runtime.process.ProcessInstance.STATE_ACTIVE; import static org.kie.api.runtime.process.ProcessInstance.STATE_COMPLETED; @@ -39,8 +34,6 @@ import javax.persistence.EntityManagerFactory; import org.jbpm.process.audit.JPAAuditLogService; -import org.jbpm.process.audit.NodeInstanceLog; -import org.jbpm.process.audit.ProcessInstanceLog; import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler; import org.jbpm.runtime.manager.impl.DefaultRegisterableItemsFactory; import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager; @@ -49,7 +42,6 @@ import org.jbpm.services.task.impl.TaskDeadlinesServiceImpl; import org.jbpm.test.listener.process.NodeLeftCountDownProcessEventListener; import org.jbpm.test.util.AbstractBaseTest; -import org.jbpm.workflow.instance.NodeInstance; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -64,9 +56,9 @@ import org.kie.api.runtime.manager.RuntimeEnvironmentBuilder; import org.kie.api.runtime.manager.RuntimeManager; import org.kie.api.runtime.manager.RuntimeManagerFactory; +import org.kie.api.runtime.manager.audit.ProcessInstanceLog; import org.kie.api.runtime.process.ProcessInstance; import org.kie.api.runtime.process.WorkItemHandler; -import org.kie.api.runtime.process.WorkflowProcessInstance; import org.kie.api.task.TaskService; import org.kie.api.task.model.TaskSummary; import org.kie.internal.io.ResourceFactory; @@ -122,20 +114,6 @@ public TimerMigrationManagerTest(String strategy) { private static final String USERTASK_BOUNDARY_TIMER_ID_V1 = "UserTaskBoundary-v1"; private static final String USERTASK_BOUNDARY_TIMER_ID_V2 = "UserTaskBoundary-v2"; - - private static final String USERTASK_SLA_ID_V1 = "BPMN2-UserTaskSLA-v1"; - private static final String USERTASK_SLA_ID_V2 = "BPMN2-UserTaskSLA-v2"; - - private static final String PROCESS_SLA_ID_V1 = "BPMN2-ProcessSLA-v1"; - private static final String PROCESS_SLA_ID_V2 = "BPMN2-ProcessSLA-v2"; - - private static final String SLA_PROCESS_ID_V1 = "processSLA-V1"; - private static final String SLA_PROCESS_ID_V2 = "processSLA-V2"; - - private static final String SLA_ON_TASK_ID_V1 = "SLAOnTask-v1"; - private static final String SLA_ON_TASK_ID_V2 = "SLAOnTask-v2"; - - private JPAAuditLogService auditService; private RuntimeEngine runtime; private long pid; @@ -179,14 +157,14 @@ public void testMigrateTimerProcessInstance() throws Exception { assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); ProcessInstance pi1 = ksession.startProcess(TIMER_ID_V1); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(TIMER_ID_V1, log.getProcessId()); @@ -213,6 +191,7 @@ public void testMigrateTimerProcessInstance() throws Exception { countdownListener.waitTillCompleted(); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(TIMER_ID_V2, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); @@ -227,14 +206,14 @@ public void testMigrateBoundaryTimerProcessInstance() throws Exception { assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); ProcessInstance pi1 = ksession.startProcess(BOUNDARY_TIMER_ID_V1); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(BOUNDARY_TIMER_ID_V1, log.getProcessId()); @@ -261,6 +240,7 @@ public void testMigrateBoundaryTimerProcessInstance() throws Exception { countdownListener.waitTillCompleted(); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(BOUNDARY_TIMER_ID_V2, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); @@ -275,14 +255,14 @@ public void testMigrateEventSubprocessTimerProcessInstance() throws Exception { assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); ProcessInstance pi1 = ksession.startProcess(EVENT_SUBPROCESS_TIMER_ID_V1); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(EVENT_SUBPROCESS_TIMER_ID_V1, log.getProcessId()); @@ -309,6 +289,7 @@ public void testMigrateEventSubprocessTimerProcessInstance() throws Exception { countdownListener.waitTillCompleted(); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(EVENT_SUBPROCESS_TIMER_ID_V2, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); @@ -324,14 +305,14 @@ public void testMigrateTimerProcessInstanceRollback() throws Exception { assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); ProcessInstance pi1 = ksession.startProcess(TIMER_ID_V1); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(TIMER_ID_V1, log.getProcessId()); @@ -364,6 +345,7 @@ public void testMigrateTimerProcessInstanceRollback() throws Exception { countdownListener.waitTillCompleted(); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(TIMER_ID_V1, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V1, log.getExternalId()); @@ -378,7 +360,7 @@ public void testMigrateTimerCycleProcessInstance() throws Exception { assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); @@ -386,7 +368,7 @@ public void testMigrateTimerCycleProcessInstance() throws Exception { ProcessInstance pi1 = ksession.startProcess(CYCLE_TIMER_ID_V1, params); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(CYCLE_TIMER_ID_V1, log.getProcessId()); @@ -425,6 +407,7 @@ public void testMigrateTimerCycleProcessInstance() throws Exception { managerV2.disposeRuntimeEngine(runtime); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(CYCLE_TIMER_ID_V2, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); @@ -439,7 +422,7 @@ public void testMigrateTimerCycleProcessInstanceBeforeFirstTrigger() throws Exce assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); @@ -448,7 +431,7 @@ public void testMigrateTimerCycleProcessInstanceBeforeFirstTrigger() throws Exce ProcessInstance pi1 = ksession.startProcess(CYCLE_TIMER_ID_V1, params); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(CYCLE_TIMER_ID_V1, log.getProcessId()); @@ -483,6 +466,7 @@ public void testMigrateTimerCycleProcessInstanceBeforeFirstTrigger() throws Exce managerV2.disposeRuntimeEngine(runtime); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(CYCLE_TIMER_ID_V2, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); @@ -497,14 +481,14 @@ public void testMigrateTimerWithLoopProcessInstance() throws Exception { assertNotNull(managerV1); assertNotNull(managerV2); - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = managerV1.getRuntimeEngine(EmptyContext.get()); KieSession ksession = runtime.getKieSession(); assertNotNull(ksession); ProcessInstance pi1 = ksession.startProcess(LOOP_TIMER_ID_V1); assertNotNull(pi1); assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); + JPAAuditLogService auditService = new JPAAuditLogService(emf); ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); assertNotNull(log); assertEquals(LOOP_TIMER_ID_V1, log.getProcessId()); @@ -561,6 +545,7 @@ public void testMigrateTimerWithLoopProcessInstance() throws Exception { countdownListener.waitTillCompleted(); log = auditService.findProcessInstance(pi1.getId()); + auditService.dispose(); assertNotNull(log); assertEquals(LOOP_TIMER_ID_V1, log.getProcessId()); assertEquals(DEPLOYMENT_ID_V1, log.getExternalId()); @@ -604,96 +589,6 @@ public void testMigrateUserTaskNotCompletedBoundaryTimerProcessInstance() throws checkProcessCompleted(countdownListener); } - - @Test(timeout=10000) - public void testMigrateSLAProcessTimer() throws Exception { - SLAViolationCountDownProcessEventListener countdownListener = new SLAViolationCountDownProcessEventListener(1); - ProcessInstance pi = startSLAProcess("migration/v1/BPMN2-SLAProcess-v1.bpmn2", - "migration/v2/BPMN2-SLAProcess-v2.bpmn2", - SLA_PROCESS_ID_V1, - countdownListener); - migrate(pi, SLA_PROCESS_ID_V2); - - //wait till timer fires because SLA is violated - countdownListener.waitTillCompleted(); - - assertSLAProcessCompliance(pi, SLA_VIOLATED); - } - - @Test(timeout=10000) - public void testMigrateAfterSLAProcessTimer() throws Exception { - SLAViolationCountDownProcessEventListener countdownListener = new SLAViolationCountDownProcessEventListener(1); - ProcessInstance pi = startSLAProcess("migration/v1/BPMN2-SLAProcess-v1.bpmn2", - "migration/v2/BPMN2-SLAProcess-v2.bpmn2", - SLA_PROCESS_ID_V1, - countdownListener); - - //wait till timer fires because SLA is violated, before migration - countdownListener.waitTillCompleted(); - - migrate(pi, SLA_PROCESS_ID_V2); - assertSLAProcessCompliance(pi, SLA_VIOLATED); - } - - @Test(timeout=10000) - public void testMigrateAndCompleteSLAProcessTimer() throws Exception { - NodeLeftCountDownProcessEventListener countdownListener = new NodeLeftCountDownProcessEventListener("Script Task 2", 1); - ProcessInstance pi = startSLAProcess("migration/v1/BPMN2-SLAProcess-v1.bpmn2", - "migration/v2/BPMN2-SLAProcess-v2.bpmn2", - SLA_PROCESS_ID_V1, - countdownListener); - migrate(pi, SLA_PROCESS_ID_V2); - assertSLAProcessCompliance(pi, SLA_PENDING); - - completeUserTask(managerV2, USER_JOHN); - // wait till process is completed - countdownListener.waitTillCompleted(); - assertSLAProcessCompliance(pi, SLA_MET); - } - - @Test(timeout=10000) - public void testMigrateSLAOnTaskTimer() throws Exception { - SLAViolationCountDownProcessEventListener countdownListener = new SLAViolationCountDownProcessEventListener(1); - ProcessInstance pi = startSLAProcess("migration/v1/BPMN2-SLAOnTask-v1.bpmn2", - "migration/v2/BPMN2-SLAOnTask-v2.bpmn2", - SLA_ON_TASK_ID_V1, - countdownListener); - migrate(pi, SLA_ON_TASK_ID_V2); - - //wait till timer fires because SLA is violated - countdownListener.waitTillCompleted(); - assertSLAOnTaskCompliance(pi, TYPE_ENTER, SLA_VIOLATED); - } - - @Test(timeout=10000) - public void testMigrateAfterSLAOnTaskTimer() throws Exception { - SLAViolationCountDownProcessEventListener countdownListener = new SLAViolationCountDownProcessEventListener(1); - ProcessInstance pi = startSLAProcess("migration/v1/BPMN2-SLAOnTask-v1.bpmn2", - "migration/v2/BPMN2-SLAOnTask-v2.bpmn2", - SLA_ON_TASK_ID_V1, - countdownListener); - //wait till timer fires because SLA is violated, before migration - countdownListener.waitTillCompleted(); - - migrate(pi, SLA_ON_TASK_ID_V2); - assertSLAOnTaskCompliance(pi, TYPE_ENTER, SLA_VIOLATED); - } - - @Test(timeout=10000) - public void testMigrateAndCompleteSLAOnTaskTimer() throws Exception { - NodeLeftCountDownProcessEventListener countdownListener = new NodeLeftCountDownProcessEventListener("Script Task 2", 1); - ProcessInstance pi = startSLAProcess("migration/v1/BPMN2-SLAOnTask-v1.bpmn2", - "migration/v2/BPMN2-SLAOnTask-v2.bpmn2", - SLA_ON_TASK_ID_V1, - countdownListener); - migrate(pi, SLA_ON_TASK_ID_V2); - assertSLAOnTaskCompliance(pi, TYPE_ENTER, SLA_PENDING); - - completeUserTask(managerV2, USER_JOHN); - // wait till process is completed - countdownListener.waitTillCompleted(); - assertSLAOnTaskCompliance(pi, TYPE_EXIT, SLA_MET); - } protected void createRuntimeManagers(String processV1, String processV2, ProcessEventListener...eventListeners) { RuntimeEnvironment environment = RuntimeEnvironmentBuilder.Factory.get() @@ -808,7 +703,7 @@ private void checkProcess(long pid, String processId, } private void migrateProcessUserTaskBoundary(RuntimeManager manager) { - runtime = manager.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = manager.getRuntimeEngine(EmptyContext.get()); manager.disposeRuntimeEngine(runtime); MigrationSpec migrationSpec = new MigrationSpec(DEPLOYMENT_ID_V1, pid, DEPLOYMENT_ID_V2, USERTASK_BOUNDARY_TIMER_ID_V2); @@ -819,7 +714,7 @@ private void migrateProcessUserTaskBoundary(RuntimeManager manager) { } private void completeUserTask(RuntimeManager manager, String user) { - runtime = manager.getRuntimeEngine(EmptyContext.get()); + RuntimeEngine runtime = manager.getRuntimeEngine(EmptyContext.get()); TaskService taskService = runtime.getTaskService(); List tasks = taskService.getTasksAssignedAsPotentialOwner(user, "en-UK"); assertNotNull(tasks); @@ -840,75 +735,7 @@ private void checkProcessCompleted(NodeLeftCountDownProcessEventListener countdo countdownListener.waitTillCompleted(); checkProcess(pid, USERTASK_BOUNDARY_TIMER_ID_V2, DEPLOYMENT_ID_V2, STATE_COMPLETED); - } - - protected ProcessInstance startSLAProcess(String processV1, String processV2, String processId, ProcessEventListener countdownListener) { - createRuntimeManagers(processV1, processV2, countdownListener); - assertNotNull(managerV1); - assertNotNull(managerV2); - - runtime = managerV1.getRuntimeEngine(EmptyContext.get()); - KieSession ksession = runtime.getKieSession(); - assertNotNull(ksession); - - ProcessInstance pi1 = ksession.startProcess(processId); - assertNotNull(pi1); - assertEquals(ProcessInstance.STATE_ACTIVE, pi1.getState()); - auditService = new JPAAuditLogService(emf); - ProcessInstanceLog log = auditService.findProcessInstance(pi1.getId()); - assertNotNull(log); - assertEquals(processId, log.getProcessId()); - assertEquals(DEPLOYMENT_ID_V1, log.getExternalId()); - managerV1.disposeRuntimeEngine(runtime); - return pi1; - } - - protected void migrate(ProcessInstance pid, String processId) { - MigrationSpec migrationSpec = new MigrationSpec(DEPLOYMENT_ID_V1, pid.getId(), DEPLOYMENT_ID_V2, processId); - - MigrationManager migrationManager = new MigrationManager(migrationSpec); - MigrationReport report = migrationManager.migrate(); - - assertNotNull(report); - assertTrue(report.isSuccessful()); - } - - protected void assertSLAProcessCompliance(ProcessInstance pi, int compliance) { - ProcessInstanceLog log = auditService.findProcessInstance(pi.getId()); - assertNotNull(log); - - assertEquals(SLA_PROCESS_ID_V2, log.getProcessId()); - assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); - assertEquals(compliance, (int)log.getSlaCompliance()); - } - - protected void assertSLAOnTaskCompliance(ProcessInstance pi, int type, int compliance) { - ProcessInstanceLog log = auditService.findProcessInstance(pi.getId()); - assertNotNull(log); - - assertEquals(SLA_ON_TASK_ID_V2, log.getProcessId()); - assertEquals(DEPLOYMENT_ID_V2, log.getExternalId()); - - Collection activeNodes = ((WorkflowProcessInstance)pi).getNodeInstances(); - assertEquals(1, activeNodes.size()); - - int sla = getSLAComplianceForNodeInstance(auditService, pi.getId(), - (org.jbpm.workflow.instance.NodeInstance) activeNodes.iterator().next(), - type); - assertEquals(compliance, sla); - } - - protected int getSLAComplianceForNodeInstance(JPAAuditLogService logService, long processInstanceId, NodeInstance nodeInstance, int logType) { - int slaCompliance = -1; - List logs = logService.findNodeInstances(processInstanceId); - if (logs != null) { - for (NodeInstanceLog log : logs) { - if (log.getType() == logType && log.getNodeInstanceId().equals(String.valueOf(nodeInstance.getId()))) { - return log.getSlaCompliance(); - } - } - } - return slaCompliance; + auditService.dispose(); } } diff --git a/jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAOnTask-v1.bpmn2 b/jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAOnTask-v1.bpmn2 deleted file mode 100644 index 063fffab88..0000000000 --- a/jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAOnTask-v1.bpmn2 +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - _1-_2 - - - - - 2s - - - - - - System.out.println("Entering on Hello v1"); - - - _1-_2 - SequenceFlow_1 - - - - DataInput_8 - - - - - DataInput_8 - - en-UK - DataInput_8 - - - - - john - - - - - - - - - - SequenceFlow_2 - - - - - - - - - - SequenceFlow_1 - SequenceFlow_2 - System.out.println("Goodbye v1"); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAProcess-v1.bpmn2 b/jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAProcess-v1.bpmn2 deleted file mode 100644 index f76a09560e..0000000000 --- a/jbpm-runtime-manager/src/test/resources/migration/v1/BPMN2-SLAProcess-v1.bpmn2 +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_1 - - - - - - - - _1B1A6982-058C-4ABE-91FB-0C0E77A86A50 - - - - - - - - _1B1A6982-058C-4ABE-91FB-0C0E77A86A50 - _C7E0225D-0F85-474C-8B35-B32D7F47D6B3 - - - - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_TaskNameInputX - _7B93533E-C018-4DEA-A603-2B63E8878A29_SkippableInputX - DataInput_6 - - - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_TaskNameInputX - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_TaskNameInputX - - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_SkippableInputX - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_SkippableInputX - - - - DataInput_6 - - en-UK - DataInput_6 - - - - - john - - - - - - - - - - _C7E0225D-0F85-474C-8B35-B32D7F47D6B3 - SequenceFlow_1 - System.out.println("End of SLA Timer 1"); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAOnTask-v2.bpmn2 b/jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAOnTask-v2.bpmn2 deleted file mode 100644 index 0ad27f91f9..0000000000 --- a/jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAOnTask-v2.bpmn2 +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - _1-_2 - - - - - 2s - - - - - - System.out.println("Entering on Hello v2"); - - - _1-_2 - SequenceFlow_1 - - - - DataInput_8 - - - - - DataInput_8 - - en-UK - DataInput_8 - - - - - john - - - - - - - - - - SequenceFlow_2 - - - - - - - - - - SequenceFlow_1 - SequenceFlow_2 - System.out.println("Goodbye v2"); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAProcess-v2.bpmn2 b/jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAProcess-v2.bpmn2 deleted file mode 100644 index eef6cd9362..0000000000 --- a/jbpm-runtime-manager/src/test/resources/migration/v2/BPMN2-SLAProcess-v2.bpmn2 +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SequenceFlow_1 - - - - - - - - _1B1A6982-058C-4ABE-91FB-0C0E77A86A50 - - - - - - - - _1B1A6982-058C-4ABE-91FB-0C0E77A86A50 - _C7E0225D-0F85-474C-8B35-B32D7F47D6B3 - - - - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_TaskNameInputX - _7B93533E-C018-4DEA-A603-2B63E8878A29_SkippableInputX - DataInput_6 - - - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_TaskNameInputX - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_TaskNameInputX - - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_SkippableInputX - - - _7B93533E-C018-4DEA-A603-2B63E8878A29_SkippableInputX - - - - DataInput_6 - - en-UK - DataInput_6 - - - - - john - - - - - - - - - - _C7E0225D-0F85-474C-8B35-B32D7F47D6B3 - SequenceFlow_1 - System.out.println("End of SLA Timer 2"); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file