syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [syncope] branch master updated: Upgrading Flowable
Date Tue, 15 Jan 2019 17:54:22 GMT
This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new e9b8d95  Upgrading Flowable
e9b8d95 is described below

commit e9b8d95a6823da542d6c41f9b979a4c4c88cab21
Author: Francesco Chicchiriccò <ilgrosso@apache.org>
AuthorDate: Tue Jan 15 18:53:58 2019 +0100

    Upgrading Flowable
---
 ext/flowable/flowable-bpmn/pom.xml                 |    5 +
 .../core/flowable/impl/FlowableRuntimeUtils.java   |    5 +-
 .../support/DomainProcessEngineConfiguration.java  |   32 -
 .../support/DomainProcessEngineFactoryBean.java    |    5 +-
 .../flowable/support/SyncopeTaskQueryImpl.java     |   49 -
 .../org/apache/syncope/ext/flowable/Task.xml       | 1421 --------------------
 .../org/apache/syncope/ext/flowable/mappings.xml   |   73 -
 .../src/main/resources/workflowFlowableContext.xml |    2 +-
 pom.xml                                            |   11 +-
 9 files changed, 20 insertions(+), 1583 deletions(-)

diff --git a/ext/flowable/flowable-bpmn/pom.xml b/ext/flowable/flowable-bpmn/pom.xml
index 7218034..bd59f5d 100644
--- a/ext/flowable/flowable-bpmn/pom.xml
+++ b/ext/flowable/flowable-bpmn/pom.xml
@@ -52,6 +52,11 @@ under the License.
     </dependency>
  
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+
+    <dependency>
       <groupId>org.flowable</groupId>
       <artifactId>flowable-engine</artifactId>
     </dependency>
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java
index 78f9e8f..2a68a46 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/impl/FlowableRuntimeUtils.java
@@ -26,7 +26,6 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.to.UserTO;
 import org.apache.syncope.core.flowable.support.DomainProcessEngine;
-import org.apache.syncope.core.flowable.support.SyncopeTaskQueryImpl;
 import org.apache.syncope.core.persistence.api.attrvalue.validation.InvalidEntityException;
 import org.apache.syncope.core.persistence.api.attrvalue.validation.ParsingValidationException;
 import org.apache.syncope.core.persistence.api.entity.user.User;
@@ -34,7 +33,6 @@ import org.apache.syncope.core.provisioning.api.PropagationByResource;
 import org.apache.syncope.core.workflow.api.WorkflowException;
 import org.flowable.common.engine.api.FlowableException;
 import org.flowable.engine.history.HistoricActivityInstance;
-import org.flowable.engine.impl.RuntimeServiceImpl;
 import org.flowable.engine.repository.ProcessDefinition;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.task.api.Task;
@@ -140,8 +138,7 @@ public final class FlowableRuntimeUtils {
     }
 
     public static TaskQuery createTaskQuery(final DomainProcessEngine engine, final boolean onlyFormTasks) {
-        SyncopeTaskQueryImpl taskQuery = new SyncopeTaskQueryImpl(
-                ((RuntimeServiceImpl) engine.getRuntimeService()).getCommandExecutor());
+        TaskQuery taskQuery = engine.getTaskService().createTaskQuery();
         if (onlyFormTasks) {
             taskQuery.taskWithFormKey();
         }
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineConfiguration.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineConfiguration.java
deleted file mode 100644
index d1c3299..0000000
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineConfiguration.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.core.flowable.support;
-
-import java.io.InputStream;
-import org.flowable.spring.SpringProcessEngineConfiguration;
-
-public class DomainProcessEngineConfiguration extends SpringProcessEngineConfiguration {
-
-    private static final String SYNCOPE_MYBATIS_MAPPING_FILE = "org/apache/syncope/ext/flowable/mappings.xml";
-
-    @Override
-    public InputStream getMyBatisXmlConfigurationStream() {
-        return getResourceAsStream(SYNCOPE_MYBATIS_MAPPING_FILE);
-    }
-}
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
index 81b0fd8..a330a1f 100644
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
+++ b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/DomainProcessEngineFactoryBean.java
@@ -29,6 +29,7 @@ import org.flowable.common.engine.impl.interceptor.EngineConfigurationConstants;
 import org.flowable.engine.impl.util.EngineServiceUtil;
 import org.flowable.idm.spring.SpringIdmEngineConfiguration;
 import org.flowable.spring.SpringExpressionManager;
+import org.flowable.spring.SpringProcessEngineConfiguration;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
@@ -38,7 +39,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 
 /**
- * Spring factory for {@link DomainProcessEngine} which takes the provided {@link DomainProcessEngineConfiguration} as
+ * Spring factory for {@link DomainProcessEngine} which takes the provided {@link SpringProcessEngineConfiguration} as
  * template for each of the configured Syncope domains.
  */
 @Component
@@ -66,7 +67,7 @@ public class DomainProcessEngineFactoryBean
                             domain + "TransactionManager", PlatformTransactionManager.class);
                     Object entityManagerFactory = ctx.getBean(domain + "EntityManagerFactory");
 
-                    DomainProcessEngineConfiguration conf = ctx.getBean(DomainProcessEngineConfiguration.class);
+                    SpringProcessEngineConfiguration conf = ctx.getBean(SpringProcessEngineConfiguration.class);
                     conf.setDataSource(dataSource);
                     conf.setTransactionManager(transactionManager);
                     conf.setTransactionsExternallyManaged(true);
diff --git a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.java b/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.java
deleted file mode 100644
index 833fe6b..0000000
--- a/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/support/SyncopeTaskQueryImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.core.flowable.support;
-
-import org.flowable.common.engine.impl.interceptor.CommandExecutor;
-import org.flowable.task.api.TaskQuery;
-import org.flowable.task.service.impl.TaskQueryImpl;
-
-public class SyncopeTaskQueryImpl extends TaskQueryImpl {
-
-    private static final long serialVersionUID = 734215641378485689L;
-
-    protected boolean withFormKey;
-
-    protected SyncopeTaskQueryImpl currentOrQueryObject;
-
-    public SyncopeTaskQueryImpl(final CommandExecutor commandExecutor) {
-        super(commandExecutor);
-    }
-
-    public TaskQuery taskWithFormKey() {
-        if (orActive) {
-            currentOrQueryObject.withFormKey = true;
-        } else {
-            this.withFormKey = true;
-        }
-        return this;
-    }
-
-    public boolean isWithFormKey() {
-        return withFormKey;
-    }
-}
diff --git a/ext/flowable/flowable-bpmn/src/main/resources/org/apache/syncope/ext/flowable/Task.xml b/ext/flowable/flowable-bpmn/src/main/resources/org/apache/syncope/ext/flowable/Task.xml
deleted file mode 100644
index bf5c06f..0000000
--- a/ext/flowable/flowable-bpmn/src/main/resources/org/apache/syncope/ext/flowable/Task.xml
+++ /dev/null
@@ -1,1421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> 
-
-<mapper namespace="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-
-  <!-- TASK INSERT -->
-  
-  <insert id="insertTask" parameterType="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    insert into ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, ASSIGNEE_, DELEGATION_, 
-                      EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_,
-                      TASK_DEF_KEY_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, 
-                      IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_, SUB_TASK_COUNT_)
-    values (#{id, jdbcType=VARCHAR},
-            1,
-            #{name, jdbcType=VARCHAR},
-            #{parentTaskId, jdbcType=VARCHAR},
-            #{description, jdbcType=VARCHAR},
-            #{priority, jdbcType=INTEGER},
-            #{createTime, jdbcType=TIMESTAMP},
-            #{owner, jdbcType=VARCHAR},
-            #{assignee, jdbcType=VARCHAR},
-            #{delegationStateString, jdbcType=VARCHAR},
-            #{executionId, jdbcType=VARCHAR},
-            #{processInstanceId, jdbcType=VARCHAR},
-            #{processDefinitionId, jdbcType=VARCHAR},
-            #{taskDefinitionId, jdbcType=VARCHAR},
-            #{scopeId, jdbcType=VARCHAR},
-            #{subScopeId, jdbcType=VARCHAR},
-            #{scopeType, jdbcType=VARCHAR},
-            #{scopeDefinitionId, jdbcType=VARCHAR},
-            #{taskDefinitionKey, jdbcType=VARCHAR},
-            #{dueDate, jdbcType=TIMESTAMP},
-            #{category, jdbcType=VARCHAR},
-            #{suspensionState, jdbcType=INTEGER},
-            #{tenantId, jdbcType=VARCHAR},
-            #{formKey, jdbcType=VARCHAR},
-            #{claimTime, jdbcType=TIMESTAMP},
-            #{isCountEnabled, jdbcType=BOOLEAN},
-            #{variableCount, jdbcType=INTEGER},
-            #{identityLinkCount, jdbcType=INTEGER},
-            #{subTaskCount, jdbcType=INTEGER}
-           )
-  </insert>
-
-  <insert id="bulkInsertTask" parameterType="java.util.List">
-    INSERT INTO ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, ASSIGNEE_, DELEGATION_, 
-        EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, 
-        TASK_DEF_KEY_, DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, 
-        IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_, SUB_TASK_COUNT_)
-    VALUES 
-      <foreach collection="list" item="task" index="index" separator=","> 
-        (#{task.id, jdbcType=VARCHAR},
-         1,
-         #{task.name, jdbcType=VARCHAR},
-         #{task.parentTaskId, jdbcType=VARCHAR},
-         #{task.description, jdbcType=VARCHAR},
-         #{task.priority, jdbcType=INTEGER},
-         #{task.createTime, jdbcType=TIMESTAMP},
-         #{task.owner, jdbcType=VARCHAR},
-         #{task.assignee, jdbcType=VARCHAR},
-         #{task.delegationStateString, jdbcType=VARCHAR},
-         #{task.executionId, jdbcType=VARCHAR},
-         #{task.processInstanceId, jdbcType=VARCHAR},
-         #{task.processDefinitionId, jdbcType=VARCHAR},
-         #{task.taskDefinitionId, jdbcType=VARCHAR},
-         #{task.scopeId, jdbcType=VARCHAR},
-         #{task.subScopeId, jdbcType=VARCHAR},
-         #{task.scopeType, jdbcType=VARCHAR},
-         #{task.scopeDefinitionId, jdbcType=VARCHAR},
-         #{task.taskDefinitionKey, jdbcType=VARCHAR},
-         #{task.dueDate, jdbcType=TIMESTAMP},
-         #{task.category, jdbcType=VARCHAR},
-         #{task.suspensionState, jdbcType=INTEGER},
-         #{task.tenantId, jdbcType=VARCHAR},
-         #{task.formKey, jdbcType=VARCHAR},
-         #{task.claimTime, jdbcType=TIMESTAMP},
-         #{task.isCountEnabled, jdbcType=BOOLEAN},
-         #{task.variableCount, jdbcType=INTEGER},
-         #{task.identityLinkCount, jdbcType=INTEGER},
-         #{task.subTaskCount, jdbcType=INTEGER}
-         )
-    </foreach>
-  </insert>
-
-  <insert id="bulkInsertTask" databaseId="oracle" parameterType="java.util.List">
-    INSERT ALL 
-      <foreach collection="list" item="task" index="index">
-        INTO ${prefix}ACT_RU_TASK (ID_, REV_, NAME_, PARENT_TASK_ID_, DESCRIPTION_, PRIORITY_, CREATE_TIME_, OWNER_, ASSIGNEE_, DELEGATION_, 
-              EXECUTION_ID_, PROC_INST_ID_, PROC_DEF_ID_, TASK_DEF_ID_, SCOPE_ID_, SUB_SCOPE_ID_, SCOPE_TYPE_, SCOPE_DEFINITION_ID_, TASK_DEF_KEY_, 
-              DUE_DATE_, CATEGORY_, SUSPENSION_STATE_, TENANT_ID_, FORM_KEY_, CLAIM_TIME_, 
-              IS_COUNT_ENABLED_, VAR_COUNT_, ID_LINK_COUNT_, SUB_TASK_COUNT_) VALUES
-        (#{task.id, jdbcType=VARCHAR},
-         1,
-         #{task.name, jdbcType=VARCHAR},
-         #{task.parentTaskId, jdbcType=VARCHAR},
-         #{task.description, jdbcType=VARCHAR},
-         #{task.priority, jdbcType=INTEGER},
-         #{task.createTime, jdbcType=TIMESTAMP},
-         #{task.owner, jdbcType=VARCHAR},
-         #{task.assignee, jdbcType=VARCHAR},
-         #{task.delegationStateString, jdbcType=VARCHAR},
-         #{task.executionId, jdbcType=VARCHAR},
-         #{task.processInstanceId, jdbcType=VARCHAR},
-         #{task.processDefinitionId, jdbcType=VARCHAR},
-         #{task.taskDefinitionId, jdbcType=VARCHAR},
-         #{task.scopeId, jdbcType=VARCHAR},
-         #{task.subScopeId, jdbcType=VARCHAR},
-         #{task.scopeType, jdbcType=VARCHAR},
-         #{task.scopeDefinitionId, jdbcType=VARCHAR},
-         #{task.taskDefinitionKey, jdbcType=VARCHAR},
-         #{task.dueDate, jdbcType=TIMESTAMP},
-         #{task.category, jdbcType=VARCHAR},
-         #{task.suspensionState, jdbcType=INTEGER},
-         #{task.tenantId, jdbcType=VARCHAR},
-         #{task.formKey, jdbcType=VARCHAR},
-         #{task.claimTime, jdbcType=TIMESTAMP},
-         #{task.isCountEnabled, jdbcType=BOOLEAN},
-         #{task.variableCount, jdbcType=INTEGER},
-         #{task.identityLinkCount, jdbcType=INTEGER},
-         #{task.subTaskCount, jdbcType=INTEGER}
-         )
-    </foreach>
-    SELECT * FROM dual
-  </insert>
-  
-  <!-- TASK UPDATE -->
-  
-  <update id="updateTask" parameterType="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    update ${prefix}ACT_RU_TASK
-    <set>
-      REV_ = #{revisionNext, jdbcType=INTEGER},
-      <if test="originalPersistentState.name != name">
-          NAME_ = #{name, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.parentTaskId != parentTaskId">
-          PARENT_TASK_ID_ = #{parentTaskId, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.priority != priority">
-          PRIORITY_ = #{priority, jdbcType=INTEGER},
-      </if>
-      <if test="originalPersistentState.createTime != createTime">
-          CREATE_TIME_ = #{createTime, jdbcType=TIMESTAMP},
-      </if>
-      <if test="originalPersistentState.owner != owner">
-          OWNER_ = #{owner, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.assignee != assignee">
-          ASSIGNEE_ = #{assignee, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.delegationStateString != delegationStateString">
-          DELEGATION_ = #{delegationStateString, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.executionId != executionId">
-          EXECUTION_ID_ = #{executionId, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.processDefinitionId != processDefinitionId">
-          PROC_DEF_ID_ = #{processDefinitionId, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.taskDefinitionId != taskDefinitionId">
-          TASK_DEF_ID_ = #{taskDefinitionId, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.taskDefinitionKey != taskDefinitionKey">
-          TASK_DEF_KEY_ = #{taskDefinitionKey, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.scopeId != scopeId">
-          SCOPE_ID_ = #{scopeId, jdbcType=VARCHAR}
-      </if>
-      <if test="originalPersistentState.subScopeId != subScopeId">
-          SUB_SCOPE_ID_ = #{subScopeId, jdbcType=VARCHAR}
-      </if>
-      <if test="originalPersistentState.scopeType != scopeType">
-          SCOPE_TYPE_ = #{scopeType, jdbcType=VARCHAR}
-      </if>
-       <if test="originalPersistentState.scopeDefinitionId != scopeDefinitionId">
-          SCOPE_DEFINITION_ID_ = #{scopeDefinitionId, jdbcType=VARCHAR}
-      </if>
-      <if test="originalPersistentState.description != description">
-          DESCRIPTION_ = #{description, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.dueDate != dueDate">
-          DUE_DATE_ = #{dueDate, jdbcType=TIMESTAMP},
-      </if>
-      <if test="originalPersistentState.category != category">
-          CATEGORY_ = #{category, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.suspensionState != suspensionState">
-          SUSPENSION_STATE_ = #{suspensionState, jdbcType=INTEGER},
-      </if>
-      <if test="originalPersistentState.formKey != formKey">
-          FORM_KEY_ = #{formKey, jdbcType=VARCHAR},
-      </if>
-      <if test="originalPersistentState.claimTime != claimTime">
-          CLAIM_TIME_ = #{claimTime, jdbcType=TIMESTAMP},
-      </if>
-      <if test="originalPersistentState.isCountEnabled != isCountEnabled">
-          IS_COUNT_ENABLED_ = #{isCountEnabled, jdbcType=BOOLEAN},
-      </if>
-      <if test="originalPersistentState.variableCount != variableCount">
-          VAR_COUNT_ = #{variableCount, jdbcType=INTEGER},
-      </if>
-      <if test="originalPersistentState.identityLinkCount != identityLinkCount">
-          ID_LINK_COUNT_ = #{identityLinkCount, jdbcType=INTEGER},
-      </if>
-      <if test="originalPersistentState.subTaskCount != subTaskCount">
-          SUB_TASK_COUNT_ = #{subTaskCount, jdbcType=INTEGER}
-      </if>
-    </set>
-    where ID_= #{id, jdbcType=VARCHAR}
-      and REV_ = #{revision, jdbcType=INTEGER}
-  </update>
-  
-  <update id="updateTaskTenantIdForDeployment" parameterType="java.util.Map">
-    update ${prefix}ACT_RU_TASK set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
-    where
-      ID_ in (
-        SELECT T.ID_ from ${prefix}ACT_RU_TASK T
-        inner join ${prefix}ACT_RE_PROCDEF P on T.PROC_DEF_ID_  = P.ID_
-        inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_ 
-        where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
-      ) 
-  </update>
-  
-    <!-- See http://stackoverflow.com/questions/4429319/you-cant-specify-target-table-for-update-in-from-clause
-       Tested this on MySQL 5.6: does NOT use a temporary table (so good, performance0 -->
-  <update id="updateTaskTenantIdForDeployment" databaseId="mysql" parameterType="java.util.Map">
-    update ${prefix}ACT_RU_TASK set
-      TENANT_ID_ = #{tenantId, jdbcType=VARCHAR}
-    where
-      ID_ in (
-
-          SELECT tempTask.tempId
-          FROM (
-                SELECT T.ID_ as tempId
-                FROM  ${prefix}ACT_RU_TASK T
-                inner join ${prefix}ACT_RE_PROCDEF P on T.PROC_DEF_ID_  = P.ID_
-                inner join ${prefix}ACT_RE_DEPLOYMENT D on P.DEPLOYMENT_ID_ = D.ID_ 
-                where D.ID_ = #{deploymentId, jdbcType=VARCHAR}
-                
-        ) AS tempTask 
-
-    )
-  </update>
-  
-    
-  <update id="updateTaskRelatedEntityCountEnabled" parameterType="boolean">
-    update ${prefix}ACT_RU_TASK 
-    set IS_COUNT_ENABLED_ = #{parameter, jdbcType=BOOLEAN}
-  </update>
-  
-  <!-- TASK DELETE -->
-  <delete id="deleteTask" parameterType="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    delete from ${prefix}ACT_RU_TASK where ID_ = #{id} and REV_ = #{revision}
-  </delete>
-  
-  <delete id="deleteTasksByExecutionId" parameterType="string">
-    delete from ${prefix}ACT_RU_TASK where EXECUTION_ID_ = #{id}
-  </delete>
-  
-  <delete id="bulkDeleteTask" parameterType="java.util.Collection">
-    delete from ${prefix}ACT_RU_TASK where 
-    <foreach item="task" collection="list" index="index" separator=" or ">
-        ID_ = #{task.id, jdbcType=VARCHAR}
-    </foreach>
-  </delete>
-  
-  <!-- TASK RESULTMAP -->
-  
-  <resultMap id="taskResultMap" type="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR"/>
-    <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
-    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR"/>
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR"/>
-    <result property="priority" column="PRIORITY_" jdbcType="INTEGER"/>
-    <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-    <result property="owner" column="OWNER_" jdbcType="VARCHAR"/>
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR"/>
-    <result property="delegationStateString" column="DELEGATION_" jdbcType="VARCHAR"/>
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR"/>
-    <result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP"/>
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-    <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="formKey" column="FORM_KEY_" jdbcType="VARCHAR" />
-    <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
-    <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
-    <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
-    <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
-    <result property="subTaskCount" column="SUB_TASK_COUNT_" jdbcType="INTEGER" />
-  </resultMap>
-  
-  <resultMap id="taskAndRelatedEntitiesResultMap" type="org.flowable.task.service.impl.persistence.entity.TaskEntityImpl">
-    <id property="id" column="ID_" jdbcType="VARCHAR"/>
-    <result property="revision" column="REV_" jdbcType="INTEGER"/>
-    <result property="name" column="NAME_" jdbcType="VARCHAR"/>
-    <result property="parentTaskId" column="PARENT_TASK_ID_" jdbcType="VARCHAR"/>
-    <result property="description" column="DESCRIPTION_" jdbcType="VARCHAR"/>
-    <result property="priority" column="PRIORITY_" jdbcType="INTEGER"/>
-    <result property="createTime" column="CREATE_TIME_" jdbcType="TIMESTAMP" />
-    <result property="owner" column="OWNER_" jdbcType="VARCHAR"/>
-    <result property="assignee" column="ASSIGNEE_" jdbcType="VARCHAR"/>
-    <result property="delegationStateString" column="DELEGATION_" jdbcType="VARCHAR"/>
-    <result property="executionId" column="EXECUTION_ID_" jdbcType="VARCHAR" />
-    <result property="processInstanceId" column="PROC_INST_ID_" jdbcType="VARCHAR" />
-    <result property="processDefinitionId" column="PROC_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionId" column="TASK_DEF_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeId" column="SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="subScopeId" column="SUB_SCOPE_ID_" jdbcType="VARCHAR"/>
-    <result property="scopeType" column="SCOPE_TYPE_" jdbcType="VARCHAR"/>
-    <result property="scopeDefinitionId" column="SCOPE_DEFINITION_ID_" jdbcType="VARCHAR"/>
-    <result property="taskDefinitionKey" column="TASK_DEF_KEY_" jdbcType="VARCHAR"/>
-    <result property="dueDate" column="DUE_DATE_" jdbcType="TIMESTAMP"/>
-    <result property="category" column="CATEGORY_" jdbcType="VARCHAR" />
-    <result property="suspensionState" column="SUSPENSION_STATE_" jdbcType="INTEGER" />
-    <result property="tenantId" column="TENANT_ID_" jdbcType="VARCHAR" />
-    <result property="formKey" column="FORM_KEY_" jdbcType="VARCHAR" />
-    <result property="claimTime" column="CLAIM_TIME_" jdbcType="TIMESTAMP" />
-    <result property="isCountEnabled" column="IS_COUNT_ENABLED_" jdbcType="BOOLEAN" />
-    <result property="variableCount" column="VAR_COUNT_" jdbcType="INTEGER" />
-    <result property="identityLinkCount" column="ID_LINK_COUNT_" jdbcType="INTEGER" />
-    <result property="subTaskCount" column="SUB_TASK_COUNT_" jdbcType="INTEGER" />
-    <collection property="queryVariables" column="TASK_ID_" javaType="ArrayList" ofType="org.flowable.variable.service.impl.persistence.entity.VariableInstanceEntityImpl">
-      <id property="id" column="VAR_ID_"/>
-      <result property="name" column="VAR_NAME_" javaType="String" jdbcType="VARCHAR" />
-      <result property="type" column="VAR_TYPE_" javaType="org.flowable.variable.api.types.VariableType" jdbcType="VARCHAR" />
-      <result property="revision" column="VAR_REV_" jdbcType="INTEGER" />
-      <result property="processInstanceId" column="VAR_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="executionId" column="VAR_EXECUTION_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="VAR_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="byteArrayRef" column="VAR_BYTEARRAY_ID_" typeHandler="VariableByteArrayRefTypeHandler"/>
-      <result property="doubleValue" column="VAR_DOUBLE_" jdbcType="DOUBLE" />
-      <result property="textValue" column="VAR_TEXT_" jdbcType="VARCHAR" />
-      <result property="textValue2" column="VAR_TEXT2_" jdbcType="VARCHAR" />
-      <result property="longValue" column="VAR_LONG_" jdbcType="BIGINT" />
-    </collection>
-    <collection property="queryIdentityLinks" column="TASK_ID_" javaType="ArrayList" ofType="org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl">
-      <id property="id" column="ILINK_ID_"/>
-      <result property="type" column="ILINK_TYPE_" jdbcType="VARCHAR" />
-      <result property="userId" column="ILINK_USER_ID_" jdbcType="VARCHAR" />
-      <result property="groupId" column="ILINK_GROUP_ID_" jdbcType="VARCHAR" />
-      <result property="taskId" column="ILINK_TASK_ID_" jdbcType="VARCHAR" />
-      <result property="processInstanceId" column="ILINK_PROC_INST_ID_" jdbcType="VARCHAR" />
-      <result property="processDefId" column="ILINK_PROC_DEF_ID_" jdbcType="VARCHAR" />
-    </collection>
-  </resultMap>
-
-  <!-- TASK SELECT -->  
-
-  <select id="selectTask" parameterType="string" resultMap="taskResultMap">
-   select * from ${prefix}ACT_RU_TASK where ID_ = #{id, jdbcType=VARCHAR}
-  </select>
-  
-  <select id="selectTasksByParentTaskId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
-    select * from ${prefix}ACT_RU_TASK where PARENT_TASK_ID_ = #{parameter}
-  </select>
-
-  <select id="selectTasksByExecutionId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
-    select distinct T.*
-    from ${prefix}ACT_RU_TASK T
-    where T.EXECUTION_ID_ = #{parameter}
-  </select>
-  
-  <select id="selectTasksByProcessInstanceId" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
-    select T.*
-    from ${prefix}ACT_RU_TASK T
-    where T.PROC_INST_ID_ = #{parameter}
-  </select>
-  
-  <select id="selectTasksBySubScopeIdAndScopeType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
-    select T.*
-    from ${prefix}ACT_RU_TASK T
-    where T.SUB_SCOPE_ID_ = #{parameter.subScopeId, jdbcType=VARCHAR} and T.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
-  </select>
-  
-  <select id="selectTasksByScopeIdAndScopeType" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="taskResultMap">
-    select T.*
-    from ${prefix}ACT_RU_TASK T
-    where T.SCOPE_ID_ = #{parameter.scopeId, jdbcType=VARCHAR} and T.SCOPE_TYPE_ = #{parameter.scopeType, jdbcType=VARCHAR}
-  </select>
-  
-  <!-- Using distinct here because a task can appear multiple times in a resultset when -->
-  <select id="selectTaskByQueryCriteria" parameterType="org.apache.syncope.core.flowable.support.SyncopeTaskQueryImpl" resultMap="taskResultMap">
-    <if test="firstResult != null and firstResult &gt;= 0">${limitBefore}</if>
-    select distinct RES.* <if test="nullHandlingColumn != null">, ${nullHandlingColumn}</if> <if test="firstResult != null and firstResult &gt;= 0">${limitBetween}</if>
-    <include refid="selectTaskByQueryCriteriaSql"/> 
-    ${orderBy}
-    <if test="firstResult != null and firstResult &gt;= 0">${limitAfter}</if>
-  </select>
-
-  <select id="selectTaskCountByQueryCriteria" parameterType="org.apache.syncope.core.flowable.support.SyncopeTaskQueryImpl" resultType="long">
-    select count(distinct RES.ID_)
-    <include refid="selectTaskByQueryCriteriaSql"/>
-  </select>
-  
-  <sql id="selectTaskByQueryCriteriaSql">  
-    from ${prefix}ACT_RU_TASK RES
-    <include refid="commonSelectTaskByQueryCriteriaSql"/>
-  </sql>
-  
-  <select id="selectTasksWithRelatedEntitiesByQueryCriteria" parameterType="org.apache.syncope.core.flowable.support.SyncopeTaskQueryImpl" resultMap="taskAndRelatedEntitiesResultMap">
-    <include refid="selectTasksWithRelatedEntitiesByQueryCriteriaColumns"/>
-    <include refid="selectTasksWithRelatedEntitiesByQueryCriteriaSql"/>
-    ${orderBy}
-    <if test="firstResult != null and firstResult &gt;= 0">${limitAfter}</if>
-  </select>
-
-  <sql id="selectTasksWithRelatedEntitiesByQueryCriteriaColumns">
-    <if test="firstResult != null and firstResult &gt;= 0">${limitBefore}</if>
-  	<if test="_databaseId != 'db2' and _databaseId != 'mssql'">
-    select RES.*,
-      <if test="includeTaskLocalVariables or includeProcessVariables">
-        VAR.ID_ as VAR_ID_, VAR.NAME_ as VAR_NAME_, VAR.TYPE_ as VAR_TYPE_, VAR.REV_ as VAR_REV_,
-        VAR.PROC_INST_ID_ as VAR_PROC_INST_ID_, VAR.EXECUTION_ID_ as VAR_EXECUTION_ID_, VAR.TASK_ID_ as VAR_TASK_ID_,
-        VAR.BYTEARRAY_ID_ as VAR_BYTEARRAY_ID_, VAR.DOUBLE_ as VAR_DOUBLE_,
-        VAR.TEXT_ as VAR_TEXT_, VAR.TEXT2_ as VAR_TEXT2_, VAR.LONG_ as VAR_LONG_
-      </if>
-      <if test="(includeTaskLocalVariables or includeProcessVariables) and includeIdentityLinks">
-        ,
-      </if>
-      <if test="includeIdentityLinks">
-        ILINK.ID_ as ILINK_ID_, ILINK.TYPE_ as ILINK_TYPE_, ILINK.USER_ID_ as ILINK_USER_ID_,
-        ILINK.GROUP_ID_ as ILINK_GROUP_ID_, ILINK.TASK_ID_ as ILINK_TASK_ID_,
-        ILINK.PROC_INST_ID_ as ILINK_PROC_INST_ID_, ILINK.PROC_DEF_ID_ as ILINK_PROC_DEF_ID_
-      </if>
-    <if test="firstResult != null and firstResult &gt;= 0">${limitBetween}</if>
-    </if>
-    <if test="_databaseId == 'db2' || _databaseId == 'mssql'">
-      select distinct TEMPRES_ID_ as ID_, TEMPRES_REV_ as REV_, TEMPRES_NAME_ as NAME_,
-      TEMPRES_PARENT_TASK_ID_ as PARENT_TASK_ID_, TEMPRES_DESCRIPTION_ as DESCRIPTION_,
-      TEMPRES_PRIORITY_ as PRIORITY_, TEMPRES_CREATE_TIME_ as CREATE_TIME_,
-      TEMPRES_OWNER_ as OWNER_, TEMPRES_ASSIGNEE_ as ASSIGNEE_, TEMPRES_DELEGATION_ as DELEGATION_,
-      TEMPRES_FORM_KEY_ as FORM_KEY_, TEMPRES_CLAIM_TIME_ as CLAIM_TIME_, TEMPRES_EXECUTION_ID_ as EXECUTION_ID_,
-      TEMPRES_PROC_INST_ID_ as PROC_INST_ID_, TEMPRES_PROC_DEF_ID_ as PROC_DEF_ID_,
-      TEMPRES_TASK_DEF_ID_ as TASK_DEF_ID_, TEMPRES_TASK_DEF_KEY_ as TASK_DEF_KEY_,
-      TEMPRES_DUE_DATE_ as DUE_DATE_, TEMPRES_SUSPENSION_STATE_ as SUSPENSION_STATE_, TEMPRES_CATEGORY_ as CATEGORY_,
-      TEMPRES_IS_COUNT_ENABLED_ as IS_COUNT_ENABLED_,	TEMPRES_VAR_COUNT_ as VAR_COUNT_, TEMPRES_ID_LINK_COUNT_ as ID_LINK_COUNT_, TEMPRES_ID_SUB_TASK_COUNT_ as SUB_TASK_COUNT_
-      <if test="includeTaskLocalVariables or includeProcessVariables">
-        ,
-        TEMPVAR_ID_ as VAR_ID_, TEMPVAR_NAME_ as VAR_NAME_, TEMPVAR_TYPE_ as VAR_TYPE_, TEMPVAR_REV_ as VAR_REV_,
-        TEMPVAR_PROC_INST_ID_ as VAR_PROC_INST_ID_, TEMPVAR_EXECUTION_ID_ as VAR_EXECUTION_ID_, TEMPVAR_TASK_ID_ as VAR_TASK_ID_,
-        TEMPVAR_BYTEARRAY_ID_ as VAR_BYTEARRAY_ID_, TEMPVAR_DOUBLE_ as VAR_DOUBLE_,
-        TEMPVAR_TEXT_ as VAR_TEXT_, TEMPVAR_TEXT2_ as VAR_TEXT2_, TEMPVAR_LONG_ as VAR_LONG_
-      </if>
-      <if test="includeIdentityLinks">
-        ,
-        TEMPILINK_ID_ as ILINK_ID_, TEMPILINK_TYPE_ as ILINK_TYPE_, TEMPILINK_USER_ID_ as ILINK_USER_ID_,
-        TEMPILINK_GROUP_ID_ as ILINK_GROUP_ID_, TEMPILINK_TASK_ID_ as ILINK_TASK_ID_,
-        TEMPILINK_PROC_INST_ID_ as ILINK_PROC_INST_ID_, TEMPILINK_PROC_DEF_ID_ as ILINK_PROC_DEF_ID_
-      </if>
-      <if test="firstResult != null and firstResult &gt;= 0">${limitOuterJoinBetween}</if>
-      RES.ID_ as TEMPRES_ID_, RES.REV_ as TEMPRES_REV_, RES.NAME_ as TEMPRES_NAME_,
-      RES.PARENT_TASK_ID_ as TEMPRES_PARENT_TASK_ID_, RES.DESCRIPTION_ as TEMPRES_DESCRIPTION_,
-      RES.PRIORITY_ as TEMPRES_PRIORITY_, RES.CREATE_TIME_ as TEMPRES_CREATE_TIME_,
-      RES.OWNER_ as TEMPRES_OWNER_, RES.ASSIGNEE_ as TEMPRES_ASSIGNEE_, RES.DELEGATION_ as TEMPRES_DELEGATION_,
-      RES.FORM_KEY_ as TEMPRES_FORM_KEY_, RES.CLAIM_TIME_ as TEMPRES_CLAIM_TIME_, RES.EXECUTION_ID_ as TEMPRES_EXECUTION_ID_,
-      RES.PROC_INST_ID_ as TEMPRES_PROC_INST_ID_, RES.PROC_DEF_ID_ as TEMPRES_PROC_DEF_ID_,
-      RES.TASK_DEF_ID_ as TEMPRES_TASK_DEF_ID_, RES.TASK_DEF_KEY_ as TEMPRES_TASK_DEF_KEY_,
-      RES.DUE_DATE_ as TEMPRES_DUE_DATE_, RES.SUSPENSION_STATE_ as TEMPRES_SUSPENSION_STATE_, RES.CATEGORY_ as TEMPRES_CATEGORY_,
-      RES.IS_COUNT_ENABLED_ as TEMPRES_IS_COUNT_ENABLED_, RES.VAR_COUNT_ as TEMPRES_VAR_COUNT_, RES.ID_LINK_COUNT_ as TEMPRES_ID_LINK_COUNT_, RES.SUB_TASK_COUNT_ as TEMPRES_ID_SUB_TASK_COUNT_
-      <if test="includeTaskLocalVariables or includeProcessVariables">
-        ,
-        VAR.ID_ as TEMPVAR_ID_, VAR.NAME_ as TEMPVAR_NAME_, VAR.TYPE_ as TEMPVAR_TYPE_, VAR.REV_ as TEMPVAR_REV_,
-        VAR.PROC_INST_ID_ as TEMPVAR_PROC_INST_ID_, VAR.EXECUTION_ID_ as TEMPVAR_EXECUTION_ID_, VAR.TASK_ID_ as TEMPVAR_TASK_ID_,
-        VAR.BYTEARRAY_ID_ as TEMPVAR_BYTEARRAY_ID_, VAR.DOUBLE_ as TEMPVAR_DOUBLE_,
-        VAR.TEXT_ as TEMPVAR_TEXT_, VAR.TEXT2_ as TEMPVAR_TEXT2_, VAR.LONG_ as TEMPVAR_LONG_
-      </if>
-      <if test="includeIdentityLinks">
-        ,
-        ILINK.ID_ as TEMPILINK_ID_, ILINK.TYPE_ as TEMPILINK_TYPE_, ILINK.USER_ID_ as TEMPILINK_USER_ID_,
-        ILINK.GROUP_ID_ as TEMPILINK_GROUP_ID_, ILINK.TASK_ID_ as TEMPILINK_TASK_ID_,
-        ILINK.PROC_INST_ID_ as TEMPILINK_PROC_INST_ID_, ILINK.PROC_DEF_ID_ as TEMPILINK_PROC_DEF_ID_
-      </if>
-    </if>
-  </sql>
-  
-  <sql id="selectTasksWithRelatedEntitiesByQueryCriteriaSql">
-    from ${prefix}ACT_RU_TASK RES
-    <choose>
-      <when test="includeTaskLocalVariables &amp;&amp; includeProcessVariables">
-        left outer join ${prefix}ACT_RU_VARIABLE VAR ON RES.ID_ = VAR.TASK_ID_ or RES.PROC_INST_ID_ = VAR.EXECUTION_ID_
-      </when>
-      <otherwise>
-        <if test="includeTaskLocalVariables">
-          left outer join ${prefix}ACT_RU_VARIABLE VAR ON RES.ID_ = VAR.TASK_ID_
-        </if>
-        <if test="includeProcessVariables">
-          left outer join ${prefix}ACT_RU_VARIABLE VAR ON RES.PROC_INST_ID_ = VAR.EXECUTION_ID_ and VAR.TASK_ID_ is null
-        </if>
-      </otherwise>
-    </choose>
-    <if test="includeIdentityLinks">
-      left outer join ${prefix}ACT_RU_IDENTITYLINK ILINK on RES.ID_ = ILINK.TASK_ID_
-    </if>
-    <include refid="commonSelectTaskByQueryCriteriaSql"/>
-  </sql>
-
-  <sql id="commonSelectTaskByQueryCriteriaSql">
-    <foreach collection="queryVariableValues" index="index" item="var">
-      <if test="!var.operator.equals('EXISTS') &amp;&amp; !var.operator.equals('NOT_EXISTS')">
-          <choose>
-            <when test="var.local">
-              inner join ${prefix}ACT_RU_VARIABLE A${index} on RES.ID_ = A${index}.TASK_ID_ 
-            </when>
-            <otherwise>
-              inner join ${prefix}ACT_RU_VARIABLE A${index} on RES.PROC_INST_ID_ = A${index}.PROC_INST_ID_ 
-            </otherwise>
-          </choose>
-      </if>       
-    </foreach>
-    <foreach collection="orQueryObjects" index="orIndex" item="orQueryObject">
-      <if test="orQueryObject.queryVariableValues.size() &gt; 0">
-        <if test="orQueryObject.hasValueComparisonQueryVariables()">
-            <if test="orQueryObject.hasLocalQueryVariableValue()">
-              left outer join ${prefix}ACT_RU_VARIABLE A_L_OR${orIndex} on RES.ID_ = A_L_OR${orIndex}.TASK_ID_
-            </if>
-            <if test="orQueryObject.hasNonLocalQueryVariableValue()">
-              left outer join ${prefix}ACT_RU_VARIABLE A_OR${orIndex} on RES.PROC_INST_ID_ = A_OR${orIndex}.PROC_INST_ID_
-            </if>
-        </if>
-      </if>
-      
-      <if test="orQueryObject.processDefinitionKey != null || orQueryObject.processDefinitionKeyLike != null || orQueryObject.processDefinitionKeyLikeIgnoreCase != null || orQueryObject.processDefinitionName != null || orQueryObject.processDefinitionNameLike != null || (orQueryObject.processCategoryInList != null &amp;&amp; orQueryObject.processCategoryInList.size() &gt; 0) || (orQueryObject.processCategoryNotInList != null &amp;&amp; orQueryObject.processCategoryNotInList.size() &gt; 0) [...]
-        left outer join ${prefix}ACT_RE_PROCDEF D_OR${orIndex} on RES.PROC_DEF_ID_ = D_OR${orIndex}.ID_
-      </if>
-      
-      <if test="orQueryObject.processInstanceBusinessKey != null || orQueryObject.processInstanceBusinessKeyLike != null || orQueryObject.processInstanceBusinessKeyLikeIgnoreCase != null">
-        inner join ${prefix}ACT_RU_EXECUTION E_OR${orIndex} on RES.PROC_INST_ID_ = E_OR${orIndex}.ID_
-      </if>
-      
-      <if test="orQueryObject.deploymentId != null || (orQueryObject.deploymentIds != null &amp;&amp; orQueryObject.deploymentIds.size() &gt; 0)">
-        left outer join ${prefix}ACT_RE_PROCDEF DEPLOY_P_OR${orIndex} ON RES.PROC_DEF_ID_ = DEPLOY_P_OR${orIndex}.ID_
-      </if>
-      <if test="orQueryObject.cmmnDeploymentId != null || (orQueryObject.cmmnDeploymentIds != null &amp;&amp; orQueryObject.cmmnDeploymentIds.size() &gt; 0)">
-        left outer join ${prefix}ACT_CMMN_CASEDEF DEPLOY_C_OR${orIndex} ON RES.SCOPE_DEFINITION_ID_ = DEPLOY_C_OR${orIndex}.ID_
-      </if>
-    </foreach>
-    
-    <if test="processDefinitionKey != null || processDefinitionKeyLike != null ||  processDefinitionKeyLikeIgnoreCase != null || processDefinitionName != null || processDefinitionNameLike != null || (processCategoryInList != null &amp;&amp; processCategoryInList.size() &gt; 0) || (processCategoryNotInList != null &amp;&amp; processCategoryNotInList.size() &gt; 0) || (processDefinitionKeys != null &amp;&amp; processDefinitionKeys.size() &gt; 0)">
-      inner join ${prefix}ACT_RE_PROCDEF D on RES.PROC_DEF_ID_ = D.ID_
-    </if>
-    <if test="processInstanceBusinessKey != null || processInstanceBusinessKeyLike != null  || processInstanceBusinessKeyLikeIgnoreCase != null">
-      inner join ${prefix}ACT_RU_EXECUTION E on RES.PROC_INST_ID_ = E.ID_
-    </if>
-    <if test="deploymentId != null || (deploymentIds != null &amp;&amp; deploymentIds.size() &gt; 0)">
-      left outer join ${prefix}ACT_RE_PROCDEF DEPLOY_P ON RES.PROC_DEF_ID_ = DEPLOY_P.ID_
-    </if>
-    <if test="cmmnDeploymentId != null || (cmmnDeploymentIds != null &amp;&amp; cmmnDeploymentIds.size() &gt; 0)">
-      left outer join ${prefix}ACT_CMMN_CASEDEF DEPLOY_C ON RES.SCOPE_DEFINITION_ID_ = DEPLOY_C.ID_
-    </if>
-    <where> 
-      <if test="taskId != null">
-        RES.ID_ = #{taskId}
-      </if>
-      <if test="name != null">
-        and RES.NAME_ = #{name}
-      </if>
-      <if test="nameLike != null">
-        and RES.NAME_ like #{nameLike}${wildcardEscapeClause}
-      </if>
-      <if test="nameLikeIgnoreCase != null">
-        and lower(RES.NAME_) like #{nameLikeIgnoreCase}${wildcardEscapeClause}
-      </if>
-      <if test="nameList != null &amp;&amp; nameList.size() &gt; 0">
-        and RES.NAME_ IN
-        <foreach item="name" index="index" collection="nameList"
-                 open="(" separator="," close=")">
-          #{name}
-        </foreach>
-      </if>
-      <if test="nameListIgnoreCase != null &amp;&amp; nameListIgnoreCase.size() &gt; 0">
-        and lower(RES.NAME_) IN
-        <foreach item="name" index="index" collection="nameListIgnoreCase"
-                 open="(" separator="," close=")">
-          #{name}
-        </foreach>
-      </if>
-      <if test="description != null">
-        and RES.DESCRIPTION_ = #{description}
-      </if>
-      <if test="descriptionLike != null">
-        and RES.DESCRIPTION_ like #{descriptionLike}${wildcardEscapeClause}
-      </if>
-      <if test="descriptionLikeIgnoreCase != null">
-        and lower(RES.DESCRIPTION_) like #{descriptionLikeIgnoreCase}${wildcardEscapeClause}
-      </if>
-      <if test="priority != null">
-        and RES.PRIORITY_ = #{priority}
-      </if> 
-      <if test="minPriority != null">
-        and RES.PRIORITY_ &gt;= #{minPriority}
-      </if> 
-      <if test="maxPriority != null">
-        and RES.PRIORITY_ &lt;= #{maxPriority}
-      </if> 
-      <if test="assignee != null">
-        and RES.ASSIGNEE_ = #{assignee}
-      </if>
-      <if test="assigneeLike != null">
-        and RES.ASSIGNEE_ like #{assigneeLike}${wildcardEscapeClause}
-      </if>
-      <if test="assigneeLikeIgnoreCase != null">
-        and lower(RES.ASSIGNEE_) like #{assigneeLikeIgnoreCase}${wildcardEscapeClause}
-      </if>
-      <if test="assigneeIds != null &amp;&amp; assigneeIds.size() &gt; 0">
-        and RES.ASSIGNEE_ IN
-        <foreach item="assigneeId" index="index" collection="assigneeIds" 
-                 open="(" separator="," close=")">
-          #{assigneeId}
-        </foreach>
-      </if>
-      <if test="owner != null">
-        and RES.OWNER_ = #{owner}
-      </if>
-      <if test="ownerLike != null">
-        and RES.OWNER_ like #{ownerLike}${wildcardEscapeClause}
-      </if>
-       <if test="ownerLikeIgnoreCase != null">
-        and lower(RES.OWNER_) like #{ownerLikeIgnoreCase}${wildcardEscapeClause}
-      </if>
-      <if test="unassigned">
-        and RES.ASSIGNEE_ IS NULL
-      </if>
-      <if test="noDelegationState">
-        and RES.DELEGATION_ IS NULL
-      </if>
-      <if test="delegationState != null">
-        and RES.DELEGATION_ = #{delegationStateString}
-      </if>
-      <if test="processInstanceId != null">
-        and RES.PROC_INST_ID_ = #{processInstanceId}
-      </if>
-      <if test="processInstanceIds != null &amp;&amp; processInstanceIds.size() &gt; 0">
-        and RES.PROC_INST_ID_ IN
-        <foreach item="processInstance" index="index" collection="processInstanceIds" 
-                 open="(" separator="," close=")">
-          #{processInstance}
-        </foreach>
-      </if>
-      <if test="processInstanceBusinessKey != null">
-        and E.BUSINESS_KEY_ = #{processInstanceBusinessKey}
-      </if>
-      <if test="processInstanceBusinessKeyLike != null">
-        and E.BUSINESS_KEY_ like #{processInstanceBusinessKeyLike}${wildcardEscapeClause}
-      </if>      
-      <if test="processInstanceBusinessKeyLikeIgnoreCase != null">
-        and lower(E.BUSINESS_KEY_) like #{processInstanceBusinessKeyLikeIgnoreCase}${wildcardEscapeClause}
-      </if>         
-      <if test="executionId != null">
-        and RES.EXECUTION_ID_ = #{executionId}
-      </if>
-      <if test="scopeId != null">
-        and RES.SCOPE_ID_ = #{scopeId}
-      </if>
-      <if test="subScopeId != null">
-        and RES.SUB_SCOPE_ID_ = #{subScopeId}
-      </if>
-      <if test="scopeType != null">
-        and RES.SCOPE_TYPE_ = #{scopeType}
-      </if>
-      <if test="scopeDefinitionId != null">
-        and RES.SCOPE_DEFINITION_ID_ = #{scopeDefinitionId}
-      </if>
-      <if test="createTime != null">
-        and RES.CREATE_TIME_ = #{createTime}
-      </if>
-      <if test="createTimeBefore != null">
-        and RES.CREATE_TIME_ &lt; #{createTimeBefore}
-      </if>
-      <if test="createTimeAfter != null">
-        and RES.CREATE_TIME_ &gt; #{createTimeAfter}
-      </if>
-      <if test="key != null">
-        and RES.TASK_DEF_KEY_ = #{key}
-      </if>
-      <if test="keyLike != null">
-        and RES.TASK_DEF_KEY_ like #{keyLike}
-      </if>
-      <if test="processDefinitionId != null">
-        and RES.PROC_DEF_ID_ = #{processDefinitionId}
-      </if>
-      <if test="taskDefinitionId != null">
-        and RES.TASK_DEF_ID_ = #{taskDefinitionId}
-      </if>
-      <if test="processDefinitionKey != null">
-        and D.KEY_ = #{processDefinitionKey}
-      </if>
-      <if test="processDefinitionKeyLike != null">
-        and D.KEY_ like #{processDefinitionKeyLike}${wildcardEscapeClause}
-      </if>
-      <if test="processDefinitionKeyLikeIgnoreCase != null">
-        and lower(D.KEY_) like #{processDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
-      </if>
-      <if test="processDefinitionKeys != null &amp;&amp; processDefinitionKeys.size() &gt; 0">
-        and D.KEY_ in
-        <foreach item="item" index="index" collection="processDefinitionKeys" open="(" separator="," close=")">
-          #{item}
-        </foreach>
-      </if>
-      <if test="processDefinitionName != null">
-        and D.NAME_ = #{processDefinitionName}
-      </if>
-      <if test="processDefinitionNameLike != null">
-        and D.NAME_ like #{processDefinitionNameLike}${wildcardEscapeClause}
-      </if>
-      <if test="processCategoryInList != null &amp;&amp; processCategoryInList.size() &gt; 0">
-        and D.CATEGORY_ IN
-        <foreach item="processCategory" index="index" collection="processCategoryInList"
-                 open="(" separator="," close=")">
-          #{processCategory}
-        </foreach>
-      </if>
-      <if test="processCategoryNotInList != null &amp;&amp; processCategoryNotInList.size() &gt; 0">
-        and D.CATEGORY_ NOT IN
-        <foreach item="processCategory" index="index" collection="processCategoryNotInList"
-                 open="(" separator="," close=")">
-          #{processCategory}
-        </foreach>
-      </if>
-      <if test="deploymentId != null &amp;&amp; cmmnDeploymentId == null">
-        and DEPLOY_P.DEPLOYMENT_ID_ = #{deploymentId}
-      </if>
-      <if test="deploymentIds != null &amp;&amp; deploymentIds.size() &gt; 0 &amp;&amp; cmmnDeploymentIds == null">
-        and DEPLOY_P.DEPLOYMENT_ID_ IN
-        <foreach item="deployment" index="index" collection="deploymentIds" 
-                 open="(" separator="," close=")">
-          #{deployment}
-        </foreach>
-      </if>
-      <if test="cmmnDeploymentId != null &amp;&amp; deploymentId == null">
-        and DEPLOY_C.DEPLOYMENT_ID_ = #{cmmnDeploymentId}
-      </if>
-      <if test="cmmnDeploymentIds != null &amp;&amp; cmmnDeploymentIds.size() &gt; 0 &amp;&amp; deploymentIds == null">
-        and DEPLOY_C.DEPLOYMENT_ID_ IN
-        <foreach item="deployment" index="index" collection="cmmnDeploymentIds" 
-                 open="(" separator="," close=")">
-          #{deployment}
-        </foreach>
-      </if>
-      <if test="deploymentId != null &amp;&amp; cmmnDeploymentId != null">
-        and (DEPLOY_P.DEPLOYMENT_ID_ = #{deploymentId} or DEPLOY_C.DEPLOYMENT_ID = #{cmmnDeploymentId})
-      </if>
-      <if test="cmmnDeploymentIds != null &amp;&amp; cmmnDeploymentIds.size() &gt; 0 &amp;&amp; deploymentIds != null &amp;&amp; deploymentIds.size() &gt; 0">
-        and (
-            DEPLOY_P.DEPLOYMENT_ID_ IN
-            <foreach item="deployment" index="index" collection="deploymentIds" open="(" separator="," close=")">
-                #{deployment}
-            </foreach>
-            or
-            DEPLOY_C.DEPLOYMENT_ID_ IN
-            <foreach item="cmmnDeployment" index="index" collection="cmmnDeploymentIds" open="(" separator="," close=")">
-                #{cmmnDeployment}
-            </foreach>
-        )
-      </if>
-      <if test="dueDate != null">
-        and RES.DUE_DATE_ = #{dueDate}
-      </if>
-      <if test="dueBefore != null">
-        and RES.DUE_DATE_ &lt; #{dueBefore}
-      </if>
-      <if test="dueAfter != null">
-        and RES.DUE_DATE_ &gt; #{dueAfter}
-      </if>
-      <if test="withoutDueDate">
-        and RES.DUE_DATE_ is null
-      </if>
-      <if test="dueDate != null || dueBefore != null || dueAfter != null">
-        and RES.DUE_DATE_ is not null
-      </if>
-      <if test="category != null">
-        and RES.CATEGORY_ = #{category}
-      </if>
-      <!-- Syncope -->
-      <if test="withFormKey">
-        and RES.FORM_KEY_ IS NOT NULL
-      </if>
-      <!-- /Syncope -->
-      <if test="excludeSubtasks">
-        and RES.PARENT_TASK_ID_ IS NULL
-      </if>
-      <if test="!bothCandidateAndAssigned &amp;&amp; (candidateUser != null || candidateGroups != null)">
-        <if test="!ignoreAssigneeValue">
-            and RES.ASSIGNEE_ is null
-        </if>
-        and exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TYPE_ = 'candidate' and LINK.TASK_ID_ = RES.ID_
-            and 
-            ( 
-              <if test="candidateUser != null">
-                LINK.USER_ID_ = #{candidateUser}          
-              </if>
-              <if test="candidateUser != null &amp;&amp; candidateGroups != null &amp;&amp; candidateGroups.size() &gt; 0">
-                or
-              </if>
-              <if test="candidateGroups != null &amp;&amp; candidateGroups.size() &gt; 0">
-                LINK.GROUP_ID_ IN
-                <foreach item="group" index="index" collection="candidateGroups" 
-                         open="(" separator="," close=")">
-                  #{group}
-                </foreach>
-              </if>
-            )
-        )
-      </if>
-      <if test="involvedUser != null">
-        and (
-          exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.USER_ID_ = #{involvedUser} and LINK.TASK_ID_ = RES.ID_)
-          or RES.ASSIGNEE_ = #{involvedUser}
-          or RES.OWNER_ = #{involvedUser}
-          )
-      </if>
-      <if test="involvedGroups != null">
-        and EXISTS(
-          select ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_ and LINK.GROUP_ID_ in
-          <foreach item="involvedGroup" index="index" collection="involvedGroups" open="(" separator="," close=")">
-              #{involvedGroup}
-          </foreach>
-        )
-      </if>
-      <foreach item="var" collection="queryVariableValues" index="index">
-        <choose>
-            <when test="var.operator.equals('EXISTS')">
-              and EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
-                <if test="!var.local">
-                    and RES.PROC_INST_ID_ = PROC_INST_ID_ and TASK_ID_ is null
-                </if>
-                <if test="var.local">
-                    and RES.ID_ = TASK_ID_ 
-                </if>
-              )
-            </when>
-            <when test="var.operator.equals('NOT_EXISTS')">
-              and NOT EXISTS (
-                select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
-                <if test="!var.local">
-                    and RES.PROC_INST_ID_ = PROC_INST_ID_ and TASK_ID_ is null
-                </if>
-                <if test="var.local">
-                    and RES.ID_ = TASK_ID_ 
-                </if>
-              )
-            </when>
-            <otherwise>
-                <if test="!var.local">
-                  <!-- When process instance variable is queried for, taskId should be null -->
-                  and A${index}.TASK_ID_ is null
-                </if>
-                <if test="var.name != null">
-                  <!-- Match-all variable-names when name is null -->
-                  and A${index}.NAME_= #{var.name}
-                </if>
-                <if test="var.name == null">
-                  and A${index}.NAME_ is not null
-                </if>
-                <if test="!var.type.equals('null')">
-                  and A${index}.TYPE_ = #{var.type}
-                </if>
-                
-                <!-- Variable value -->
-                <if test="var.textValue != null &amp;&amp; var.longValue == null &amp;&amp; var.doubleValue == null">
-                  <choose>
-                    <when test="var.operator.equals('EQUALS_IGNORE_CASE') || var.operator.equals('NOT_EQUALS_IGNORE_CASE') || var.operator.equals('LIKE_IGNORE_CASE')">
-                      and lower(A${index}.TEXT_)
-                    </when>
-                    <otherwise>
-                      and A${index}.TEXT_
-                    </otherwise>
-                  </choose> 
-                  <choose>
-                      <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
-                      <otherwise><include refid="executionVariableOperator" /></otherwise>
-                  </choose>          
-                  #{var.textValue}
-                  <choose>
-        			<when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
-        		  </choose>
-                </if>
-                <if test="var.textValue2 != null">
-                  and A${index}.TEXT2_ 
-                  <choose>
-                    <when test="var.operator.equals('LIKE')">LIKE</when>
-                    <otherwise><include refid="executionVariableOperator" /></otherwise>
-                  </choose>          
-                  #{var.textValue2}
-                  <choose>
-        			<when test="var.operator.equals('LIKE')">${wildcardEscapeClause}</when>
-        		  </choose>
-                </if>
-                <if test="var.longValue != null">
-                  and A${index}.LONG_
-                  <include refid="executionVariableOperator" />
-                  #{var.longValue}
-                </if>
-                <if test="var.doubleValue != null">
-                  and A${index}.DOUBLE_ 
-                  <include refid="executionVariableOperator" />
-                  #{var.doubleValue}
-                </if>
-                <!-- Null variable type -->
-                <if test="var.textValue == null &amp;&amp; var.textValue2 == null &amp;&amp; var.longValue == null &amp;&amp; var.doubleValue == null">
-                  <choose>
-                    <when test="var.operator.equals('NOT_EQUALS')">
-                      and (A${index}.TEXT_ is not null or A${index}.TEXT2_ is not null or A${index}.LONG_ is not null or A${index}.DOUBLE_ is not null or A${index}.BYTEARRAY_ID_ is not null)
-                    </when>
-                    <otherwise>
-                      and A${index}.TEXT_ is null and A${index}.TEXT2_ is null and A${index}.LONG_ is null and A${index}.DOUBLE_ is null and A${index}.BYTEARRAY_ID_ is null
-                    </otherwise>
-                  </choose>          
-                </if>
-            </otherwise>
-        </choose>
-      </foreach>
-      <if test="suspensionState != null">
-        <if test="suspensionState.stateCode == 1">
-            and RES.SUSPENSION_STATE_ = 1
-        </if>
-        <if test="suspensionState.stateCode == 2">
-            and RES.SUSPENSION_STATE_ = 2
-        </if>
-      </if>
-      <if test="tenantId != null">
-        and RES.TENANT_ID_ = #{tenantId}
-      </if>
-      <if test="tenantIdLike != null">
-        and RES.TENANT_ID_ like #{tenantIdLike}${wildcardEscapeClause}
-      </if>
-      <if test="withoutTenantId">
-        and (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
-      </if>
-      <choose>
-        <when test="bothCandidateAndAssigned">
-          <!-- if dbIdentityUsed set true in process engine configuration -->
-          <if test="userIdForCandidateAndAssignee != null">
-            <if test="candidateGroups == null">
-              and (RES.ASSIGNEE_ = #{userIdForCandidateAndAssignee}
-                or (
-                <if test="!ignoreAssigneeValue">
-                    RES.ASSIGNEE_ is null and
-                </if>
-                exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                and (LINK.USER_ID_ = #{userIdForCandidateAndAssignee}
-                or LINK.GROUP_ID_ IN (select g.GROUP_ID_ from ${prefix}ACT_ID_MEMBERSHIP g where g.USER_ID_ = #{userIdForCandidateAndAssignee} )))))
-            </if>
-          </if>
-          <!-- if dbIdentityUsed set false in process engine configuration of using custom session factory of GroupIdentityManager -->
-          <if test="candidateGroups != null">
-            and (RES.ASSIGNEE_ = #{userIdForCandidateAndAssignee}
-              or (
-              <if test="!ignoreAssigneeValue">
-                RES.ASSIGNEE_ is null and
-              </if>
-                exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = #{userIdForCandidateAndAssignee}
-                <if test="candidateGroups.size() &gt; 0">
-                    or LINK.GROUP_ID_ IN
-                    <foreach item="group" index="index" collection="candidateGroups" open="(" separator="," close=")">
-                        #{group}
-                    </foreach>
-                </if>
-                ))))
-          </if>
-        </when>
-      </choose>
-      <foreach item="orQueryObject" index="orIndex" collection="orQueryObjects">
-        and 
-        <trim prefix="(" prefixOverrides="OR" suffix=")">
-            <if test="orQueryObject.taskId != null">
-              RES.ID_ = #{orQueryObject.taskId}
-            </if>
-            <if test="orQueryObject.name != null">
-              or RES.NAME_ = #{orQueryObject.name}
-            </if>
-            <if test="orQueryObject.nameLike != null">
-              or RES.NAME_ like #{orQueryObject.nameLike}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.nameLikeIgnoreCase != null">
-              or lower(RES.NAME_) like #{orQueryObject.nameLikeIgnoreCase}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.nameList != null &amp;&amp; orQueryObject.nameList.size() &gt; 0">
-              or RES.NAME_ IN
-              <foreach item="name" index="index" collection="orQueryObject.nameList"
-                      open="(" separator="," close=")">
-                #{name}
-              </foreach>
-            </if>
-            <if test="orQueryObject.nameListIgnoreCase != null &amp;&amp; orQueryObject.nameListIgnoreCase.size() &gt; 0">
-              or lower(RES.NAME_) IN
-              <foreach item="name" index="index" collection="orQueryObject.nameListIgnoreCase"
-                       open="(" separator="," close=")">
-                #{name}
-              </foreach>
-            </if>
-            <if test="orQueryObject.description != null">
-              or RES.DESCRIPTION_ = #{orQueryObject.description}
-            </if>
-            <if test="orQueryObject.descriptionLike != null">
-              or RES.DESCRIPTION_ like #{orQueryObject.descriptionLike}${wildcardEscapeClause}
-            </if>
-             <if test="orQueryObject.descriptionLikeIgnoreCase != null">
-              or lower(RES.DESCRIPTION_) like #{orQueryObject.descriptionLikeIgnoreCase}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.priority != null">
-              or RES.PRIORITY_ = #{orQueryObject.priority}
-            </if> 
-            <if test="orQueryObject.minPriority != null">
-              or RES.PRIORITY_ &gt;= #{orQueryObject.minPriority}
-            </if> 
-            <if test="orQueryObject.maxPriority != null">
-              or RES.PRIORITY_ &lt;= #{orQueryObject.maxPriority}
-            </if> 
-            <if test="orQueryObject.assignee != null">
-              or RES.ASSIGNEE_ = #{orQueryObject.assignee}
-            </if>
-            <if test="orQueryObject.assigneeLike != null">
-              or RES.ASSIGNEE_ like #{orQueryObject.assigneeLike}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.assigneeLikeIgnoreCase != null">
-              or lower(RES.ASSIGNEE_) like #{orQueryObject.assigneeLikeIgnoreCase}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.assigneeIds != null &amp;&amp; orQueryObject.assigneeIds.size() &gt; 0">
-		      or RES.ASSIGNEE_ IN
-		      <foreach item="assigneeId" index="index" collection="orQueryObject.assigneeIds" 
-		               open="(" separator="," close=")">
-		        #{assigneeId}
-		      </foreach>
-		    </if>
-            <if test="orQueryObject.owner != null">
-              or RES.OWNER_ = #{orQueryObject.owner}
-            </if>
-            <if test="orQueryObject.ownerLike != null">
-              or RES.OWNER_ like #{orQueryObject.ownerLike}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.ownerLikeIgnoreCase != null">
-              or RES.OWNER_ like #{orQueryObject.ownerLikeIgnoreCase}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.unassigned">
-              or RES.ASSIGNEE_ IS NULL
-            </if>
-            <if test="orQueryObject.noDelegationState">
-              or RES.DELEGATION_ IS NULL
-            </if>
-            <if test="orQueryObject.delegationState != null">
-              or RES.DELEGATION_ = #{orQueryObject.delegationStateString}
-            </if>
-            <if test="orQueryObject.processInstanceId != null">
-              or RES.PROC_INST_ID_ = #{orQueryObject.processInstanceId}
-            </if>
-            <if test="orQueryObject.processInstanceIds != null &amp;&amp; orQueryObject.processInstanceIds.size() &gt; 0">
-              or RES.PROC_INST_ID_ IN
-              <foreach item="processInstance" index="index" collection="orQueryObject.processInstanceIds" 
-                       open="(" separator="," close=")">
-                #{processInstance}
-              </foreach>
-            </if>
-            <if test="orQueryObject.processInstanceBusinessKey != null">
-              or E_OR${orIndex}.BUSINESS_KEY_ = #{orQueryObject.processInstanceBusinessKey}
-            </if>
-            <if test="orQueryObject.processInstanceBusinessKeyLike != null">
-              or E_OR${orIndex}.BUSINESS_KEY_ like #{orQueryObject.processInstanceBusinessKeyLike}${wildcardEscapeClause}
-            </if>      
-            <if test="orQueryObject.processInstanceBusinessKeyLikeIgnoreCase != null">
-              or lower(E.BUSINESS_KEY_) like #{orQueryObject.processInstanceBusinessKeyLikeIgnoreCase}${wildcardEscapeClause}
-            </if>         
-            <if test="orQueryObject.executionId != null">
-              or RES.EXECUTION_ID_ = #{orQueryObject.executionId}
-            </if>
-            <if test="orQueryObject.scopeId != null">
-              and RES.SCOPE_ID_ = #{orQueryObject.scopeId}
-            </if>
-            <if test="orQueryObject.subScopeId != null">
-              and RES.SUB_SCOPE_ID_ = #{orQueryObject.subScopeId}
-            </if>
-            <if test="orQueryObject.scopeType != null">
-              and RES.SCOPE_TYPE_ = #{orQueryObject.scopeType}
-            </if>
-            <if test="orQueryObject.scopeDefinitionId != null">
-              and RES.SCOPE_DEFINITION_ID_ = #{orQueryObject.scopeDefinitionId}
-            </if>
-            <if test="orQueryObject.createTime != null">
-              or RES.CREATE_TIME_ = #{orQueryObject.createTime}
-            </if>
-            <if test="orQueryObject.createTimeBefore != null">
-              or RES.CREATE_TIME_ &lt; #{orQueryObject.createTimeBefore}
-            </if>
-            <if test="orQueryObject.createTimeAfter != null">
-              or RES.CREATE_TIME_ &gt; #{orQueryObject.createTimeAfter}
-            </if>
-            <if test="orQueryObject.key != null">
-              or RES.TASK_DEF_KEY_ = #{orQueryObject.key}
-            </if>
-            <if test="orQueryObject.keyLike != null">
-              or RES.TASK_DEF_KEY_ like #{orQueryObject.keyLike}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.processDefinitionId != null">
-              or RES.PROC_DEF_ID_ = #{orQueryObject.processDefinitionId}
-            </if>
-            <if test="orQueryObject.taskDefinitionId != null">
-              or RES.TASK_DEF_ID_ = #{orQueryObject.taskDefinitionId}
-            </if>
-            <if test="orQueryObject.processDefinitionKey != null">
-              or D_OR${orIndex}.KEY_ = #{orQueryObject.processDefinitionKey}
-            </if>
-            <if test="orQueryObject.processDefinitionKeyLike != null">
-              or D_OR${orIndex}.KEY_ like #{orQueryObject.processDefinitionKeyLike}${wildcardEscapeClause}
-            </if>
-             <if test="orQueryObject.processDefinitionKeyLikeIgnoreCase != null">
-              or lower(D_OR${orIndex}.KEY_) like #{orQueryObject.processDefinitionKeyLikeIgnoreCase}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.processDefinitionKeys != null &amp;&amp; orQueryObject.processDefinitionKeys.size() &gt; 0">
-              or D_OR${orIndex}.KEY_ in
-              <foreach item="item" index="index" collection="orQueryObject.processDefinitionKeys" open="(" separator="," close=")">
-                #{item}
-              </foreach>
-            </if>
-            <if test="orQueryObject.processDefinitionName != null">
-              or D_OR${orIndex}.NAME_ = #{orQueryObject.processDefinitionName}
-            </if>
-            <if test="orQueryObject.processDefinitionNameLike != null">
-              or D_OR${orIndex}.NAME_ like #{orQueryObject.processDefinitionNameLike}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.processCategoryInList != null &amp;&amp; orQueryObject.processCategoryInList.size() &gt; 0">
-              or D_OR${orIndex}.CATEGORY_ IN
-              <foreach item="processCategory" index="index" collection="orQueryObject.processCategoryInList"
-                       open="(" separator="," close=")">
-                #{processCategory}
-              </foreach>
-            </if>
-            <if test="orQueryObject.processCategoryNotInList != null &amp;&amp; orQueryObject.processCategoryNotInList.size() &gt; 0">
-              or D_OR${orIndex}.CATEGORY_ NOT IN
-              <foreach item="processCategory" index="index" collection="orQueryObject.processCategoryNotInList"
-                       open="(" separator="," close=")">
-                #{processCategory}
-              </foreach>
-            </if>
-            <if test="orQueryObject.deploymentId != null">
-              or DEPLOY_P_OR${orIndex}.DEPLOYMENT_ID_ = #{orQueryObject.deploymentId}
-            </if>
-            <if test="orQueryObject.deploymentIds != null &amp;&amp; orQueryObject.deploymentIds.size() &gt; 0">
-              or DEPLOY_P_OR${orIndex}.DEPLOYMENT_ID_ IN
-              <foreach item="deployment" index="index" collection="orQueryObject.deploymentIds" 
-                       open="(" separator="," close=")">
-                #{deployment}
-              </foreach>
-            </if>
-            <if test="orQueryObject.cmmnDeploymentId != null">
-              or DEPLOY_C_OR${orIndex}.DEPLOYMENT_ID_ = #{orQueryObject.cmmnDeploymentId}
-            </if>
-            <if test="orQueryObject.cmmnDeploymentIds != null &amp;&amp; orQueryObject.cmmnDeploymentIds.size() &gt; 0">
-              or DEPLOY_C_OR${orIndex}.DEPLOYMENT_ID_ IN
-              <foreach item="deployment" index="index" collection="orQueryObject.cmmnDeploymentIds" 
-                       open="(" separator="," close=")">
-                #{deployment}
-              </foreach>
-            </if>
-            <if test="orQueryObject.dueDate != null">
-              or RES.DUE_DATE_ = #{orQueryObject.dueDate}
-            </if>
-            <if test="orQueryObject.dueBefore != null">
-              or (RES.DUE_DATE_ &lt; #{orQueryObject.dueBefore} and RES.DUE_DATE_ is not null)
-            </if>
-            <if test="orQueryObject.dueAfter != null">
-              or (RES.DUE_DATE_ &gt; #{orQueryObject.dueAfter} and RES.DUE_DATE_ is not null)
-            </if>
-            <if test="orQueryObject.withoutDueDate">
-              or RES.DUE_DATE_ is null
-            </if>
-            <if test="orQueryObject.category != null">
-              or RES.CATEGORY_ = #{orQueryObject.category}
-            </if>
-            <if test="orQueryObject.excludeSubtasks">
-              or RES.PARENT_TASK_ID_ IS NULL
-            </if>
-            
-            <if test="!orQueryObject.bothCandidateAndAssigned &amp;&amp; (orQueryObject.candidateUser != null || orQueryObject.candidateGroups != null)">
-              or (
-                <if test="!orQueryObject.ignoreAssigneeValue">
-                    RES.ASSIGNEE_ is null and
-                </if>
-                exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TYPE_ = 'candidate' and LINK.TASK_ID_ = RES.ID_
-                    and 
-                    ( 
-                    <if test="orQueryObject.candidateUser != null">
-                      LINK.USER_ID_ = #{orQueryObject.candidateUser}          
-                    </if>
-                    <if test="orQueryObject.candidateUser != null &amp;&amp; orQueryObject.candidateGroups != null &amp;&amp; orQueryObject.candidateGroups.size() &gt; 0">
-                      or
-                    </if>
-                    <if test="orQueryObject.candidateGroups != null &amp;&amp; orQueryObject.candidateGroups.size() &gt; 0">
-                      LINK.GROUP_ID_ IN
-                      <foreach item="group" index="index" collection="orQueryObject.candidateGroups" 
-                               open="(" separator="," close=")">
-                        #{group}
-                      </foreach>
-                    </if>
-                    )
-                )
-              )
-            </if>
-            <if test="orQueryObject.involvedUser != null">
-              or (
-                exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.USER_ID_ = #{orQueryObject.involvedUser} and LINK.TASK_ID_ = RES.ID_)
-                or RES.ASSIGNEE_ = #{orQueryObject.involvedUser}
-                or RES.OWNER_ = #{orQueryObject.involvedUser}
-                )
-            </if>
-            <if test="orQueryObject.involvedGroups != null">
-              or (
-                EXISTS(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_ and LINK.GROUP_ID_ in
-                <foreach item="involvedGroup" index="index" collection="orQueryObject.involvedGroups" open="(" separator="," close=")">
-                    #{involvedGroup}
-                </foreach>
-                )
-              )
-            </if>
-            <foreach item="var" collection="orQueryObject.queryVariableValues" index="index">
-              or 
-              <trim prefix="(" prefixOverrides="AND" suffix=")">
-                <choose>
-                    <when test="var.operator.equals('EXISTS')">
-                        and EXISTS (
-                            select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
-                        <if test="!var.local">
-                            and RES.PROC_INST_ID_ = PROC_INST_ID_ and TASK_ID_ is null
-                        </if>
-                        <if test="var.local">
-                            and RES.ID_ = TASK_ID_ 
-                        </if>
-                        )
-                    </when>
-                    <when test="var.operator.equals('NOT_EXISTS')">
-                        and NOT EXISTS (
-                            select ID_ from ${prefix}ACT_RU_VARIABLE where NAME_ = #{var.name}
-                        <if test="!var.local">
-                            and RES.PROC_INST_ID_ = PROC_INST_ID_ and TASK_ID_ is null
-                        </if>
-                        <if test="var.local">
-                            and RES.ID_ = TASK_ID_ 
-                        </if>
-                        )
-                    </when>
-                    <otherwise>
-                      <choose>
-                        <when test="!var.local">
-                          <bind name="orLocal" value="''" />
-                          <!-- When process instance variable is queried for, taskId should be null -->
-                          and A_OR${orIndex}.TASK_ID_ is null
-                        </when>
-                        <otherwise>
-                          <bind name="orLocal" value="'L_'" />
-                        </otherwise>
-                      </choose>
-                      <if test="var.name != null">
-                        <!-- Match-all variable-names when name is null -->
-                        and A_${orLocal}OR${orIndex}.NAME_= #{var.name}
-                      </if>
-                      <if test="var.name == null">
-                        and A_${orLocal}OR${orIndex}.NAME_ is not null
-                      </if>
-                      <if test="!var.type.equals('null')">
-                        and A_${orLocal}OR${orIndex}.TYPE_ = #{var.type}
-                      </if>
-                      <!-- Variable value -->
-                      <if test="var.textValue != null &amp;&amp; var.longValue == null &amp;&amp; var.doubleValue == null">
-                        <choose>
-                          <when test="var.operator.equals('EQUALS_IGNORE_CASE') || var.operator.equals('NOT_EQUALS_IGNORE_CASE') || var.operator.equals('LIKE_IGNORE_CASE')">
-                            and lower(A_${orLocal}OR${orIndex}.TEXT_)
-                          </when>
-                          <otherwise>
-                            and A_${orLocal}OR${orIndex}.TEXT_
-                          </otherwise>
-                        </choose> 
-                        <choose>
-                            <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">LIKE</when>
-                            <otherwise><include refid="executionVariableOperator" /></otherwise>
-                        </choose>          
-                        #{var.textValue}
-                        <choose>
-                            <when test="var.operator.equals('LIKE') || var.operator.equals('LIKE_IGNORE_CASE')">${wildcardEscapeClause}</when>
-                        </choose>
-                      </if>
-                      <if test="var.textValue2 != null">
-                        and A_${orLocal}OR${orIndex}.TEXT2_
-                        <choose>
-                          <when test="var.operator.equals('LIKE')">LIKE</when>
-                          <otherwise><include refid="executionVariableOperator" /></otherwise>
-                        </choose>          
-                        #{var.textValue2}
-                        <choose>
-                          <when test="var.operator.equals('LIKE')">${wildcardEscapeClause}</when>
-                        </choose>
-                      </if>
-                      <if test="var.longValue != null">
-                        and A_${orLocal}OR${orIndex}.LONG_
-                        <include refid="executionVariableOperator" />
-                        #{var.longValue}
-                      </if>
-                      <if test="var.doubleValue != null">
-                        and A_${orLocal}OR${orIndex}.DOUBLE_
-                        <include refid="executionVariableOperator" />
-                        #{var.doubleValue}
-                      </if>
-                      <!-- Null variable type -->
-                      <if test="var.textValue == null &amp;&amp; var.textValue2 == null &amp;&amp; var.longValue == null &amp;&amp; var.doubleValue == null">
-                        <choose>
-                          <when test="var.operator.equals('NOT_EQUALS')">
-                            and (A_${orLocal}OR${orIndex}.TEXT_ is not null or A_${orLocal}OR${orIndex}.TEXT2_ is not null or A_${orLocal}OR${orIndex}.LONG_ is not null or A_${orLocal}OR${orIndex}.DOUBLE_ is not null or A_${orLocal}OR${orIndex}.BYTEARRAY_ID_ is not null)
-                          </when>
-                          <otherwise>
-                            and A_${orLocal}OR${orIndex}.TEXT_ is null and A_${orLocal}OR${orIndex}.TEXT2_ is null and A_${orLocal}OR${orIndex}.LONG_ is null and A_${orLocal}OR${orIndex}.DOUBLE_ is null and A_${orLocal}OR${orIndex}.BYTEARRAY_ID_ is null
-                          </otherwise>
-                        </choose>          
-                      </if>
-                    </otherwise>
-                </choose>
-              </trim>
-            </foreach>
-            <if test="orQueryObject.suspensionState != null">
-              <if test="orQueryObject.suspensionState.stateCode == 1">
-                  or RES.SUSPENSION_STATE_ = 1
-              </if>
-              <if test="orQueryObject.suspensionState.stateCode == 2">
-                  or RES.SUSPENSION_STATE_ = 2
-              </if>
-            </if>
-            <if test="orQueryObject.tenantId != null">
-              or RES.TENANT_ID_ = #{orQueryObject.tenantId}
-            </if>
-            <if test="orQueryObject.tenantIdLike != null">
-              or RES.TENANT_ID_ like #{orQueryObject.tenantIdLike}${wildcardEscapeClause}
-            </if>
-            <if test="orQueryObject.withoutTenantId">
-              or (RES.TENANT_ID_ = '' or RES.TENANT_ID_ is null)
-            </if>
-            <choose>
-              <when test="orQueryObject.bothCandidateAndAssigned">
-                <!-- if dbIdentityUsed set true in process engine configuration -->
-                <if test="orQueryObject.userIdForCandidateAndAssignee != null">
-                  <if test="orQueryObject.candidateGroups == null">
-                    or (RES.ASSIGNEE_ = #{orQueryObject.userIdForCandidateAndAssignee}
-                        or (
-                        <if test="!orQueryObject.ignoreAssigneeValue">
-                            RES.ASSIGNEE_ is null and
-                        </if>
-                        exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                        and (LINK.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee}
-                        or LINK.GROUP_ID_ IN (select g.GROUP_ID_ from ${prefix}ACT_ID_MEMBERSHIP g where g.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee} )))))
-                  </if>
-                </if>
-                <!-- if dbIdentityUsed set false in process engine configuration of using custom session factory of GroupIdentityManager -->
-                <if test="orQueryObject.candidateGroups != null">
-                  or (RES.ASSIGNEE_ = #{orQueryObject.userIdForCandidateAndAssignee}
-                  or (
-                    <if test="!orQueryObject.ignoreAssigneeValue">
-                        RES.ASSIGNEE_ is null and
-                    </if>
-                    exists(select LINK.ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where LINK.TASK_ID_ = RES.ID_
-                    and LINK.TYPE_ = 'candidate' and (LINK.USER_ID_ = #{orQueryObject.userIdForCandidateAndAssignee}
-                    <if test="orQueryObject.candidateGroups.size() &gt; 0">
-                        or LINK.GROUP_ID_ IN
-                        <foreach item="group" index="index" collection="orQueryObject.candidateGroups" open="(" separator="," close=")">
-                            #{group}
-                        </foreach>
-                    </if>
-                  ))))
-                </if>
-              </when>
-            </choose>
-          </trim>
-        </foreach>
-     </where>
-  </sql>
-  
-  <sql id="executionVariableOperator">
-    <choose>
-      <when test="var.operator.equals('EQUALS')">=</when>
-      <when test="var.operator.equals('EQUALS_IGNORE_CASE')">=</when>
-      <when test="var.operator.equals('NOT_EQUALS')">&lt;&gt;</when>
-      <when test="var.operator.equals('NOT_EQUALS_IGNORE_CASE')">&lt;&gt;</when>
-      <when test="var.operator.equals('GREATER_THAN')">&gt;</when>
-      <when test="var.operator.equals('GREATER_THAN_OR_EQUAL')">&gt;=</when>
-      <when test="var.operator.equals('LESS_THAN')">&lt;</when>
-      <when test="var.operator.equals('LESS_THAN_OR_EQUAL')">&lt;=</when>
-   </choose>
-  </sql>  
-
-  <select id="selectTaskByNativeQuery" parameterType="java.util.Map" resultMap="taskResultMap">
-  	<include refid="org.flowable.task.service.db.common.selectByNativeQuery"/>
-  </select>
-  
-  <select id="selectTaskCountByNativeQuery" parameterType="java.util.Map" resultType="long">
-     ${sql}
-  </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ext/flowable/flowable-bpmn/src/main/resources/org/apache/syncope/ext/flowable/mappings.xml b/ext/flowable/flowable-bpmn/src/main/resources/org/apache/syncope/ext/flowable/mappings.xml
deleted file mode 100644
index 1dd6888..0000000
--- a/ext/flowable/flowable-bpmn/src/main/resources/org/apache/syncope/ext/flowable/mappings.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
-
-<configuration>
-
-    <settings>
-        <setting name="lazyLoadingEnabled" value="false" />
-    </settings>
-    <typeAliases>
-        <typeAlias type="org.flowable.engine.impl.persistence.ByteArrayRefTypeHandler" alias="ByteArrayRefTypeHandler" />
-        <typeAlias type="org.flowable.variable.service.impl.persistence.VariableByteArrayRefTypeHandler" alias="VariableByteArrayRefTypeHandler" />
-        <typeAlias type="org.flowable.job.service.impl.persistence.JobByteArrayRefTypeHandler" alias="JobByteArrayRefTypeHandler" />
-    </typeAliases>
-    <typeHandlers>
-        <typeHandler handler="ByteArrayRefTypeHandler" javaType="org.flowable.engine.impl.persistence.entity.ByteArrayRef" jdbcType="VARCHAR" />
-        <typeHandler handler="VariableByteArrayRefTypeHandler" javaType="org.flowable.variable.service.impl.persistence.entity.VariableByteArrayRef" jdbcType="VARCHAR" />
-        <typeHandler handler="JobByteArrayRefTypeHandler" javaType="org.flowable.job.service.impl.persistence.entity.JobByteArrayRef" jdbcType="VARCHAR" />
-    </typeHandlers>
-
-    <mappers>
-        <mapper resource="org/flowable/db/mapping/common.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Attachment.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/ByteArray.xml" />
-        <mapper resource="org/flowable/variable/service/db/mapping/common.xml" />
-        <mapper resource="org/flowable/variable/service/db/mapping/entity/ByteArray.xml" />
-        <mapper resource="org/flowable/job/service/db/mapping/entity/ByteArray.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Comment.xml" />
-        <mapper resource="org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Deployment.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Execution.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/HistoricActivityInstance.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/HistoricDetail.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/HistoricProcessInstance.xml" />
-        <mapper resource="org/flowable/variable/service/db/mapping/entity/HistoricVariableInstance.xml" />
-        <mapper resource="org/flowable/task/service/db/mapping/entity/HistoricTaskInstance.xml" />
-        <mapper resource="org/flowable/identitylink/service/db/mapping/entity/HistoricIdentityLink.xml" />
-        <mapper resource="org/flowable/job/service/db/mapping/entity/HistoryJob.xml" />
-        <mapper resource="org/flowable/identitylink/service/db/mapping/entity/IdentityLink.xml" />
-        <mapper resource="org/flowable/job/service/db/mapping/entity/Job.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Model.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/ProcessDefinition.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/ProcessDefinitionInfo.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Property.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/Resource.xml" />
-        <mapper resource="org/flowable/job/service/db/mapping/entity/SuspendedJob.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/TableData.xml" />
-        <mapper resource="org/flowable/task/service/db/mapping/common.xml" />
-        <mapper resource="org/apache/syncope/ext/flowable/Task.xml" />
-        <mapper resource="org/flowable/job/service/db/mapping/entity/TimerJob.xml" />
-        <mapper resource="org/flowable/variable/service/db/mapping/entity/VariableInstance.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/EventSubscription.xml" />
-        <mapper resource="org/flowable/db/mapping/entity/EventLogEntry.xml" />
-    </mappers>
-
-</configuration>
\ No newline at end of file
diff --git a/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml b/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
index 4f34237..aebf495 100644
--- a/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
+++ b/ext/flowable/flowable-bpmn/src/main/resources/workflowFlowableContext.xml
@@ -40,7 +40,7 @@ under the License.
 
   <bean id="syncopeFormHandlerHelper" class="org.apache.syncope.core.flowable.support.SyncopeFormHandlerHelper"/>
 
-  <bean class="org.apache.syncope.core.flowable.support.DomainProcessEngineConfiguration" scope="prototype">
+  <bean class="org.flowable.spring.SpringProcessEngineConfiguration" scope="prototype">
     <property name="databaseSchemaUpdate" value="true"/>
 
     <property name="jpaHandleTransaction" value="true"/>
diff --git a/pom.xml b/pom.xml
index 5d59e65..7d673dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -408,7 +408,7 @@ under the License.
 
     <groovy.version>3.0.0-alpha-4</groovy.version>
 
-    <flowable.version>6.4.0</flowable.version>
+    <flowable.version>6.4.1</flowable.version>
 
     <camel.version>2.23.0</camel.version>	
 
@@ -886,6 +886,11 @@ under the License.
 
       <dependency>
         <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
         <artifactId>spring-context</artifactId>
         <version>${spring.version}</version>
       </dependency>
@@ -1161,6 +1166,10 @@ under the License.
         <version>${flowable.version}</version>
         <exclusions>
           <exclusion>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>commons-dbcp</groupId>
             <artifactId>commons-dbcp</artifactId>
           </exclusion>


Mime
View raw message