TSK-304 Use Ids for identification of workbaskets and classifications

lib/taskana-cdi/src/test/java/pro/taskana/TaskanaRestTest.java

@@ -40,9 +40,8 @@ public class TaskanaRestTest {
     public Response startTask() throws NotAuthorizedException, WorkbasketNotFoundException,
         ClassificationNotFoundException, ClassificationAlreadyExistException, InvalidWorkbasketException,
         TaskAlreadyExistException, InvalidArgumentException {
-        Workbasket workbasket = taskanaEjb.getWorkbasketService().newWorkbasket("key");
+        Workbasket workbasket = taskanaEjb.getWorkbasketService().newWorkbasket("key", "cdiDomain");
         workbasket.setName("wb");
-        workbasket.setDomain("cdiDomain");
         workbasket.setType(WorkbasketType.PERSONAL);
         taskanaEjb.getWorkbasketService().createWorkbasket(workbasket);
         Classification classification = classificationService.newClassification("cdiDomain", "TEST", "t1");

lib/taskana-core/src/main/java/pro/taskana/KeyDomain.java

@@ -0,0 +1,45 @@
+package pro.taskana;
+
+/**
+ * This class encapsulates key - domain pairs for identification of workbaskets.
+ *
+ * @author bbr
+ */
+public class KeyDomain {
+
+    private String key;
+    private String domain;
+
+    public KeyDomain(String key, String domain) {
+        this.key = key;
+        this.domain = domain;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("KeyDomain [key=");
+        builder.append(key);
+        builder.append(", domain=");
+        builder.append(domain);
+        builder.append("]");
+        return builder.toString();
+    }
+
+}

lib/taskana-core/src/main/java/pro/taskana/TaskQuery.java

@@ -110,42 +110,20 @@ public interface TaskQuery extends BaseQuery<TaskSummary> {
     /**
      * Add your workbasket key to the query.
      *
-     * @param workbasketKeys
+     * @param workbasketIdentifiers
-     *            the workbasket keys as String
+     *            the key - domain combinations that identify workbaskets
      * @return the query
      */
-    TaskQuery workbasketKeyIn(String... workbasketKeys);
+    TaskQuery workbasketKeyDomainIn(KeyDomain... workbasketIdentifiers);
 
     /**
-     * Add your workbasketKey for pattern matching to your query. It will be compared in SQL with the LIKE operator. You
+     * Add your workbasket key to the query.
-     * may use a wildcard like % to specify the pattern. If you specify multiple arguments they are combined with the OR
-     * keyword.
      *
-     * @param workbasketKeys
+     * @param workbasketIds
-     *            the workbasket keys
+     *            the ids of workbaskets
      * @return the query
      */
-    TaskQuery workbasketKeyLike(String... workbasketKeys);
+    TaskQuery workbasketIdIn(String... workbasketIds);
-
-    /**
-     * Add your domain to the query.
-     *
-     * @param domains
-     *            the domain as String
-     * @return the query
-     */
-    TaskQuery domainIn(String... domains);
-
-    /**
-     * Add your domains for pattern matching to your query. It will be compared in SQL with the LIKE operator. You may
-     * use a wildcard like % to specify the pattern. If you specify multiple arguments they are combined with the OR
-     * keyword.
-     *
-     * @param domains
-     *            the domains of the searched-for workbaskets
-     * @return the query
-     */
-    TaskQuery domainLike(String... domains);
 
     /**
      * Add the owners to your query.

lib/taskana-core/src/main/java/pro/taskana/TaskService.java

@@ -163,8 +163,8 @@ public interface TaskService {
      *
      * @param taskId
      *            The id of the {@link Task} to be transferred
-     * @param workbasketKey
+     * @param workbasketId
-     *            The key of the target work basket
+     *            The Id of the target work basket
      * @return the transferred task
      * @throws TaskNotFoundException
      *             Thrown if the {@link Task} with taskId was not found.
@@ -175,7 +175,29 @@ public interface TaskService {
      * @throws InvalidWorkbasketException
      *             Thrown if either the source or the target workbasket has a missing required property
      */
-    Task transfer(String taskId, String workbasketKey)
+    Task transfer(String taskId, String workbasketId)
+        throws TaskNotFoundException, WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException;
+
+    /**
+     * Transfer a task to another work basket. The transfer sets the transferred flag and resets the read flag.
+     *
+     * @param taskId
+     *            The id of the {@link Task} to be transferred
+     * @param workbasketKey
+     *            The key of the target work basket
+     * @param domain
+     *            The domain of the target work basket
+     * @return the transferred task
+     * @throws TaskNotFoundException
+     *             Thrown if the {@link Task} with taskId was not found.
+     * @throws WorkbasketNotFoundException
+     *             Thrown if the target work basket was not found.
+     * @throws NotAuthorizedException
+     *             Thrown if the current user is not authorized to transfer this {@link Task} to the target work basket
+     * @throws InvalidWorkbasketException
+     *             Thrown if either the source or the target workbasket has a missing required property
+     */
+    Task transfer(String taskId, String workbasketKey, String domain)
         throws TaskNotFoundException, WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException;
 
     /**
@@ -201,11 +223,22 @@ public interface TaskService {
     /**
      * Returns a not persisted instance of {@link Task}.
      *
-     * @param workbasketKey
+     * @param workbasketId
-     *            the key of the workbasket to which the task belongs
+     *            the id of the workbasket to which the task belongs
      * @return an empty new Task
      */
-    Task newTask(String workbasketKey);
+    Task newTask(String workbasketId);
+
+    /**
+     * Returns a not persisted instance of {@link Task}.
+     *
+     * @param workbasketKey
+     *            the key of the workbasket to which the task belongs
+     * @param domain
+     *            the domain of the workbasket to which the task belongs
+     * @return an empty new Task
+     */
+    Task newTask(String workbasketKey, String domain);
 
     /**
      * Returns a not persisted instance of {@link Attachment}.
@@ -245,8 +278,8 @@ public interface TaskService {
      * Transfers a list of tasks to an other workbasket. Exceptions will be thrown if the caller got no permissions on
      * the target or it doesn´t exist. Other Exceptions will be stored and returned in the end.
      *
-     * @param destinationWorkbasketKey
+     * @param destinationWorkbasketId
-     *            target workbasket key
+     *            target workbasket id
      * @param taskIds
      *            source task which will be moved
      * @return Bulkresult with ID and Error in it for failed transactions.
@@ -257,7 +290,29 @@ public interface TaskService {
      * @throws WorkbasketNotFoundException
      *             if the target WB can´t be found.
      */
-    BulkOperationResults<String, TaskanaException> transferTasks(String destinationWorkbasketKey, List<String> taskIds)
+    BulkOperationResults<String, TaskanaException> transferTasks(String destinationWorkbasketId, List<String> taskIds)
+        throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException;
+
+    /**
+     * Transfers a list of tasks to an other workbasket. Exceptions will be thrown if the caller got no permissions on
+     * the target or it doesn´t exist. Other Exceptions will be stored and returned in the end.
+     *
+     * @param destinationWorkbasketKey
+     *            target workbasket key
+     * @param destinationWorkbasketDomain
+     *            target workbasket domain
+     * @param taskIds
+     *            source task which will be moved
+     * @return Bulkresult with ID and Error in it for failed transactions.
+     * @throws NotAuthorizedException
+     *             if the caller hasn´t permissions on tarket WB.
+     * @throws InvalidArgumentException
+     *             if the method paramesters are EMPTY or NULL.
+     * @throws WorkbasketNotFoundException
+     *             if the target WB can´t be found.
+     */
+    BulkOperationResults<String, TaskanaException> transferTasks(String destinationWorkbasketKey,
+        String destinationWorkbasketDomain, List<String> taskIds)
         throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException;
 
     /**

lib/taskana-core/src/main/java/pro/taskana/Workbasket.java

@@ -37,14 +37,6 @@ public interface Workbasket {
      */
     String getDomain();
 
-    /**
-     * Set the domain of the workbasket.
-     *
-     * @param domain
-     *            the domain of the workbasket
-     */
-    void setDomain(String domain);
-
     /**
      * Returns the type of the workbasket.
      *

lib/taskana-core/src/main/java/pro/taskana/WorkbasketAccessItem.java

@@ -15,11 +15,11 @@ public interface WorkbasketAccessItem {
     String getId();
 
     /**
-     * Returns the key of the referenced workbasket.
+     * Returns the Id of the referenced workbasket.
      *
-     * @return the workbasket key
+     * @return the workbasket Id
      */
-    String getWorkbasketKey();
+    String getWorkbasketId();
 
     /**
      * Returns the group id or user id for which this WorkbasketAccessItem controls access permissions.

lib/taskana-core/src/main/java/pro/taskana/WorkbasketAccessItemQuery.java

@@ -6,13 +6,13 @@ package pro.taskana;
 public interface WorkbasketAccessItemQuery extends BaseQuery<WorkbasketAccessItem> {
 
     /**
-     * Add your workbasket key to your query.
+     * Add your workbasket id to your query.
      *
-     * @param workbasketKey
+     * @param workbasketId
-     *            the workbasket key
+     *            the workbasket Id
      * @return the query
      */
-    WorkbasketAccessItemQuery workbasketKeyIn(String... workbasketKey);
+    WorkbasketAccessItemQuery workbasketIdIn(String... workbasketId);
 
     /**
      * Add your accessIds to your query.
@@ -24,14 +24,14 @@ public interface WorkbasketAccessItemQuery extends BaseQuery<WorkbasketAccessIte
     WorkbasketAccessItemQuery accessIdIn(String... accessId);
 
     /**
-     * Sort the query result by workbasket key.
+     * Sort the query result by workbasket id.
      *
      * @param sortDirection
      *            Determines whether the result is sorted in ascending or descending order. If sortDirection is null,
      *            the result is sorted in ascending order
      * @return the query
      */
-    WorkbasketAccessItemQuery orderByWorkbasketKey(SortDirection sortDirection);
+    WorkbasketAccessItemQuery orderByWorkbasketId(SortDirection sortDirection);
 
     /**
      * Sort the query result by access Id.

lib/taskana-core/src/main/java/pro/taskana/WorkbasketService.java

@@ -33,13 +33,15 @@ public interface WorkbasketService {
      *
      * @param workbasketKey
      *            the Key of the Workbasket requested
+     * @param domain
+     *            the domain of the workbasket
      * @return the requested Workbasket
      * @throws WorkbasketNotFoundException
      *             If the Workbasket with workbasketId is not found
      * @throws NotAuthorizedException
      *             If the current user or group does not have the permissions for interactions.
      */
-    Workbasket getWorkbasketByKey(String workbasketKey)
+    Workbasket getWorkbasket(String workbasketKey, String domain)
         throws WorkbasketNotFoundException, NotAuthorizedException;
 
     /**
@@ -80,13 +82,13 @@ public interface WorkbasketService {
     /**
      * Returns a new WorkbasketAccessItem which is not persisted.
      *
-     * @param workbasketKey
+     * @param workbasketId
-     *            the workbasket key used to identify the referenced workbasket
+     *            the workbasket id used to identify the referenced workbasket
      * @param accessId
      *            the group id or user id for which access is controlled
      * @return new WorkbasketAccessItem
      */
-    WorkbasketAccessItem newWorkbasketAccessItem(String workbasketKey, String accessId);
+    WorkbasketAccessItem newWorkbasketAccessItem(String workbasketId, String accessId);
 
     /**
      * Create and persist a new Workbasket Authorization with a Workbasket and a AccessId.
@@ -120,23 +122,39 @@ public interface WorkbasketService {
     /**
      * This method checks the authorization with the saved one for the actual User.
      *
-     * @param workbasketKey
+     * @param workbasketId
-     *            the key of the workbasket we want to access
+     *            the id of the workbasket we want to access
      * @param authorization
      *            the needed Authorization
      * @throws NotAuthorizedException
      *             if the current user has not the requested authorization for the specified workbasket
      */
-    void checkAuthorization(String workbasketKey, WorkbasketAuthorization authorization) throws NotAuthorizedException;
+    void checkAuthorization(String workbasketId, WorkbasketAuthorization authorization)
+        throws NotAuthorizedException;
+
+    /**
+     * This method checks the authorization with the saved one for the actual User.
+     *
+     * @param workbasketKey
+     *            the key of the workbasket we want to access
+     * @param domain
+     *            the domain of the workbasket we want to access
+     * @param authorization
+     *            the needed Authorization
+     * @throws NotAuthorizedException
+     *             if the current user has not the requested authorization for the specified workbasket
+     */
+    void checkAuthorization(String workbasketKey, String domain, WorkbasketAuthorization authorization)
+        throws NotAuthorizedException;
 
     /**
      * Get all authorizations for a Workbasket.
      *
-     * @param workbasketKey
+     * @param workbasketId
-     *            the key of the Workbasket
+     *            the id of the Workbasket
      * @return List of WorkbasketAccessItems for the Workbasket with workbasketKey
      */
-    List<WorkbasketAccessItem> getWorkbasketAuthorizations(String workbasketKey);
+    List<WorkbasketAccessItem> getWorkbasketAuthorizations(String workbasketId);
 
     /**
      * This method returns the workbaskets for which the current user has all permissions specified in the permissions
@@ -167,18 +185,20 @@ public interface WorkbasketService {
      *
      * @param key
      *            the workbasket key used to identify the workbasket
+     * @param domain
+     *            the domain of the new workbasket
      * @return new Workbasket
      */
-    Workbasket newWorkbasket(String key);
+    Workbasket newWorkbasket(String key, String domain);
 
     /**
      * Returns a set with all permissions of the current user at this workbasket.
      *
-     * @param workbasketKey
+     * @param workbasketId
-     *            the key of the referenced workbasket
+     *            the id of the referenced workbasket
      * @return a Set with all permissions
      */
-    List<WorkbasketAuthorization> getPermissionsForWorkbasket(String workbasketKey);
+    List<WorkbasketAuthorization> getPermissionsForWorkbasket(String workbasketId);
 
     /**
      * Returns the distribution targets for a given workbasket.
@@ -194,6 +214,22 @@ public interface WorkbasketService {
     List<WorkbasketSummary> getDistributionTargets(String workbasketId)
         throws NotAuthorizedException, WorkbasketNotFoundException;
 
+    /**
+     * Returns the distribution targets for a given workbasket.
+     *
+     * @param workbasketKey
+     *            the key of the referenced workbasket
+     * @param domain
+     *            the domain of the referenced workbasket
+     * @return the distribution targets of the specified workbasket
+     * @throws NotAuthorizedException
+     *             if the current user has no read permission for the specified workbasket
+     * @throws WorkbasketNotFoundException
+     *             if the workbasket doesn't exist
+     */
+    List<WorkbasketSummary> getDistributionTargets(String workbasketKey, String domain)
+        throws NotAuthorizedException, WorkbasketNotFoundException;
+
     /**
      * Set the distribution targets for a workbasket.
      *
@@ -270,4 +306,20 @@ public interface WorkbasketService {
     List<WorkbasketSummary> getDistributionSources(String workbasketId)
         throws NotAuthorizedException, WorkbasketNotFoundException;
 
+    /**
+     * Returns the distribution sources for a given workbasket.
+     *
+     * @param workbasketKey
+     *            the key of the referenced workbasket
+     * @param domain
+     *            the domain of the referenced workbasket
+     * @return the workbaskets that are distribution sources of the specified workbasket.
+     * @throws NotAuthorizedException
+     *             if the current user has no read permission for the specified workbasket
+     * @throws WorkbasketNotFoundException
+     *             if the workbasket doesn't exist
+     */
+    List<WorkbasketSummary> getDistributionSources(String workbasketKey, String domain)
+        throws NotAuthorizedException, WorkbasketNotFoundException;
+
 }

lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java

@@ -270,11 +270,11 @@ public class ClassificationServiceImpl implements ClassificationService {
             try {
                 List<TaskSummary> classificationTasks = taskService.createTaskQuery()
                     .classificationKeyIn(classificationKey)
-                    .domainIn(domain)
                     .list();
-                if (!classificationTasks.isEmpty()) {
+                if (classificationTasks.stream()
-                    throw new ClassificationInUseException("There are " + classificationTasks.size()
+                    .anyMatch(t -> domain.equals(t.getClassificationSummary().getDomain()))) {
-                        + " Tasks which belong to this classification or a child classification. Please complete them and try again.");
+                    throw new ClassificationInUseException(
+                        "There are Tasks that belong to this classification or a child classification. Please complete them and try again.");
                 }
             } catch (NotAuthorizedToQueryWorkbasketException e) {
                 LOGGER.error(

lib/taskana-core/src/main/java/pro/taskana/impl/MinimalTaskSummary.java

@@ -37,4 +37,17 @@ public class MinimalTaskSummary {
         this.taskState = taskState;
     }
 
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("MinimalTaskSummary [taskId=");
+        builder.append(taskId);
+        builder.append(", workbasketKey=");
+        builder.append(workbasketKey);
+        builder.append(", taskState=");
+        builder.append(taskState);
+        builder.append("]");
+        return builder.toString();
+    }
+
 }

lib/taskana-core/src/main/java/pro/taskana/impl/TaskImpl.java

@@ -31,12 +31,10 @@ public class TaskImpl implements Task {
     private String note;
     private int priority;
     private TaskState state;
-    private String classificationKey;
+    // private String classificationKey;
-    private String classificationCategory;
+    // private String classificationCategory;
     private ClassificationSummary classificationSummary;
     private WorkbasketSummary workbasketSummary;
-    private String workbasketKey;
-    private String domain;
     private String businessProcessId;
     private String parentBusinessProcessId;
     private String owner;
@@ -179,25 +177,35 @@ public class TaskImpl implements Task {
 
     @Override
     public void setClassificationKey(String classificationKey) {
-        this.classificationKey = classificationKey;
+        if (this.classificationSummary == null) {
+            this.classificationSummary = new ClassificationSummaryImpl();
+        }
+
+        ((ClassificationSummaryImpl) this.classificationSummary).setKey(classificationKey);
     }
 
     public void setClassificationCategory(String classificationCategory) {
-        this.classificationCategory = classificationCategory;
+        if (this.classificationSummary == null) {
+            this.classificationSummary = new ClassificationSummaryImpl();
+        }
+        ((ClassificationSummaryImpl) this.classificationSummary).setCategory(classificationCategory);
     }
 
     @Override
     public String getClassificationCategory() {
-        return this.classificationCategory;
+        return this.classificationSummary == null ? null : this.classificationSummary.getCategory();
     }
 
     @Override
     public String getWorkbasketKey() {
-        return workbasketKey;
+        return workbasketSummary == null ? null : workbasketSummary.getKey();
     }
 
     public void setWorkbasketKey(String workbasketKey) {
-        this.workbasketKey = workbasketKey;
+        if (workbasketSummary == null) {
+            workbasketSummary = new WorkbasketSummaryImpl();
+        }
+        ((WorkbasketSummaryImpl) this.workbasketSummary).setKey(workbasketKey);
     }
 
     @Override
@@ -211,11 +219,14 @@ public class TaskImpl implements Task {
 
     @Override
     public String getDomain() {
-        return domain;
+        return workbasketSummary == null ? null : workbasketSummary.getDomain();
     }
 
     public void setDomain(String domain) {
-        this.domain = domain;
+        if (workbasketSummary == null) {
+            workbasketSummary = new WorkbasketSummaryImpl();
+        }
+        ((WorkbasketSummaryImpl) this.workbasketSummary).setDomain(domain);
     }
 
     @Override
@@ -419,10 +430,6 @@ public class TaskImpl implements Task {
         taskSummary.setClaimed(claimed);
         if (classificationSummary != null) {
             taskSummary.setClassificationSummary(classificationSummary);
-        } else {
-            ClassificationSummaryImpl aClassificationSummary = new ClassificationSummaryImpl();
-            aClassificationSummary.setKey(classificationKey);
-            taskSummary.setClassificationSummary(aClassificationSummary);
         }
         taskSummary.setCompleted(completed);
         taskSummary.setCreated(created);
@@ -436,7 +443,6 @@ public class TaskImpl implements Task {
         taskSummary.setCustom8(custom8);
         taskSummary.setCustom9(custom9);
         taskSummary.setCustom10(custom10);
-        taskSummary.setDomain(domain);
         taskSummary.setDue(due);
         taskSummary.setTaskId(id);
         taskSummary.setModified(modified);
@@ -464,7 +470,7 @@ public class TaskImpl implements Task {
     }
 
     public String getClassificationKey() {
-        return classificationKey;
+        return classificationSummary == null ? null : classificationSummary.getKey();
     }
 
     public void setClassificationSummary(ClassificationSummary classificationSummary) {
@@ -475,6 +481,10 @@ public class TaskImpl implements Task {
         return (ClassificationSummaryImpl) classificationSummary;
     }
 
+    public WorkbasketSummaryImpl getWorkbasketSummaryImpl() {
+        return (WorkbasketSummaryImpl) workbasketSummary;
+    }
+
     public void setClassificationSummaryImpl(ClassificationSummaryImpl classificationSummary) {
         this.classificationSummary = classificationSummary;
     }
@@ -522,16 +532,10 @@ public class TaskImpl implements Task {
         builder.append(priority);
         builder.append(", state=");
         builder.append(state);
-        builder.append(", classificationKey=");
-        builder.append(classificationKey);
         builder.append(", classificationSummary=");
         builder.append(classificationSummary);
         builder.append(", workbasketSummary=");
         builder.append(workbasketSummary);
-        builder.append(", workbasketKey=");
-        builder.append(workbasketKey);
-        builder.append(", domain=");
-        builder.append(domain);
         builder.append(", businessProcessId=");
         builder.append(businessProcessId);
         builder.append(", parentBusinessProcessId=");

lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java

@@ -9,6 +9,7 @@ import org.apache.ibatis.session.RowBounds;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import pro.taskana.KeyDomain;
 import pro.taskana.ObjectReferenceQuery;
 import pro.taskana.TaskQuery;
 import pro.taskana.TaskSummary;
@@ -35,15 +36,13 @@ public class TaskQueryImpl implements TaskQuery {
     private String[] description;
     private String[] note;
     private int[] priority;
-    private TaskState[] states;
+    private KeyDomain[] workbasketKeyDomainIn;
+    private String[] workbasketIdIn;
+    private TaskState[] stateIn;
     private String[] classificationKeyIn;
     private String[] classificationKeyLike;
     private String[] classificationCategoryIn;
     private String[] classificationCategoryLike;
-    private String[] workbasketKeyIn;
-    private String[] workbasketKeyLike;
-    private String[] domainIn;
-    private String[] domainLike;
     private String[] ownerIn;
     private String[] ownerLike;
     private Boolean isRead;
@@ -200,8 +199,14 @@ public class TaskQueryImpl implements TaskQuery {
     }
 
     @Override
-    public TaskQuery stateIn(TaskState... states) {
+    public TaskQuery workbasketKeyDomainIn(KeyDomain... workbasketIdentifiers) {
-        this.states = states;
+        this.workbasketKeyDomainIn = workbasketIdentifiers;
+        return this;
+    }
+
+    @Override
+    public TaskQuery workbasketIdIn(String... workbasketIds) {
+        this.workbasketIdIn = workbasketIds;
         return this;
     }
 
@@ -229,30 +234,6 @@ public class TaskQueryImpl implements TaskQuery {
         return this;
     }
 
-    @Override
-    public TaskQuery workbasketKeyIn(String... workbasketKeys) {
-        this.workbasketKeyIn = workbasketKeys;
-        return this;
-    }
-
-    @Override
-    public TaskQuery workbasketKeyLike(String... workbasketKeys) {
-        this.workbasketKeyLike = toUpperCopy(workbasketKeys);
-        return this;
-    }
-
-    @Override
-    public TaskQuery domainIn(String... domain) {
-        this.domainIn = domain;
-        return this;
-    }
-
-    @Override
-    public TaskQuery domainLike(String... domains) {
-        this.domainLike = toUpperCopy(domains);
-        return this;
-    }
-
     @Override
     public TaskQuery ownerIn(String... owners) {
         this.ownerIn = owners;
@@ -367,6 +348,12 @@ public class TaskQueryImpl implements TaskQuery {
         return this;
     }
 
+    @Override
+    public TaskQuery stateIn(TaskState... states) {
+        this.stateIn = states;
+        return this;
+    }
+
     @Override
     public TaskQuery custom1In(String... strings) {
         this.custom1In = strings;
@@ -653,7 +640,7 @@ public class TaskQueryImpl implements TaskQuery {
         try {
             LOGGER.debug("entry to list(), this = {}", this);
             taskanaEngineImpl.openConnection();
-            checkOpenPermissionForWorkbasketKey();
+            checkOpenPermissionForSpecifiedWorkbaskets();
             List<TaskSummaryImpl> tasks = new ArrayList<>();
             tasks = taskanaEngineImpl.getSqlSession().selectList(LINK_TO_MAPPER, this);
             result = taskService.augmentTaskSummariesByContainedSummaries(tasks);
@@ -676,7 +663,7 @@ public class TaskQueryImpl implements TaskQuery {
         List<TaskSummary> result = new ArrayList<>();
         try {
             taskanaEngineImpl.openConnection();
-            checkOpenPermissionForWorkbasketKey();
+            checkOpenPermissionForSpecifiedWorkbaskets();
             RowBounds rowBounds = new RowBounds(offset, limit);
             List<TaskSummaryImpl> tasks = taskanaEngineImpl.getSqlSession().selectList(LINK_TO_MAPPER, this, rowBounds);
             result = taskService.augmentTaskSummariesByContainedSummaries(tasks);
@@ -707,7 +694,7 @@ public class TaskQueryImpl implements TaskQuery {
         TaskSummary result = null;
         try {
             taskanaEngineImpl.openConnection();
-            checkOpenPermissionForWorkbasketKey();
+            checkOpenPermissionForSpecifiedWorkbaskets();
             TaskSummaryImpl taskSummaryImpl = taskanaEngineImpl.getSqlSession().selectOne(LINK_TO_MAPPER, this);
             if (taskSummaryImpl == null) {
                 return null;
@@ -732,7 +719,7 @@ public class TaskQueryImpl implements TaskQuery {
         Long rowCount = null;
         try {
             taskanaEngineImpl.openConnection();
-            checkOpenPermissionForWorkbasketKey();
+            checkOpenPermissionForSpecifiedWorkbaskets();
             rowCount = taskanaEngineImpl.getSqlSession().selectOne(LINK_TO_COUNTER, this);
             return (rowCount == null) ? 0L : rowCount;
         } finally {
@@ -741,11 +728,18 @@ public class TaskQueryImpl implements TaskQuery {
         }
     }
 
-    private void checkOpenPermissionForWorkbasketKey() {
+    private void checkOpenPermissionForSpecifiedWorkbaskets() {
         try {
-            if (this.workbasketKeyIn != null && this.workbasketKeyIn.length > 0) {
+            if (this.workbasketIdIn != null && this.workbasketIdIn.length > 0) {
-                for (String wbKey : this.workbasketKeyIn) {
+                for (String workbasketId : workbasketIdIn) {
-                    taskanaEngineImpl.getWorkbasketService().checkAuthorization(wbKey, WorkbasketAuthorization.OPEN);
+                    taskanaEngineImpl.getWorkbasketService().checkAuthorization(workbasketId,
+                        WorkbasketAuthorization.OPEN);
+                }
+            }
+            if (workbasketKeyDomainIn != null && workbasketKeyDomainIn.length > 0) {
+                for (KeyDomain keyDomain : workbasketKeyDomainIn) {
+                    taskanaEngineImpl.getWorkbasketService().checkAuthorization(keyDomain.getKey(),
+                        keyDomain.getDomain(), WorkbasketAuthorization.OPEN);
                 }
             }
         } catch (NotAuthorizedException e) {
@@ -773,8 +767,8 @@ public class TaskQueryImpl implements TaskQuery {
         return priority;
     }
 
-    public TaskState[] getStates() {
+    public TaskState[] getStateIn() {
-        return states;
+        return stateIn;
     }
 
     public String[] getOwnerIn() {
@@ -981,20 +975,12 @@ public class TaskQueryImpl implements TaskQuery {
         return classificationKeyLike;
     }
 
-    public String[] getWorkbasketKeyIn() {
+    public KeyDomain[] getWorkbasketKeyDomainIn() {
-        return workbasketKeyIn;
+        return workbasketKeyDomainIn;
     }
 
-    public String[] getWorkbasketKeyLike() {
+    public String[] getWorkbasketIdIn() {
-        return workbasketKeyLike;
+        return workbasketIdIn;
-    }
-
-    public String[] getDomainIn() {
-        return domainIn;
-    }
-
-    public String[] getDomainLike() {
-        return domainLike;
     }
 
     private TaskQuery addOrderCriteria(String columnName, SortDirection sortDirection) {
@@ -1029,8 +1015,12 @@ public class TaskQueryImpl implements TaskQuery {
         builder.append(Arrays.toString(note));
         builder.append(", priority=");
         builder.append(Arrays.toString(priority));
-        builder.append(", states=");
+        builder.append(", workbasketKeyDomainIn=");
-        builder.append(Arrays.toString(states));
+        builder.append(Arrays.toString(workbasketKeyDomainIn));
+        builder.append(", workbasketIdIn=");
+        builder.append(Arrays.toString(workbasketIdIn));
+        builder.append(", stateIn=");
+        builder.append(Arrays.toString(stateIn));
         builder.append(", classificationKeyIn=");
         builder.append(Arrays.toString(classificationKeyIn));
         builder.append(", classificationKeyLike=");
@@ -1039,14 +1029,6 @@ public class TaskQueryImpl implements TaskQuery {
         builder.append(Arrays.toString(classificationCategoryIn));
         builder.append(", classificationCategoryLike=");
         builder.append(Arrays.toString(classificationCategoryLike));
-        builder.append(", workbasketKeyIn=");
-        builder.append(Arrays.toString(workbasketKeyIn));
-        builder.append(", workbasketKeyLike=");
-        builder.append(Arrays.toString(workbasketKeyLike));
-        builder.append(", domainIn=");
-        builder.append(Arrays.toString(domainIn));
-        builder.append(", domainLike=");
-        builder.append(Arrays.toString(domainLike));
         builder.append(", ownerIn=");
         builder.append(Arrays.toString(ownerIn));
         builder.append(", ownerLike=");

lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java

@@ -285,8 +285,18 @@ public class TaskServiceImpl implements TaskService {
                 throw new TaskAlreadyExistException(taskToCreate.getId());
             } else {
                 LOGGER.debug("Task {} cannot be be found, so it can be created.", taskToCreate.getId());
-                Workbasket workbasket = workbasketService.getWorkbasketByKey(task.getWorkbasketKey());
+                Workbasket workbasket;
-                workbasketService.checkAuthorization(task.getWorkbasketKey(),
+
+                if (taskToCreate.getWorkbasketSummary().getId() != null) {
+                    workbasket = workbasketService.getWorkbasket(taskToCreate.getWorkbasketSummary().getId());
+                } else if (taskToCreate.getWorkbasketKey() != null) {
+                    workbasket = workbasketService.getWorkbasket(task.getWorkbasketKey(), task.getDomain());
+                } else {
+                    throw new InvalidArgumentException("Cannot create a task outside a workbasket");
+                }
+
+                task.setWorkbasketSummary(workbasket.asSummary());
+                workbasketService.checkAuthorization(task.getWorkbasketSummary().getId(),
                     WorkbasketAuthorization.APPEND);
                 String classificationKey = task.getClassificationKey();
                 if (classificationKey == null || classificationKey.length() == 0) {
@@ -294,10 +304,7 @@ public class TaskServiceImpl implements TaskService {
                 }
                 Classification classification = this.classificationService.getClassification(classificationKey,
                     workbasket.getDomain());
-                task.setClassificationKey(classificationKey);
-                task.setClassificationCategory(classification.getCategory());
                 task.setClassificationSummary(classification.asSummary());
-                task.setWorkbasketSummary(workbasket.asSummary());
                 validateObjectReference(task.getPrimaryObjRef(), "primary ObjectReference", "Task");
                 validateAttachments(task);
                 task.setDomain(workbasket.getDomain());
@@ -355,34 +362,33 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Task transfer(String taskId, String destinationWorkbasketKey)
+    public Task transfer(String taskId, String destinationWorkbasketId)
         throws TaskNotFoundException, WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException {
-        LOGGER.debug("entry to transfer(taskId = {}, destinationWorkbasketKey = {})", taskId, destinationWorkbasketKey);
+        LOGGER.debug("entry to transfer(taskId = {}, destinationWorkbasketId = {})", taskId, destinationWorkbasketId);
         TaskImpl task = null;
         try {
             taskanaEngineImpl.openConnection();
             task = (TaskImpl) getTask(taskId);
 
             // transfer requires TRANSFER in source and APPEND on destination workbasket
-            workbasketService.checkAuthorization(destinationWorkbasketKey, WorkbasketAuthorization.APPEND);
+            workbasketService.checkAuthorization(destinationWorkbasketId, WorkbasketAuthorization.APPEND);
-            workbasketService.checkAuthorization(task.getWorkbasketKey(), WorkbasketAuthorization.TRANSFER);
+            workbasketService.checkAuthorization(task.getWorkbasketSummary().getId(),
+                WorkbasketAuthorization.TRANSFER);
 
-            Workbasket destinationWorkbasket = workbasketService.getWorkbasketByKey(destinationWorkbasketKey);
+            Workbasket destinationWorkbasket = workbasketService.getWorkbasket(destinationWorkbasketId);
 
             // reset read flag and set transferred flag
             task.setRead(false);
             task.setTransferred(true);
 
             // transfer task from source to destination workbasket
-            task.setWorkbasketKey(destinationWorkbasketKey);
             task.setWorkbasketSummary(destinationWorkbasket.asSummary());
-            task.setDomain(destinationWorkbasket.getDomain());
             task.setModified(Instant.now());
             task.setState(TaskState.READY);
             task.setOwner(null);
             taskMapper.update(task);
             LOGGER.debug("Method transfer() transferred Task '{}' to destination workbasket {}", taskId,
-                destinationWorkbasketKey);
+                destinationWorkbasketId);
             return task;
         } finally {
             taskanaEngineImpl.returnConnection();
@@ -391,83 +397,148 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public BulkOperationResults<String, TaskanaException> transferTasks(String destinationWorkbasketKey,
+    public Task transfer(String taskId, String destinationWorkbasketKey, String domain)
+        throws TaskNotFoundException, WorkbasketNotFoundException, NotAuthorizedException, InvalidWorkbasketException {
+        LOGGER.debug("entry to transfer(taskId = {}, destinationWorkbasketKey = {}, domain = {})", taskId,
+            destinationWorkbasketKey, domain);
+        TaskImpl task = null;
+        try {
+            taskanaEngineImpl.openConnection();
+            task = (TaskImpl) getTask(taskId);
+
+            // transfer requires TRANSFER in source and APPEND on destination workbasket
+            workbasketService.checkAuthorization(destinationWorkbasketKey, domain, WorkbasketAuthorization.APPEND);
+            workbasketService.checkAuthorization(task.getWorkbasketSummary().getId(),
+                WorkbasketAuthorization.TRANSFER);
+
+            Workbasket destinationWorkbasket = workbasketService.getWorkbasket(destinationWorkbasketKey, domain);
+
+            // reset read flag and set transferred flag
+            task.setRead(false);
+            task.setTransferred(true);
+
+            // transfer task from source to destination workbasket
+            task.setWorkbasketSummary(destinationWorkbasket.asSummary());
+            task.setModified(Instant.now());
+            task.setState(TaskState.READY);
+            task.setOwner(null);
+            taskMapper.update(task);
+            LOGGER.debug("Method transfer() transferred Task '{}' to destination workbasket {}", taskId,
+                destinationWorkbasket.getId());
+            return task;
+        } finally {
+            taskanaEngineImpl.returnConnection();
+            LOGGER.debug("exit from transfer(). Returning result {} ", task);
+        }
+    }
+
+    @Override
+    public BulkOperationResults<String, TaskanaException> transferTasks(String destinationWorkbasketId,
         List<String> taskIds) throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException {
         try {
             taskanaEngineImpl.openConnection();
-            LOGGER.debug("entry to transferBulk(targetWbKey = {}, taskIds = {})", destinationWorkbasketKey, taskIds);
+            LOGGER.debug("entry to transferBulk(targetWbId = {}, taskIds = {})", destinationWorkbasketId, taskIds);
             // Check pre-conditions with trowing Exceptions
-            if (destinationWorkbasketKey == null || taskIds == null) {
+            if (destinationWorkbasketId == null || taskIds == null) {
                 throw new InvalidArgumentException(
-                    "DestinationWorkbasketKey or TaskIds can´t be used as NULL-Parameter.");
+                    "DestinationWorkbasketId or TaskIds can´t be used as NULL-Parameter.");
             }
-            Workbasket destinationWorkbasket = workbasketService.getWorkbasketByKey(destinationWorkbasketKey);
+            Workbasket destinationWorkbasket = workbasketService.getWorkbasket(destinationWorkbasketId);
 
-            BulkOperationResults<String, TaskanaException> bulkLog = new BulkOperationResults<>();
+            return transferTasks(taskIds, destinationWorkbasket);
-
-            // check tasks Ids exist and not empty - log and remove
-            Iterator<String> taskIdIterator = taskIds.iterator();
-            while (taskIdIterator.hasNext()) {
-                String currentTaskId = taskIdIterator.next();
-                if (currentTaskId == null || currentTaskId.equals("")) {
-                    bulkLog.addError("",
-                        new InvalidArgumentException("IDs with EMPTY or NULL value are not allowed."));
-                    taskIdIterator.remove();
-                }
-            }
-
-            // query for existing tasks. use taskMapper.findExistingTasks because this method
-            // returns only the required information.
-            List<MinimalTaskSummary> taskSummaries = taskMapper.findExistingTasks(taskIds);
-
-            // check source WB (read)+transfer
-            Set<String> workbasketKeys = new HashSet<>();
-            taskSummaries.stream().forEach(t -> workbasketKeys.add(t.getWorkbasketKey()));
-            List<WorkbasketSummary> sourceWorkbaskets = workbasketService.createWorkbasketQuery()
-                .callerHasPermission(WorkbasketAuthorization.TRANSFER)
-                .keyIn(workbasketKeys.toArray(new String[0]))
-                .list();
-            taskIdIterator = taskIds.iterator();
-            while (taskIdIterator.hasNext()) {
-                String currentTaskId = taskIdIterator.next();
-                MinimalTaskSummary taskSummary = taskSummaries.stream()
-                    .filter(t -> currentTaskId.equals(t.getTaskId()))
-                    .findFirst()
-                    .orElse(null);
-                if (taskSummary == null) {
-                    bulkLog.addError(currentTaskId, new TaskNotFoundException(currentTaskId));
-                    taskIdIterator.remove();
-                } else if (!sourceWorkbaskets.stream()
-                    .anyMatch(wb -> taskSummary.getWorkbasketKey().equals(wb.getKey()))) {
-                    bulkLog.addError(currentTaskId,
-                        new NotAuthorizedException(
-                            "The workbasket of this task got not TRANSFER permissions. TaskId=" + currentTaskId));
-                    taskIdIterator.remove();
-                }
-            }
-
-            // filter taskSummaries and update values
-            taskSummaries = taskSummaries.stream().filter(ts -> taskIds.contains(ts.getTaskId())).collect(
-                Collectors.toList());
-            if (!taskSummaries.isEmpty()) {
-                Instant now = Instant.now();
-                TaskSummaryImpl updateObject = new TaskSummaryImpl();
-                updateObject.setRead(false);
-                updateObject.setTransferred(true);
-                updateObject.setWorkbasketSummary(destinationWorkbasket.asSummary());
-                updateObject.setDomain(destinationWorkbasket.getDomain());
-                updateObject.setModified(now);
-                updateObject.setState(TaskState.READY);
-                updateObject.setOwner(null);
-                taskMapper.updateTransfered(taskIds, updateObject);
-            }
-            return bulkLog;
         } finally {
-            LOGGER.debug("exit from transferBulk(targetWbKey = {}, taskIds = {})", destinationWorkbasketKey, taskIds);
+            LOGGER.debug("exit from transferBulk(targetWbKey = {}, taskIds = {})", destinationWorkbasketId, taskIds);
             taskanaEngineImpl.returnConnection();
         }
     }
 
+    @Override
+    public BulkOperationResults<String, TaskanaException> transferTasks(String destinationWorkbasketKey,
+        String destinationWorkbasketDomain, List<String> taskIds)
+        throws NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException {
+        try {
+            taskanaEngineImpl.openConnection();
+            LOGGER.debug("entry to transferBulk(targetWbKey = {}, domain = {}, taskIds = {})", destinationWorkbasketKey,
+                destinationWorkbasketDomain, taskIds);
+            // Check pre-conditions with trowing Exceptions
+            if (destinationWorkbasketKey == null || destinationWorkbasketDomain == null || taskIds == null) {
+                throw new InvalidArgumentException(
+                    "DestinationWorkbasketKey or domain or TaskIds can´t be used as NULL-Parameter.");
+            }
+            Workbasket destinationWorkbasket = workbasketService.getWorkbasket(destinationWorkbasketKey,
+                destinationWorkbasketDomain);
+
+            return transferTasks(taskIds, destinationWorkbasket);
+        } finally {
+            LOGGER.debug("exit from transferBulk(targetWbKey = {}, taskIds = {})", destinationWorkbasketKey,
+                destinationWorkbasketDomain, taskIds);
+            taskanaEngineImpl.returnConnection();
+        }
+    }
+
+    private BulkOperationResults<String, TaskanaException> transferTasks(List<String> taskIds,
+        Workbasket destinationWorkbasket) throws InvalidArgumentException {
+        BulkOperationResults<String, TaskanaException> bulkLog = new BulkOperationResults<>();
+
+        // check tasks Ids exist and not empty - log and remove
+        Iterator<String> taskIdIterator = taskIds.iterator();
+        while (taskIdIterator.hasNext()) {
+            String currentTaskId = taskIdIterator.next();
+            if (currentTaskId == null || currentTaskId.equals("")) {
+                bulkLog.addError("",
+                    new InvalidArgumentException("IDs with EMPTY or NULL value are not allowed."));
+                taskIdIterator.remove();
+            }
+        }
+
+        // query for existing tasks. use taskMapper.findExistingTasks because this method
+        // returns only the required information.
+        List<MinimalTaskSummary> taskSummaries = taskMapper.findExistingTasks(taskIds);
+
+        // check source WB (read)+transfer
+        Set<String> workbasketKeys = new HashSet<>();
+        taskSummaries.stream().forEach(t -> workbasketKeys.add(t.getWorkbasketKey()));
+        List<WorkbasketSummary> sourceWorkbaskets = workbasketService.createWorkbasketQuery()
+            .callerHasPermission(WorkbasketAuthorization.TRANSFER)
+            .keyIn(workbasketKeys.toArray(new String[0]))
+            .list();
+        taskIdIterator = taskIds.iterator();
+        while (taskIdIterator.hasNext()) {
+            String currentTaskId = taskIdIterator.next();
+            MinimalTaskSummary taskSummary = taskSummaries.stream()
+                .filter(t -> currentTaskId.equals(t.getTaskId()))
+                .findFirst()
+                .orElse(null);
+            if (taskSummary == null) {
+                bulkLog.addError(currentTaskId, new TaskNotFoundException(currentTaskId));
+                taskIdIterator.remove();
+            } else if (!sourceWorkbaskets.stream()
+                .anyMatch(wb -> taskSummary.getWorkbasketKey().equals(wb.getKey()))) {
+                bulkLog.addError(currentTaskId,
+                    new NotAuthorizedException(
+                        "The workbasket of this task got not TRANSFER permissions. TaskId=" + currentTaskId));
+                taskIdIterator.remove();
+            }
+        }
+
+        // filter taskSummaries and update values
+        taskSummaries = taskSummaries.stream().filter(ts -> taskIds.contains(ts.getTaskId())).collect(
+            Collectors.toList());
+        if (!taskSummaries.isEmpty()) {
+            Instant now = Instant.now();
+            TaskSummaryImpl updateObject = new TaskSummaryImpl();
+            updateObject.setRead(false);
+            updateObject.setTransferred(true);
+            updateObject.setWorkbasketSummary(destinationWorkbasket.asSummary());
+            updateObject.setDomain(destinationWorkbasket.getDomain());
+            updateObject.setModified(now);
+            updateObject.setState(TaskState.READY);
+            updateObject.setOwner(null);
+            taskMapper.updateTransfered(taskIds, updateObject);
+        }
+        return bulkLog;
+    }
+
     @Override
     public Task setTaskRead(String taskId, boolean isRead)
         throws TaskNotFoundException {
@@ -809,9 +880,21 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Task newTask(String workbasketKey) {
+    public Task newTask(String workbasketId) {
         TaskImpl task = new TaskImpl();
-        task.setWorkbasketKey(workbasketKey);
+        WorkbasketSummaryImpl wb = new WorkbasketSummaryImpl();
+        wb.setId(workbasketId);
+        task.setWorkbasketSummary(wb);
+        return task;
+    }
+
+    @Override
+    public Task newTask(String workbasketKey, String domain) {
+        TaskImpl task = new TaskImpl();
+        WorkbasketSummaryImpl wb = new WorkbasketSummaryImpl();
+        wb.setKey(workbasketKey);
+        wb.setDomain(domain);
+        task.setWorkbasketSummary(wb);
         return task;
     }
 
@@ -976,7 +1059,7 @@ public class TaskServiceImpl implements TaskService {
 
         Classification newClassification = null;
         if (newClassificationKey != null && !newClassificationKey.equals(oldClassificationSummary.getKey())) {
-            Workbasket workbasket = workbasketService.getWorkbasketByKey(newTaskImpl.getWorkbasketSummary().getKey());
+            Workbasket workbasket = workbasketService.getWorkbasket(newTaskImpl.getWorkbasketSummary().getId());
             // set new classification
             newClassification = this.classificationService.getClassification(newClassificationKey,
                 workbasket.getDomain());

lib/taskana-core/src/main/java/pro/taskana/impl/TaskSummaryImpl.java

@@ -27,7 +27,6 @@ public class TaskSummaryImpl implements TaskSummary {
     private TaskState state;
     private ClassificationSummary classificationSummary;
     private WorkbasketSummary workbasketSummary;
-    private String domain;
     private String businessProcessId;
     private String parentBusinessProcessId;
     private String owner;
@@ -236,11 +235,14 @@ public class TaskSummaryImpl implements TaskSummary {
      */
     @Override
     public String getDomain() {
-        return domain;
+        return workbasketSummary == null ? null : workbasketSummary.getDomain();
     }
 
     public void setDomain(String domain) {
-        this.domain = domain;
+        if (workbasketSummary == null) {
+            workbasketSummary = new WorkbasketSummaryImpl();
+        }
+        ((WorkbasketSummaryImpl) this.workbasketSummary).setDomain(domain);
     }
 
     /*
@@ -496,7 +498,6 @@ public class TaskSummaryImpl implements TaskSummary {
         result = prime * result + ((custom7 == null) ? 0 : custom7.hashCode());
         result = prime * result + ((custom8 == null) ? 0 : custom8.hashCode());
         result = prime * result + ((custom9 == null) ? 0 : custom9.hashCode());
-        result = prime * result + ((domain == null) ? 0 : domain.hashCode());
         result = prime * result + ((due == null) ? 0 : due.hashCode());
         result = prime * result + ((taskId == null) ? 0 : taskId.hashCode());
         result = prime * result + (isRead ? 1231 : 1237);
@@ -638,13 +639,6 @@ public class TaskSummaryImpl implements TaskSummary {
         } else if (!custom9.equals(other.custom9)) {
             return false;
         }
-        if (domain == null) {
-            if (other.domain != null) {
-                return false;
-            }
-        } else if (!domain.equals(other.domain)) {
-            return false;
-        }
         if (due == null) {
             if (other.due != null) {
                 return false;
@@ -759,8 +753,6 @@ public class TaskSummaryImpl implements TaskSummary {
         builder.append(classificationSummary);
         builder.append(", workbasketSummary=");
         builder.append(workbasketSummary);
-        builder.append(", domain=");
-        builder.append(domain);
         builder.append(", businessProcessId=");
         builder.append(businessProcessId);
         builder.append(", parentBusinessProcessId=");

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemImpl.java

@@ -9,7 +9,7 @@ import pro.taskana.configuration.TaskanaEngineConfiguration;
 public class WorkbasketAccessItemImpl implements WorkbasketAccessItem {
 
     private String id;
-    private String workbasketKey;
+    private String workbasketId;
     private String accessId;
     private boolean permRead;
     private boolean permOpen;
@@ -51,12 +51,12 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem {
      * @see pro.taskana.impl.WorkbasketAccessItem#getWorkbasketKey()
      */
     @Override
-    public String getWorkbasketKey() {
+    public String getWorkbasketId() {
-        return workbasketKey;
+        return workbasketId;
     }
 
-    public void setWorkbasketKey(String workbasketKey) {
+    public void setWorkbasketId(String workbasketId) {
-        this.workbasketKey = workbasketKey;
+        this.workbasketId = workbasketId;
     }
 
     /*
@@ -387,8 +387,8 @@ public class WorkbasketAccessItemImpl implements WorkbasketAccessItem {
         StringBuilder builder = new StringBuilder();
         builder.append("WorkbasketAccessItem [id=");
         builder.append(id);
-        builder.append(", workbasketKey=");
+        builder.append(", workbasketId=");
-        builder.append(workbasketKey);
+        builder.append(workbasketId);
         builder.append(", accessId=");
         builder.append(accessId);
         builder.append(", permRead=");

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketAccessItemQueryImpl.java

@@ -26,7 +26,7 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
     private static final String LINK_TO_COUNTER = "pro.taskana.mappings.QueryMapper.countQueryWorkbasketAccessItems";
     private static final Logger LOGGER = LoggerFactory.getLogger(WorkbasketQueryImpl.class);
     private String[] accessIdIn;
-    private String[] workbasketKeyIn;
+    private String[] workbasketIdIn;
 
     private TaskanaEngineImpl taskanaEngineImpl;
     private List<String> orderBy;
@@ -37,8 +37,8 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
     }
 
     @Override
-    public WorkbasketAccessItemQuery workbasketKeyIn(String... key) {
+    public WorkbasketAccessItemQuery workbasketIdIn(String... id) {
-        this.workbasketKeyIn = key;
+        this.workbasketIdIn = id;
         return this;
     }
 
@@ -50,8 +50,8 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
     }
 
     @Override
-    public WorkbasketAccessItemQuery orderByWorkbasketKey(SortDirection sortDirection) {
+    public WorkbasketAccessItemQuery orderByWorkbasketId(SortDirection sortDirection) {
-        return addOrderCriteria("WORKBASKET_KEY", sortDirection);
+        return addOrderCriteria("WORKBASKET_ID", sortDirection);
     }
 
     @Override
@@ -149,8 +149,8 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
         return accessIdIn;
     }
 
-    public String[] getWorkbasketKeyIn() {
+    public String[] getWorkbasketIdIn() {
-        return workbasketKeyIn;
+        return workbasketIdIn;
     }
 
     public List<String> getOrderBy() {
@@ -162,8 +162,8 @@ public class WorkbasketAccessItemQueryImpl implements WorkbasketAccessItemQuery
         StringBuilder builder = new StringBuilder();
         builder.append("WorkbasketAccessItemQueryImpl [accessIdIn=");
         builder.append(Arrays.toString(accessIdIn));
-        builder.append(", workbasketKeyIn=");
+        builder.append(", workbasketIdIn=");
-        builder.append(Arrays.toString(workbasketKeyIn));
+        builder.append(Arrays.toString(workbasketIdIn));
         builder.append(", orderBy=");
         builder.append(orderBy);
         builder.append("]");

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketImpl.java

@@ -102,11 +102,6 @@ public class WorkbasketImpl implements Workbasket {
         return domain;
     }
 
-    @Override
-    public void setDomain(String domain) {
-        this.domain = domain;
-    }
-
     @Override
     public WorkbasketType getType() {
         return type;
@@ -197,6 +192,10 @@ public class WorkbasketImpl implements Workbasket {
         this.orgLevel4 = orgLevel4;
     }
 
+    public void setDomain(String domain) {
+        this.domain = domain;
+    }
+
     @Override
     public WorkbasketSummary asSummary() {
         WorkbasketSummaryImpl result = new WorkbasketSummaryImpl();

lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java

@@ -68,7 +68,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
                     workbasketId);
                 throw new WorkbasketNotFoundException(workbasketId);
             }
-            this.checkAuthorization(result.getKey(), WorkbasketAuthorization.READ);
+            this.checkAuthorization(workbasketId, WorkbasketAuthorization.READ);
             return result;
         } finally {
             taskanaEngine.returnConnection();
@@ -77,20 +77,20 @@ public class WorkbasketServiceImpl implements WorkbasketService {
     }
 
     @Override
-    public Workbasket getWorkbasketByKey(String workbasketKey)
+    public Workbasket getWorkbasket(String workbasketKey, String domain)
         throws WorkbasketNotFoundException, NotAuthorizedException {
         LOGGER.debug("entry to getWorkbasketByKey(workbasketKey = {})", workbasketKey);
         Workbasket result = null;
         try {
             taskanaEngine.openConnection();
-            result = workbasketMapper.findByKey(workbasketKey);
+            result = workbasketMapper.findByKeyAndDomain(workbasketKey, domain);
             if (result == null) {
                 LOGGER.error(
                     "Method getWorkbasketByKey() didn't find workbasket with key {}. Throwing WorkbasketNotFoundException",
                     workbasketKey);
                 throw new WorkbasketNotFoundException(workbasketKey);
             }
-            this.checkAuthorization(workbasketKey, WorkbasketAuthorization.READ);
+            this.checkAuthorization(workbasketKey, domain, WorkbasketAuthorization.READ);
             return result;
         } finally {
             taskanaEngine.returnConnection();
@@ -192,9 +192,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
     }
 
     @Override
-    public WorkbasketAccessItem newWorkbasketAccessItem(String workbasketKey, String accessId) {
+    public WorkbasketAccessItem newWorkbasketAccessItem(String workbasketId, String accessId) {
         WorkbasketAccessItemImpl accessItem = new WorkbasketAccessItemImpl();
-        accessItem.setWorkbasketKey(workbasketKey);
+        accessItem.setWorkbasketId(workbasketId);
         accessItem.setAccessId(accessId);
         return accessItem;
     }
@@ -231,10 +231,16 @@ public class WorkbasketServiceImpl implements WorkbasketService {
     }
 
     @Override
-    public void checkAuthorization(String workbasketKey, WorkbasketAuthorization workbasketAuthorization)
+    public void checkAuthorization(String workbasketId,
-        throws NotAuthorizedException {
+        WorkbasketAuthorization workbasketAuthorization) throws NotAuthorizedException {
+        checkAuthorization(null, null, workbasketId, workbasketAuthorization);
+    }
 
-        checkAuthorization(workbasketKey, null, workbasketAuthorization);
+    @Override
+    public void checkAuthorization(String workbasketKey, String domain,
+        WorkbasketAuthorization workbasketAuthorization)
+        throws NotAuthorizedException {
+        checkAuthorization(workbasketKey, domain, null, workbasketAuthorization);
     }
 
     @Override
@@ -247,10 +253,10 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             WorkbasketAccessItem originalItem = workbasketAccessMapper.findById(accessItem.getId());
 
             if ((originalItem.getAccessId() != null && !originalItem.getAccessId().equals(accessItem.getAccessId()))
-                || (originalItem.getWorkbasketKey() != null
+                || (originalItem.getWorkbasketId() != null
-                    && !originalItem.getWorkbasketKey().equals(accessItem.getWorkbasketKey()))) {
+                    && !originalItem.getWorkbasketId().equals(accessItem.getWorkbasketId()))) {
                 throw new InvalidArgumentException(
-                    "AccessId and Workbasketkey must not be changed in updateWorkbasketAuthorization calls");
+                    "AccessId and WorkbasketId must not be changed in updateWorkbasketAuthorization calls");
             }
 
             workbasketAccessMapper.update(accessItem);
@@ -265,12 +271,12 @@ public class WorkbasketServiceImpl implements WorkbasketService {
     }
 
     @Override
-    public List<WorkbasketAccessItem> getWorkbasketAuthorizations(String workbasketKey) {
+    public List<WorkbasketAccessItem> getWorkbasketAuthorizations(String workbasketId) {
-        LOGGER.debug("entry to getWorkbasketAuthorizations(workbasketId = {})", workbasketKey);
+        LOGGER.debug("entry to getWorkbasketAuthorizations(workbasketId = {})", workbasketId);
         List<WorkbasketAccessItem> result = new ArrayList<>();
         try {
             taskanaEngine.openConnection();
-            List<WorkbasketAccessItemImpl> queryResult = workbasketAccessMapper.findByWorkbasketKey(workbasketKey);
+            List<WorkbasketAccessItemImpl> queryResult = workbasketAccessMapper.findByWorkbasketId(workbasketId);
             result.addAll(queryResult);
             return result;
         } finally {
@@ -284,9 +290,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
     }
 
     @Override
-    public List<WorkbasketAuthorization> getPermissionsForWorkbasket(String workbasketKey) {
+    public List<WorkbasketAuthorization> getPermissionsForWorkbasket(String workbasketId) {
         List<WorkbasketAuthorization> permissions = new ArrayList<>();
-        WorkbasketAccessItem wbAcc = workbasketAccessMapper.findByWorkbasketAndAccessId(workbasketKey,
+        WorkbasketAccessItem wbAcc = workbasketAccessMapper.findByWorkbasketAndAccessId(workbasketId,
             CurrentUserContext.getAccessIds());
         this.addWorkbasketAccessItemValuesToPermissionSet(wbAcc, permissions);
         return permissions;
@@ -371,8 +377,9 @@ public class WorkbasketServiceImpl implements WorkbasketService {
     }
 
     @Override
-    public Workbasket newWorkbasket(String key) {
+    public Workbasket newWorkbasket(String key, String domain) {
         WorkbasketImpl wb = new WorkbasketImpl();
+        wb.setDomain(domain);
         wb.setKey(key);
         return wb;
     }
@@ -386,7 +393,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             taskanaEngine.openConnection();
             // check that source workbasket exists
             getWorkbasket(workbasketId);
-            checkAuthorizationByWorkbasketId(workbasketId, WorkbasketAuthorization.READ);
+            checkAuthorization(workbasketId, WorkbasketAuthorization.READ);
             List<WorkbasketSummaryImpl> distributionTargets = workbasketMapper
                 .findByDistributionTargets(workbasketId);
             result.addAll(distributionTargets);
@@ -401,6 +408,31 @@ public class WorkbasketServiceImpl implements WorkbasketService {
         }
     }
 
+    @Override
+    public List<WorkbasketSummary> getDistributionTargets(String workbasketKey, String domain)
+        throws NotAuthorizedException, WorkbasketNotFoundException {
+        LOGGER.debug("entry to getDistributionTargets(workbasketKey = {}, domain = {})", workbasketKey, domain);
+        List<WorkbasketSummary> result = new ArrayList<>();
+        try {
+            taskanaEngine.openConnection();
+            // check that source workbasket exists
+            Workbasket workbasket = getWorkbasket(workbasketKey, domain);
+            checkAuthorization(workbasket.getId(), WorkbasketAuthorization.READ);
+            List<WorkbasketSummaryImpl> distributionTargets = workbasketMapper
+                .findByDistributionTargets(workbasket.getId());
+            result.addAll(distributionTargets);
+            return result;
+        } finally {
+            taskanaEngine.returnConnection();
+            if (LOGGER.isDebugEnabled()) {
+                int numberOfResultObjects = result.size();
+                LOGGER.debug("exit from getDistributionTargets(workbasketId). Returning {} resulting Objects: {} ",
+                    numberOfResultObjects, LoggerUtils.listToString(result));
+            }
+        }
+
+    }
+
     @Override
     public List<WorkbasketSummary> getDistributionSources(String workbasketId)
         throws NotAuthorizedException, WorkbasketNotFoundException {
@@ -410,7 +442,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             taskanaEngine.openConnection();
             // check that source workbasket exists
             getWorkbasket(workbasketId);
-            checkAuthorizationByWorkbasketId(workbasketId, WorkbasketAuthorization.READ);
+            checkAuthorization(workbasketId, WorkbasketAuthorization.READ);
             List<WorkbasketSummaryImpl> distributionSources = workbasketMapper
                 .findDistributionSources(workbasketId);
             result.addAll(distributionSources);
@@ -425,6 +457,30 @@ public class WorkbasketServiceImpl implements WorkbasketService {
         }
     }
 
+    @Override
+    public List<WorkbasketSummary> getDistributionSources(String workbasketKey, String domain)
+        throws NotAuthorizedException, WorkbasketNotFoundException {
+        LOGGER.debug("entry to getDistributionSources(workbasketKey = {}, domain = {})", workbasketKey, domain);
+        List<WorkbasketSummary> result = new ArrayList<>();
+        try {
+            taskanaEngine.openConnection();
+            // check that source workbasket exists
+            Workbasket workbasket = getWorkbasket(workbasketKey, domain);
+            checkAuthorization(workbasket.getId(), WorkbasketAuthorization.READ);
+            List<WorkbasketSummaryImpl> distributionSources = workbasketMapper
+                .findDistributionSources(workbasket.getId());
+            result.addAll(distributionSources);
+            return result;
+        } finally {
+            taskanaEngine.returnConnection();
+            if (LOGGER.isDebugEnabled()) {
+                int numberOfResultObjects = result.size();
+                LOGGER.debug("exit from getDistributionSources(workbasketId). Returning {} resulting Objects: {} ",
+                    numberOfResultObjects, LoggerUtils.listToString(result));
+            }
+        }
+    }
+
     @Override
     public void setDistributionTargets(String sourceWorkbasketId, List<String> targetWorkbasketIds)
         throws WorkbasketNotFoundException, NotAuthorizedException {
@@ -437,7 +493,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             taskanaEngine.openConnection();
             // check existence of source workbasket
             WorkbasketImpl sourceWorkbasket = (WorkbasketImpl) getWorkbasket(sourceWorkbasketId);
-            checkAuthorizationByWorkbasketId(sourceWorkbasketId, WorkbasketAuthorization.READ);
+            checkAuthorization(sourceWorkbasketId, WorkbasketAuthorization.READ);
             distributionTargetMapper.deleteAllDistributionTargetsBySourceId(sourceWorkbasketId);
 
             sourceWorkbasket.setModified(Instant.now());
@@ -474,7 +530,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             WorkbasketImpl sourceWorkbasket = (WorkbasketImpl) getWorkbasket(sourceWorkbasketId);
             // check esistence of target workbasket
             getWorkbasket(targetWorkbasketId);
-            checkAuthorizationByWorkbasketId(sourceWorkbasketId, WorkbasketAuthorization.READ);
+            checkAuthorization(sourceWorkbasketId, WorkbasketAuthorization.READ);
             // check whether the target is already set as target
             int numOfDistTargets = distributionTargetMapper.getNumberOfDistributionTargets(sourceWorkbasketId,
                 targetWorkbasketId);
@@ -504,7 +560,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
         try {
             taskanaEngine.openConnection();
             // don't check existence of source / target workbasket to enable cleanup even if the db is corrupted
-            checkAuthorizationByWorkbasketId(sourceWorkbasketId, WorkbasketAuthorization.READ);
+            checkAuthorization(sourceWorkbasketId, WorkbasketAuthorization.READ);
             // check whether the target is set as target
             int numberOfDistTargets = distributionTargetMapper.getNumberOfDistributionTargets(sourceWorkbasketId,
                 targetWorkbasketId);
@@ -547,7 +603,7 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             Workbasket wb = this.getWorkbasket(workbasketId);
             List<TaskSummary> taskUsages = taskanaEngine.getTaskService()
                 .createTaskQuery()
-                .workbasketKeyIn(wb.getKey())
+                .workbasketIdIn(wb.getId())
                 .list();
             if (taskUsages == null || taskUsages.size() > 0) {
                 throw new WorkbasketInUseException(
@@ -570,17 +626,12 @@ public class WorkbasketServiceImpl implements WorkbasketService {
         return new WorkbasketAccessItemQueryImpl(this.taskanaEngine);
     }
 
-    private void checkAuthorizationByWorkbasketId(String workbasketId,
+    private void checkAuthorization(String workbasketKey, String domain, String workbasketId,
-        WorkbasketAuthorization workbasketAuthorization) throws NotAuthorizedException {
-        checkAuthorization(null, workbasketId, workbasketAuthorization);
-    }
-
-    private void checkAuthorization(String workbasketKey, String workbasketId,
         WorkbasketAuthorization workbasketAuthorization)
         throws NotAuthorizedException {
         LOGGER.debug("entry to checkAuthorization(workbasketId = {}, workbasketAuthorization = {})", workbasketKey,
             workbasketAuthorization);
-        if ((workbasketAuthorization == null && workbasketKey == null) || workbasketAuthorization == null) {
+        if (workbasketAuthorization == null) {
             throw new SystemException("checkAuthorization was called with an invalid parameter combination");
         }
         boolean isAuthorized = false;
@@ -596,13 +647,13 @@ public class WorkbasketServiceImpl implements WorkbasketService {
             List<String> accessIds = CurrentUserContext.getAccessIds();
             LOGGER.debug("checkAuthorization: Verifying that {} has the permission {} on workbasket {}",
                 CurrentUserContext.getUserid(),
-                workbasketAuthorization == null ? "null" : workbasketAuthorization.name(), workbasketKey);
+                workbasketAuthorization.name(), workbasketKey);
 
             List<WorkbasketAccessItemImpl> accessItems;
 
             if (workbasketKey != null) {
                 accessItems = workbasketAccessMapper
-                    .findByWorkbasketAndAccessIdAndAuthorization(workbasketKey, accessIds,
+                    .findByWorkbasketAccessByWorkbasketKeyDomainAndAuthorization(workbasketKey, domain, accessIds,
                         workbasketAuthorization.name());
             } else if (workbasketId != null) {
                 accessItems = workbasketAccessMapper

lib/taskana-core/src/main/java/pro/taskana/mappings/AttachmentMapper.java

@@ -21,12 +21,12 @@ import pro.taskana.impl.persistence.MapTypeHandler;
  */
 public interface AttachmentMapper {
 
-    @Insert("INSERT INTO ATTACHMENT (ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED, CUSTOM_ATTRIBUTES) "
+    @Insert("INSERT INTO ATTACHMENT (ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, CLASSIFICATION_ID, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED, CUSTOM_ATTRIBUTES) "
-        + "VALUES (#{att.id}, #{att.taskId}, #{att.created}, #{att.modified}, #{att.classificationSummary.key}, #{att.objectReference.company}, #{att.objectReference.system}, #{att.objectReference.systemInstance}, "
+        + "VALUES (#{att.id}, #{att.taskId}, #{att.created}, #{att.modified}, #{att.classificationSummary.key}, #{att.classificationSummary.id}, #{att.objectReference.company}, #{att.objectReference.system}, #{att.objectReference.systemInstance}, "
         + " #{att.objectReference.type}, #{att.objectReference.value}, #{att.channel}, #{att.received}, #{att.customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler} )")
     void insert(@Param("att") AttachmentImpl att);
 
-    @Select("SELECT ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED, CUSTOM_ATTRIBUTES "
+    @Select("SELECT ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, CLASSIFICATION_ID, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED, CUSTOM_ATTRIBUTES "
         + "FROM ATTACHMENT "
         + "WHERE TASK_ID = #{taskId}")
     @Results(value = {
@@ -35,6 +35,7 @@ public interface AttachmentMapper {
         @Result(property = "created", column = "CREATED"),
         @Result(property = "modified", column = "MODIFIED"),
         @Result(property = "classificationSummaryImpl.key", column = "CLASSIFICATION_KEY"),
+        @Result(property = "classificationSummaryImpl.id", column = "CLASSIFICATION_ID"),
         @Result(property = "objectReference.company", column = "REF_COMPANY"),
         @Result(property = "objectReference.system", column = "REF_SYSTEM"),
         @Result(property = "objectReference.systemInstance", column = "REF_INSTANCE"),
@@ -47,7 +48,7 @@ public interface AttachmentMapper {
     })
     List<AttachmentImpl> findAttachmentsByTaskId(@Param("taskId") String taskId);
 
-    @Select("SELECT ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED, CUSTOM_ATTRIBUTES "
+    @Select("SELECT ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, CLASSIFICATION_ID, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED, CUSTOM_ATTRIBUTES "
         + "FROM ATTACHMENT "
         + "WHERE ID = #{attachmentId}")
     @Results(value = {
@@ -56,6 +57,7 @@ public interface AttachmentMapper {
         @Result(property = "created", column = "CREATED"),
         @Result(property = "modified", column = "MODIFIED"),
         @Result(property = "classificationSummaryImpl.key", column = "CLASSIFICATION_KEY"),
+        @Result(property = "classificationSummaryImpl.id", column = "CLASSIFICATION_ID"),
         @Result(property = "objectReference.company", column = "REF_COMPANY"),
         @Result(property = "objectReference.system", column = "REF_SYSTEM"),
         @Result(property = "objectReference.systemInstance", column = "REF_INSTANCE"),
@@ -68,7 +70,7 @@ public interface AttachmentMapper {
     })
     AttachmentImpl getAttachment(@Param("attachmentId") String attachmentId);
 
-    @Select("<script>SELECT ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, RECEIVED "
+    @Select("<script>SELECT ID, TASK_ID, CREATED, MODIFIED, CLASSIFICATION_KEY, CLASSIFICATION_ID, RECEIVED "
         + "FROM ATTACHMENT "
         + "<where>"
         + "TASK_ID IN (<foreach collection='array' item='item' separator=',' >#{item}</foreach>)"
@@ -80,6 +82,7 @@ public interface AttachmentMapper {
         @Result(property = "created", column = "CREATED"),
         @Result(property = "modified", column = "MODIFIED"),
         @Result(property = "classificationSummaryImpl.key", column = "CLASSIFICATION_KEY"),
+        @Result(property = "classificationSummaryImpl.id", column = "CLASSIFICATION_ID"),
         @Result(property = "received", column = "RECEIVED"),
     })
     List<AttachmentSummaryImpl> findAttachmentSummariesByTaskIds(String[] taskIds);
@@ -88,7 +91,7 @@ public interface AttachmentMapper {
     void deleteAttachment(@Param("attachmentId") String attachmentId);
 
     @Update("UPDATE ATTACHMENT SET TASK_ID = #{taskId}, CREATED = #{created}, MODIFIED = #{modified},"
-        + " CLASSIFICATION_KEY = #{classificationSummary.key}, REF_COMPANY = #{objectReference.company}, REF_SYSTEM = #{objectReference.system},"
+        + " CLASSIFICATION_KEY = #{classificationSummary.key}, CLASSIFICATION_ID = #{classificationSummary.id}, REF_COMPANY = #{objectReference.company}, REF_SYSTEM = #{objectReference.system},"
         + " REF_INSTANCE = #{objectReference.systemInstance}, REF_TYPE = #{objectReference.type}, REF_VALUE = #{objectReference.value},"
         + " CHANNEL = #{channel}, RECEIVED = #{received}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}"
         + " WHERE ID = #{id}")

lib/taskana-core/src/main/java/pro/taskana/mappings/QueryMapper.java

@@ -42,15 +42,13 @@ public interface QueryMapper {
         + "<if test='description != null'>AND (<foreach item='item' collection='description' separator=' OR '>t.DESCRIPTION LIKE #{item}</foreach>)</if> "
         + "<if test='note != null'>AND (<foreach item='item' collection='note' separator=' OR '>t.NOTE LIKE #{item}</foreach>)</if> "
         + "<if test='priority != null'>AND t.PRIORITY IN(<foreach item='item' collection='priority' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='states != null'>AND t.STATE IN(<foreach item='item' collection='states' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='stateIn != null'>AND t.STATE IN(<foreach item='item' collection='stateIn' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='workbasketKeyIn != null'>AND t.WORKBASKET_KEY IN(<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='workbasketIdIn != null'>AND t.WORKBASKET_ID IN(<foreach item='item' collection='workbasketIdIn' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='workbasketKeyLike != null'>AND (<foreach item='item' collection='workbasketKeyLike' separator=' OR '>UPPER(t.WORKBASKET_KEY) LIKE #{item}</foreach>)</if> "
+        + "<if test='workbasketKeyDomainIn != null'>AND (<foreach item='item' collection='workbasketKeyDomainIn' separator=' OR '>(t.WORKBASKET_KEY = #{item.key} AND t.DOMAIN = #{item.domain})</foreach>)</if> "
         + "<if test='classificationKeyIn != null'>AND t.CLASSIFICATION_KEY IN(<foreach item='item' collection='classificationKeyIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='classificationKeyLike != null'>AND (<foreach item='item' collection='classificationKeyLike' separator=' OR '>UPPER(t.CLASSIFICATION_KEY) LIKE #{item}</foreach>)</if> "
         + "<if test='classificationCategoryIn != null'>AND t.CLASSIFICATION_CATEGORY IN(<foreach item='item' collection='classificationCategoryIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='classificationCategoryLike != null'>AND (<foreach item='item' collection='classificationCategoryLike' separator=' OR '>UPPER(t.CLASSIFICATION_CATEGORY) LIKE #{item}</foreach>)</if> "
-        + "<if test='domainIn != null'>AND t.DOMAIN IN(<foreach item='item' collection='domainIn' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='domainLike != null'>AND (<foreach item='item' collection='domainLike' separator=' OR '>UPPER(t.DOMAIN) LIKE #{item}</foreach>)</if> "
         + "<if test='ownerIn != null'>AND t.OWNER IN(<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR '>UPPER(t.OWNER) LIKE #{item}</foreach>)</if> "
         + "<if test='isRead != null'>AND t.IS_READ = #{isRead}</if> "
@@ -104,9 +102,10 @@ public interface QueryMapper {
         @Result(property = "note", column = "NOTE"),
         @Result(property = "priority", column = "PRIORITY"),
         @Result(property = "state", column = "STATE"),
-        @Result(property = "domain", column = "DOMAIN"),
+        @Result(property = "workbasketSummaryImpl.domain", column = "DOMAIN"),
         @Result(property = "workbasketSummaryImpl.key", column = "WORKBASKET_KEY"),
         @Result(property = "classificationSummaryImpl.key", column = "CLASSIFICATION_KEY"),
+        @Result(property = "classificationSummaryImpl.domain", column = "DOMAIN"),
         @Result(property = "classificationSummaryImpl.category", column = "CLASSIFICATION_CATEGORY"),
         @Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"),
         @Result(property = "parentBusinessProcessId", column = "PARENT_BUSINESS_PROCESS_ID"),
@@ -197,7 +196,7 @@ public interface QueryMapper {
 
     @Select("<script>"
         + "SELECT DISTINCT w.ID, w.KEY, w.NAME, w.DOMAIN, W.TYPE, w.DESCRIPTION, w.OWNER, w.ORG_LEVEL_1, w.ORG_LEVEL_2, w.ORG_LEVEL_3, w.ORG_LEVEL_4 from WORKBASKET w "
-        + "<if test='accessId != null'>LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.KEY = a.WORKBASKET_KEY</if> "
+        + "<if test='accessId != null'>LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.ID = a.WORKBASKET_ID</if> "
         + "<where>"
         + "<if test='ownerIn != null'>AND w.OWNER IN(<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(w.OWNER) LIKE #{item}</foreach>)</if> "
@@ -267,18 +266,18 @@ public interface QueryMapper {
 
     @Select("<script>"
         + "SELECT "
-        + "ID, WORKBASKET_KEY, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, "
+        + "ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, "
         + "PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
         + "from WORKBASKET_ACCESS_LIST "
         + "<where>"
-        + "<if test='workbasketKeyIn != null'>AND UPPER(WORKBASKET_KEY) IN(<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='workbasketIdIn != null'>AND WORKBASKET_ID IN(<foreach item='item' collection='workbasketIdIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='accessIdIn != null'>AND ACCESS_ID IN(<foreach item='item' collection='accessIdIn' separator=',' >#{item}</foreach>) </if> "
         + "</where>"
         + "<if test='!orderBy.isEmpty()'>ORDER BY <foreach item='orderItem' collection='orderBy' separator=',' >${orderItem}</foreach></if> "
         + "</script>")
     @Results({
         @Result(property = "id", column = "ID"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
+        @Result(property = "workbasketId", column = "WORKBASKET_ID"),
         @Result(property = "accessId", column = "ACCESS_ID"),
         @Result(property = "permRead", column = "PERM_READ"),
         @Result(property = "permOpen", column = "PERM_OPEN"),
@@ -313,15 +312,13 @@ public interface QueryMapper {
         + "<if test='description != null'>AND (<foreach item='item' collection='description' separator=' OR '>t.DESCRIPTION LIKE #{item}</foreach>)</if> "
         + "<if test='note != null'>AND (<foreach item='item' collection='note' separator=' OR '>t.NOTE LIKE #{item}</foreach>)</if> "
         + "<if test='priority != null'>AND t.PRIORITY IN(<foreach item='item' collection='priority' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='states != null'>AND t.STATE IN(<foreach item='item' collection='states' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='stateIn != null'>AND t.STATE IN(<foreach item='item' collection='stateIn' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='workbasketKeyIn != null'>AND t.WORKBASKET_KEY IN(<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='workbasketIdIn != null'>AND t.WORKBASKET_ID IN(<foreach item='item' collection='workbasketIdIn' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='workbasketKeyLike != null'>AND (<foreach item='item' collection='workbasketKeyLike' separator=' OR '>UPPER(t.WORKBASKET_KEY) LIKE #{item}</foreach>)</if> "
+        + "<if test='workbasketKeyDomainIn != null'>AND (<foreach item='item' collection='workbasketKeyDomainIn' separator=' OR '>(t.WORKBASKET_KEY = #{item.key} AND t.DOMAIN = #{item.domain})</foreach>)</if> "
         + "<if test='classificationKeyIn != null'>AND t.CLASSIFICATION_KEY IN(<foreach item='item' collection='classificationKeyIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='classificationKeyLike != null'>AND (<foreach item='item' collection='classificationKeyLike' separator=' OR '>UPPER(t.CLASSIFICATION_KEY) LIKE #{item}</foreach>)</if> "
         + "<if test='classificationCategoryIn != null'>AND t.CLASSIFICATION_CATEGORY IN(<foreach item='item' collection='classificationCategoryIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='classificationCategoryLike != null'>AND (<foreach item='item' collection='classificationCategoryLike' separator=' OR '>UPPER(t.CLASSIFICATION_CATEGORY) LIKE #{item}</foreach>)</if> "
-        + "<if test='domainIn != null'>AND t.DOMAIN IN(<foreach item='item' collection='domainIn' separator=',' >#{item}</foreach>)</if> "
-        + "<if test='domainLike != null'>AND (<foreach item='item' collection='domainLike' separator=' OR '>UPPER(t.DOMAIN) LIKE #{item}</foreach>)</if> "
         + "<if test='ownerIn != null'>AND t.OWNER IN(<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR '>UPPER(t.OWNER) LIKE #{item}</foreach>)</if> "
         + "<if test='isRead != null'>AND t.IS_READ = #{isRead}</if> "
@@ -416,7 +413,7 @@ public interface QueryMapper {
 
     @Select("<script>"
         + "SELECT COUNT(ID) from WORKBASKET w "
-        + "<if test='accessId != null'>LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.KEY = a.WORKBASKET_KEY</if> "
+        + "<if test='accessId != null'>LEFT OUTER JOIN WORKBASKET_ACCESS_LIST a on w.ID = a.WORKBASKET_ID</if> "
         + "<where>"
         + "<if test='ownerIn != null'>AND w.OWNER IN(<foreach item='item' collection='ownerIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='ownerLike != null'>AND (<foreach item='item' collection='ownerLike' separator=' OR ' >UPPER(w.OWNER) LIKE #{item}</foreach>)</if> "
@@ -473,7 +470,7 @@ public interface QueryMapper {
 
     @Select("<script>SELECT COUNT(ID) from WORKBASKET_ACCESS_LIST "
         + "<where>"
-        + "<if test='workbasketKeyIn != null'>AND UPPER(WORKBASKET_KEY) IN(<foreach item='item' collection='workbasketKeyIn' separator=',' >#{item}</foreach>)</if> "
+        + "<if test='workbasketIdIn != null'>AND WORKBASKET_ID IN(<foreach item='item' collection='workbasketIdIn' separator=',' >#{item}</foreach>)</if> "
         + "<if test='accessIdIn != null'>AND ACCESS_ID IN(<foreach item='item' collection='accessIdIn' separator=',' >#{item}</foreach>) </if> "
         + "</where>"
         + "</script>")

lib/taskana-core/src/main/java/pro/taskana/mappings/TaskMapper.java

@@ -27,11 +27,10 @@ import pro.taskana.impl.persistence.MapTypeHandler;
 public interface TaskMapper {
 
     String OBJECTREFERENCEMAPPER_FINDBYID = "pro.taskana.mappings.ObjectReferenceMapper.findById";
-    String CLASSIFICATION_FINDBYKEYANDDOMAIN = "pro.taskana.mappings.ClassificationMapper.findByKeyAndDomain";
+    String WORKBASKET_FINDSUMMARYBYID = "pro.taskana.mappings.WorkbasketMapper.findSummaryById";
-    String WORKBASKET_FINDSUMMARYBYKEY = "pro.taskana.mappings.WorkbasketMapper.findSummaryByKey";
     String CLASSIFICATION_FINDBYID = "pro.taskana.mappings.ClassificationMapper.findById";
 
-    @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, NOTE, PRIORITY, STATE, CLASSIFICATION_CATEGORY, CLASSIFICATION_KEY, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
+    @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, NOTE, PRIORITY, STATE, CLASSIFICATION_CATEGORY, CLASSIFICATION_KEY, CLASSIFICATION_ID, WORKBASKET_ID, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
         + "FROM TASK "
         + "WHERE ID = #{id}")
     @Results(value = {
@@ -47,11 +46,10 @@ public interface TaskMapper {
         @Result(property = "note", column = "NOTE"),
         @Result(property = "priority", column = "PRIORITY"),
         @Result(property = "state", column = "STATE"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
+        @Result(property = "workbasketSummary", column = "WORKBASKET_ID", javaType = WorkbasketSummaryImpl.class,
-        @Result(property = "workbasketSummary", column = "WORKBASKET_KEY", javaType = WorkbasketSummaryImpl.class,
+            one = @One(select = WORKBASKET_FINDSUMMARYBYID)),
-            one = @One(select = WORKBASKET_FINDSUMMARYBYKEY)),
+        @Result(property = "classificationSummaryImpl.category", column = "CLASSIFICATION_CATEGORY"),
-        @Result(property = "classificationKey", column = "CLASSIFICATION_KEY"),
+        @Result(property = "classificationSummaryImpl.id", column = "CLASSIFICATION_ID"),
-        @Result(property = "classificationCategory", column = "CLASSIFICATION_CATEGORY"),
         @Result(property = "classificationSummaryImpl.key", column = "CLASSIFICATION_KEY"),
         @Result(property = "domain", column = "DOMAIN"),
         @Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"),
@@ -79,12 +77,23 @@ public interface TaskMapper {
     })
     TaskImpl findById(@Param("id") String id);
 
-    @Insert("INSERT INTO TASK(ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, NOTE, PRIORITY, STATE, CLASSIFICATION_KEY, CLASSIFICATION_CATEGORY, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) "
+    @Insert("INSERT INTO TASK(ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, NOTE, PRIORITY, STATE,  CLASSIFICATION_CATEGORY, CLASSIFICATION_KEY, CLASSIFICATION_ID, WORKBASKET_ID, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, "
-        + "VALUES(#{id}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{note}, #{priority}, #{state}, #{classificationKey}, #{classificationCategory}, #{workbasketKey}, #{domain}, #{businessProcessId}, #{parentBusinessProcessId}, #{owner}, #{primaryObjRef.company},#{primaryObjRef.system},#{primaryObjRef.systemInstance},#{primaryObjRef.type},#{primaryObjRef.value},  #{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, #{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
+        + "POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10) "
+        + "VALUES(#{id}, #{created}, #{claimed}, #{completed}, #{modified}, #{planned}, #{due}, #{name}, #{description}, #{note}, #{priority}, #{state}, #{classificationSummary.category}, "
+        + "#{classificationSummary.key}, #{classificationSummary.id}, #{workbasketSummary.id}, #{workbasketSummary.key}, #{workbasketSummary.domain}, #{businessProcessId}, "
+        + "#{parentBusinessProcessId}, #{owner}, #{primaryObjRef.company}, #{primaryObjRef.system}, #{primaryObjRef.systemInstance}, #{primaryObjRef.type}, #{primaryObjRef.value}, "
+        + "#{isRead}, #{isTransferred}, #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, "
+        + "#{custom1}, #{custom2}, #{custom3}, #{custom4}, #{custom5}, #{custom6}, #{custom7}, #{custom8}, #{custom9}, #{custom10})")
     @Options(keyProperty = "id", keyColumn = "ID")
     void insert(TaskImpl task);
 
-    @Update("UPDATE TASK SET CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, NOTE = #{note}, PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_CATEGORY = #{classificationCategory}, CLASSIFICATION_KEY = #{classificationKey}, WORKBASKET_KEY = #{workbasketKey}, DOMAIN = #{domain}, BUSINESS_PROCESS_ID = #{businessProcessId}, PARENT_BUSINESS_PROCESS_ID = #{parentBusinessProcessId}, OWNER = #{owner}, POR_COMPANY = #{primaryObjRef.company}, POR_SYSTEM = #{primaryObjRef.system}, POR_INSTANCE = #{primaryObjRef.systemInstance}, POR_TYPE = #{primaryObjRef.type}, POR_VALUE = #{primaryObjRef.value}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
+    @Update("UPDATE TASK SET CLAIMED = #{claimed}, COMPLETED = #{completed}, MODIFIED = #{modified}, PLANNED = #{planned}, DUE = #{due}, NAME = #{name}, DESCRIPTION = #{description}, NOTE = #{note}, "
+        + " PRIORITY = #{priority}, STATE = #{state}, CLASSIFICATION_CATEGORY = #{classificationSummary.category}, CLASSIFICATION_KEY = #{classificationSummary.key}, CLASSIFICATION_ID = #{classificationSummary.id}, "
+        + "WORKBASKET_ID = #{workbasketSummary.id}, WORKBASKET_KEY = #{workbasketSummary.key}, DOMAIN = #{workbasketSummary.domain}, "
+        + "BUSINESS_PROCESS_ID = #{businessProcessId}, PARENT_BUSINESS_PROCESS_ID = #{parentBusinessProcessId}, OWNER = #{owner}, POR_COMPANY = #{primaryObjRef.company}, POR_SYSTEM = #{primaryObjRef.system}, "
+        + "POR_INSTANCE = #{primaryObjRef.systemInstance}, POR_TYPE = #{primaryObjRef.type}, POR_VALUE = #{primaryObjRef.value}, IS_READ = #{isRead}, IS_TRANSFERRED = #{isTransferred}, "
+        + "CUSTOM_ATTRIBUTES = #{customAttributes,jdbcType=BLOB,javaType=java.util.Map,typeHandler=pro.taskana.impl.persistence.MapTypeHandler}, CUSTOM_1 = #{custom1}, CUSTOM_2 = #{custom2}, "
+        + "CUSTOM_3 = #{custom3}, CUSTOM_4 = #{custom4}, CUSTOM_5 = #{custom5}, CUSTOM_6 = #{custom6}, CUSTOM_7 = #{custom7}, CUSTOM_8 = #{custom8}, CUSTOM_9 = #{custom9}, CUSTOM_10 = #{custom10} "
         + "WHERE ID = #{id}")
     void update(TaskImpl task);
 
@@ -94,9 +103,9 @@ public interface TaskMapper {
     @Delete("<script>DELETE FROM TASK WHERE ID IN(<foreach item='item' collection='ids' separator=',' >#{item}</foreach>)</script>")
     void deleteMultiple(@Param("ids") List<String> ids);
 
-    @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_CATEGORY, CLASSIFICATION_KEY, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
+    @Select("SELECT ID, CREATED, CLAIMED, COMPLETED, MODIFIED, PLANNED, DUE, NAME, DESCRIPTION, PRIORITY, STATE, CLASSIFICATION_CATEGORY, CLASSIFICATION_KEY, CLASSIFICATION_ID, WORKBASKET_ID, WORKBASKET_KEY, DOMAIN, BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER, POR_COMPANY, POR_SYSTEM, POR_INSTANCE, POR_TYPE, POR_VALUE, IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1, CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 "
         + "FROM TASK "
-        + "WHERE WORKBASKET_KEY = #{workbasketKey} "
+        + "WHERE WORKBASKET_KEY = #{workbasketSummaryImpl.key} and DOMAIN = #{workbasketSummaryImpl.domain "
         + "AND STATE = #{taskState}")
     @Results(value = {
         @Result(property = "taskId", column = "ID"),
@@ -110,10 +119,12 @@ public interface TaskMapper {
         @Result(property = "note", column = "NOTE"),
         @Result(property = "priority", column = "PRIORITY"),
         @Result(property = "state", column = "STATE"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
         @Result(property = "classificationSummaryImpl.category", column = "CLASSIFICATION_CATEGORY"),
         @Result(property = "classificationSummaryImpl.key", column = "CLASSIFICATION_KEY"),
+        @Result(property = "classificationSummaryImpl.id", column = "CLASSIFICATION_ID"),
+        @Result(property = "workbasketSummaryImpl.id", column = "WORKBASKET_ID"),
         @Result(property = "workbasketSummaryImpl.key", column = "WORKBASKET_KEY"),
+        @Result(property = "workbasketSummaryImpl.domain", column = "DOMAIN"),
         @Result(property = "domain", column = "DOMAIN"),
         @Result(property = "businessProcessId", column = "BUSINESS_PROCESS_ID"),
         @Result(property = "parentBusinessProcessId", column = "PARENT_BUSINESS_PROCESS_ID"),
@@ -180,7 +191,8 @@ public interface TaskMapper {
     List<TaskSummaryImpl> findTaskSummariesByWorkbasketKey(@Param("workbasketKey") String workbasketKey);
 
     @Update("<script>"
-        + " UPDATE TASK SET MODIFIED = #{referencetask.modified}, STATE = #{referencetask.state}, WORKBASKET_KEY = #{referencetask.workbasketSummary.key}, DOMAIN = #{referencetask.domain}, OWNER = #{referencetask.owner}, IS_READ = #{referencetask.isRead}, IS_TRANSFERRED = #{referencetask.isTransferred}"
+        + " UPDATE TASK SET MODIFIED = #{referencetask.modified}, STATE = #{referencetask.state}, WORKBASKET_KEY = #{referencetask.workbasketSummary.key}, WORKBASKET_ID= #{referencetask.workbasketSummary.id}, "
+        + " DOMAIN = #{referencetask.domain}, OWNER = #{referencetask.owner}, IS_READ = #{referencetask.isRead}, IS_TRANSFERRED = #{referencetask.isTransferred}"
         + " WHERE ID IN <foreach item='taskId' index='index' separator=',' open='(' close=')' collection='taskIds'>#{taskId}</foreach>"
         + "</script>")
     void updateTransfered(@Param("taskIds") List<String> taskIds,

lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketAccessMapper.java

@@ -18,11 +18,11 @@ import pro.taskana.impl.WorkbasketAccessItemImpl;
  */
 public interface WorkbasketAccessMapper {
 
-    @Select("SELECT ID, WORKBASKET_KEY, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+    @Select("SELECT ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
         + "FROM WORKBASKET_ACCESS_LIST WHERE ID = #{id}")
     @Results(value = {
         @Result(property = "id", column = "ID"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
+        @Result(property = "workbasketId", column = "WORKBASKET_ID"),
         @Result(property = "accessId", column = "ACCESS_ID"),
         @Result(property = "permRead", column = "PERM_READ"),
         @Result(property = "permOpen", column = "PERM_OPEN"),
@@ -43,11 +43,38 @@ public interface WorkbasketAccessMapper {
         @Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
     WorkbasketAccessItemImpl findById(@Param("id") String id);
 
-    @Select("SELECT ID, WORKBASKET_KEY, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+    // @Select("SELECT ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE,
-        + "FROM WORKBASKET_ACCESS_LIST WHERE ACCESS_ID = #{accessId}")
+    // PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7,
+    // PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+    // + "FROM WORKBASKET_ACCESS_LIST WHERE ACCESS_ID = #{accessId}")
+    // @Results(value = {
+    // @Result(property = "id", column = "ID"),
+    // @Result(property = "workbasketId", column = "WORKBASKET_ID"),
+    // @Result(property = "accessId", column = "ACCESS_ID"),
+    // @Result(property = "permRead", column = "PERM_READ"),
+    // @Result(property = "permOpen", column = "PERM_OPEN"),
+    // @Result(property = "permAppend", column = "PERM_APPEND"),
+    // @Result(property = "permTransfer", column = "PERM_TRANSFER"),
+    // @Result(property = "permDistribute", column = "PERM_DISTRIBUTE"),
+    // @Result(property = "permCustom1", column = "PERM_CUSTOM_1"),
+    // @Result(property = "permCustom2", column = "PERM_CUSTOM_2"),
+    // @Result(property = "permCustom3", column = "PERM_CUSTOM_3"),
+    // @Result(property = "permCustom4", column = "PERM_CUSTOM_4"),
+    // @Result(property = "permCustom5", column = "PERM_CUSTOM_5"),
+    // @Result(property = "permCustom6", column = "PERM_CUSTOM_6"),
+    // @Result(property = "permCustom7", column = "PERM_CUSTOM_7"),
+    // @Result(property = "permCustom8", column = "PERM_CUSTOM_8"),
+    // @Result(property = "permCustom9", column = "PERM_CUSTOM_9"),
+    // @Result(property = "permCustom10", column = "PERM_CUSTOM_10"),
+    // @Result(property = "permCustom11", column = "PERM_CUSTOM_11"),
+    // @Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
+    // List<WorkbasketAccessItemImpl> findByAccessId(@Param("accessId") String accessId);
+
+    @Select("SELECT ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+        + "FROM WORKBASKET_ACCESS_LIST WHERE WORKBASKET_ID = #{id}")
     @Results(value = {
         @Result(property = "id", column = "ID"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
+        @Result(property = "workbasketId", column = "WORKBASKET_ID"),
         @Result(property = "accessId", column = "ACCESS_ID"),
         @Result(property = "permRead", column = "PERM_READ"),
         @Result(property = "permOpen", column = "PERM_OPEN"),
@@ -66,54 +93,32 @@ public interface WorkbasketAccessMapper {
         @Result(property = "permCustom10", column = "PERM_CUSTOM_10"),
         @Result(property = "permCustom11", column = "PERM_CUSTOM_11"),
         @Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
-    List<WorkbasketAccessItemImpl> findByAccessId(@Param("accessId") String accessId);
+    List<WorkbasketAccessItemImpl> findByWorkbasketId(@Param("id") String id);
 
-    @Select("SELECT ID, WORKBASKET_KEY, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+    @Insert("INSERT INTO WORKBASKET_ACCESS_LIST (ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE,  PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12) "
-        + "FROM WORKBASKET_ACCESS_LIST WHERE WORKBASKET_KEY = #{key}")
+        + "VALUES (#{workbasketAccessItem.id}, #{workbasketAccessItem.workbasketId}, #{workbasketAccessItem.accessId}, #{workbasketAccessItem.permRead}, #{workbasketAccessItem.permOpen}, #{workbasketAccessItem.permAppend}, #{workbasketAccessItem.permTransfer}, #{workbasketAccessItem.permDistribute}, #{workbasketAccessItem.permCustom1}, #{workbasketAccessItem.permCustom2}, #{workbasketAccessItem.permCustom3}, #{workbasketAccessItem.permCustom4}, #{workbasketAccessItem.permCustom5}, #{workbasketAccessItem.permCustom6}, #{workbasketAccessItem.permCustom7}, #{workbasketAccessItem.permCustom8}, #{workbasketAccessItem.permCustom9}, #{workbasketAccessItem.permCustom10}, #{workbasketAccessItem.permCustom11}, #{workbasketAccessItem.permCustom12})")
-    @Results(value = {
-        @Result(property = "id", column = "ID"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
-        @Result(property = "accessId", column = "ACCESS_ID"),
-        @Result(property = "permRead", column = "PERM_READ"),
-        @Result(property = "permOpen", column = "PERM_OPEN"),
-        @Result(property = "permAppend", column = "PERM_APPEND"),
-        @Result(property = "permTransfer", column = "PERM_TRANSFER"),
-        @Result(property = "permDistribute", column = "PERM_DISTRIBUTE"),
-        @Result(property = "permCustom1", column = "PERM_CUSTOM_1"),
-        @Result(property = "permCustom2", column = "PERM_CUSTOM_2"),
-        @Result(property = "permCustom3", column = "PERM_CUSTOM_3"),
-        @Result(property = "permCustom4", column = "PERM_CUSTOM_4"),
-        @Result(property = "permCustom5", column = "PERM_CUSTOM_5"),
-        @Result(property = "permCustom6", column = "PERM_CUSTOM_6"),
-        @Result(property = "permCustom7", column = "PERM_CUSTOM_7"),
-        @Result(property = "permCustom8", column = "PERM_CUSTOM_8"),
-        @Result(property = "permCustom9", column = "PERM_CUSTOM_9"),
-        @Result(property = "permCustom10", column = "PERM_CUSTOM_10"),
-        @Result(property = "permCustom11", column = "PERM_CUSTOM_11"),
-        @Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
-    List<WorkbasketAccessItemImpl> findByWorkbasketKey(@Param("key") String key);
-
-    @Insert("INSERT INTO WORKBASKET_ACCESS_LIST (ID, WORKBASKET_KEY, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE,  PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12) "
-        + "VALUES (#{workbasketAccessItem.id}, #{workbasketAccessItem.workbasketKey}, #{workbasketAccessItem.accessId}, #{workbasketAccessItem.permRead}, #{workbasketAccessItem.permOpen}, #{workbasketAccessItem.permAppend}, #{workbasketAccessItem.permTransfer}, #{workbasketAccessItem.permDistribute}, #{workbasketAccessItem.permCustom1}, #{workbasketAccessItem.permCustom2}, #{workbasketAccessItem.permCustom3}, #{workbasketAccessItem.permCustom4}, #{workbasketAccessItem.permCustom5}, #{workbasketAccessItem.permCustom6}, #{workbasketAccessItem.permCustom7}, #{workbasketAccessItem.permCustom8}, #{workbasketAccessItem.permCustom9}, #{workbasketAccessItem.permCustom10}, #{workbasketAccessItem.permCustom11}, #{workbasketAccessItem.permCustom12})")
     @Options(keyProperty = "id", keyColumn = "ID")
     void insert(@Param("workbasketAccessItem") WorkbasketAccessItemImpl workbasketAccessItem);
 
-    @Update("UPDATE WORKBASKET_ACCESS_LIST SET WORKBASKET_KEY = #{workbasketAccessItem.workbasketKey}, ACCESS_ID = #{workbasketAccessItem.accessId}, PERM_READ = #{workbasketAccessItem.permRead}, PERM_OPEN = #{workbasketAccessItem.permOpen}, PERM_APPEND = #{workbasketAccessItem.permAppend}, PERM_TRANSFER = #{workbasketAccessItem.permTransfer}, PERM_DISTRIBUTE = #{workbasketAccessItem.permDistribute}, PERM_CUSTOM_1 = #{workbasketAccessItem.permCustom1}, PERM_CUSTOM_2 = #{workbasketAccessItem.permCustom2}, PERM_CUSTOM_3 = #{workbasketAccessItem.permCustom3}, PERM_CUSTOM_4 = #{workbasketAccessItem.permCustom4}, PERM_CUSTOM_5 = #{workbasketAccessItem.permCustom5}, PERM_CUSTOM_6 = #{workbasketAccessItem.permCustom6}, PERM_CUSTOM_7 = #{workbasketAccessItem.permCustom7}, PERM_CUSTOM_8 = #{workbasketAccessItem.permCustom8}, PERM_CUSTOM_9 = #{workbasketAccessItem.permCustom9}, PERM_CUSTOM_10 = #{workbasketAccessItem.permCustom10}, PERM_CUSTOM_11 = #{workbasketAccessItem.permCustom11}, PERM_CUSTOM_12 = #{workbasketAccessItem.permCustom12} "
+    @Update("UPDATE WORKBASKET_ACCESS_LIST SET WORKBASKET_ID = #{workbasketAccessItem.workbasketId}, ACCESS_ID = #{workbasketAccessItem.accessId}, PERM_READ = #{workbasketAccessItem.permRead}, PERM_OPEN = #{workbasketAccessItem.permOpen}, PERM_APPEND = #{workbasketAccessItem.permAppend}, PERM_TRANSFER = #{workbasketAccessItem.permTransfer}, PERM_DISTRIBUTE = #{workbasketAccessItem.permDistribute}, PERM_CUSTOM_1 = #{workbasketAccessItem.permCustom1}, PERM_CUSTOM_2 = #{workbasketAccessItem.permCustom2}, PERM_CUSTOM_3 = #{workbasketAccessItem.permCustom3}, PERM_CUSTOM_4 = #{workbasketAccessItem.permCustom4}, PERM_CUSTOM_5 = #{workbasketAccessItem.permCustom5}, PERM_CUSTOM_6 = #{workbasketAccessItem.permCustom6}, PERM_CUSTOM_7 = #{workbasketAccessItem.permCustom7}, PERM_CUSTOM_8 = #{workbasketAccessItem.permCustom8}, PERM_CUSTOM_9 = #{workbasketAccessItem.permCustom9}, PERM_CUSTOM_10 = #{workbasketAccessItem.permCustom10}, PERM_CUSTOM_11 = #{workbasketAccessItem.permCustom11}, PERM_CUSTOM_12 = #{workbasketAccessItem.permCustom12} "
         + "WHERE id = #{workbasketAccessItem.id}")
     void update(@Param("workbasketAccessItem") WorkbasketAccessItemImpl workbasketAccessItem);
 
     @Delete("DELETE FROM WORKBASKET_ACCESS_LIST where id = #{id}")
     void delete(@Param("id") String id);
 
-    @Delete("DELETE FROM WORKBASKET_ACCESS_LIST where WORKBASKET_KEY = #{workbasketKey}")
+    @Delete("DELETE FROM WORKBASKET_ACCESS_LIST where WORKBASKET_ID = #{workbasketId}")
-    void deleteAllForWorkbasketkey(@Param("workbasketKey") String workbasketKey);
+    void deleteAllForWorkbasketkey(@Param("workbasketId") String workbasketId);
 
     @Select("<script>SELECT MAX(PERM_READ) AS P_READ, MAX(PERM_OPEN) AS P_OPEN, MAX(PERM_APPEND) AS P_APPEND, MAX(PERM_TRANSFER) AS P_TRANSFER, MAX(PERM_DISTRIBUTE) AS P_DISTRIBUTE, MAX(PERM_CUSTOM_1) AS P_CUSTOM_1, MAX(PERM_CUSTOM_2) AS P_CUSTOM_2, MAX(PERM_CUSTOM_3) AS P_CUSTOM_3, MAX(PERM_CUSTOM_4) AS P_CUSTOM_4, MAX(PERM_CUSTOM_5) AS P_CUSTOM_5, MAX(PERM_CUSTOM_6) AS P_CUSTOM_6, MAX(PERM_CUSTOM_7) AS P_CUSTOM_7, MAX(PERM_CUSTOM_8) AS P_CUSTOM_8, MAX(PERM_CUSTOM_9) AS P_CUSTOM_9, MAX(PERM_CUSTOM_10) AS P_CUSTOM_10, MAX(PERM_CUSTOM_11) AS P_CUSTOM_11, MAX(PERM_CUSTOM_12) AS P_CUSTOM_12 "
         + "FROM WORKBASKET_ACCESS_LIST "
-        + "WHERE WORKBASKET_KEY = #{workbasketKey} "
+        + "WHERE WORKBASKET_ID = #{workbasketId} "
         + "AND ACCESS_ID IN(<foreach item='item' collection='accessIds' separator=',' >#{item}</foreach>)"
         + "</script>")
     @Results(value = {
+        @Result(property = "id", column = "ID"),
+        @Result(property = "workbasketId", column = "WORKBASKET_ID"),
+        @Result(property = "accessId", column = "ACCESS_ID"),
         @Result(property = "permRead", column = "P_READ"),
         @Result(property = "permOpen", column = "P_OPEN"),
         @Result(property = "permAppend", column = "P_APPEND"),
@@ -132,32 +137,32 @@ public interface WorkbasketAccessMapper {
         @Result(property = "permCustom11", column = "P_CUSTOM_11"),
         @Result(property = "permCustom12", column = "P_CUSTOM_12")})
     WorkbasketAccessItemImpl findByWorkbasketAndAccessId(
-        @Param("workbasketKey") String workbasketKey, @Param("accessIds") List<String> accessIds);
+        @Param("workbasketId") String workbasketId, @Param("accessIds") List<String> accessIds);
 
-    @Select("<script>SELECT ID, WORKBASKET_KEY, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
+    @Select("<script>SELECT a.ID, a.WORKBASKET_ID, a.ACCESS_ID, a.PERM_READ, a.PERM_OPEN, a.PERM_APPEND, a.PERM_TRANSFER, a.PERM_DISTRIBUTE, a.PERM_CUSTOM_1, a.PERM_CUSTOM_2, a.PERM_CUSTOM_3, a.PERM_CUSTOM_4, a.PERM_CUSTOM_5, a.PERM_CUSTOM_6, a.PERM_CUSTOM_7, a.PERM_CUSTOM_8, a.PERM_CUSTOM_9, a.PERM_CUSTOM_10, a.PERM_CUSTOM_11, a.PERM_CUSTOM_12 "
-        + "FROM WORKBASKET_ACCESS_LIST "
+        + "FROM WORKBASKET_ACCESS_LIST a LEFT OUTER JOIN WORKBASKET w on w.ID = a.WORKBASKET_ID "
-        + "WHERE WORKBASKET_KEY = #{workbasketKey} "
+        + "WHERE w.KEY = #{workbasketKey} AND w.DOMAIN = #{domain} "
         + "AND ACCESS_ID IN(<foreach item='item' collection='accessIds' separator=',' >#{item}</foreach>)"
-        + "AND <if test=\"authorization == 'OPEN'\">PERM_OPEN</if>"
+        + "AND <if test=\"authorization == 'OPEN'\">a.PERM_OPEN</if>"
-        + "<if test=\"authorization == 'READ'\">PERM_READ</if>"
+        + "<if test=\"authorization == 'READ'\">a.PERM_READ</if>"
-        + "<if test=\"authorization == 'APPEND'\">PERM_APPEND</if>"
+        + "<if test=\"authorization == 'APPEND'\">a.PERM_APPEND</if>"
-        + "<if test=\"authorization == 'TRANSFER'\">PERM_TRANSFER</if>"
+        + "<if test=\"authorization == 'TRANSFER'\">a.PERM_TRANSFER</if>"
-        + "<if test=\"authorization == 'DISTRIBUTE'\">PERM_DISTRIBUTE</if>"
+        + "<if test=\"authorization == 'DISTRIBUTE'\">a.PERM_DISTRIBUTE</if>"
-        + "<if test=\"authorization == 'CUSTOM_1'\">PERM_CUSTOM_1</if>"
+        + "<if test=\"authorization == 'CUSTOM_1'\">a.PERM_CUSTOM_1</if>"
-        + "<if test=\"authorization == 'CUSTOM_2'\">PERM_CUSTOM_2</if>"
+        + "<if test=\"authorization == 'CUSTOM_2'\">a.PERM_CUSTOM_2</if>"
-        + "<if test=\"authorization == 'CUSTOM_3'\">PERM_CUSTOM_3</if>"
+        + "<if test=\"authorization == 'CUSTOM_3'\">a.PERM_CUSTOM_3</if>"
-        + "<if test=\"authorization == 'CUSTOM_4'\">PERM_CUSTOM_4</if>"
+        + "<if test=\"authorization == 'CUSTOM_4'\">a.PERM_CUSTOM_4</if>"
-        + "<if test=\"authorization == 'CUSTOM_5'\">PERM_CUSTOM_5</if>"
+        + "<if test=\"authorization == 'CUSTOM_5'\">a.PERM_CUSTOM_5</if>"
-        + "<if test=\"authorization == 'CUSTOM_6'\">PERM_CUSTOM_6</if>"
+        + "<if test=\"authorization == 'CUSTOM_6'\">a.PERM_CUSTOM_6</if>"
-        + "<if test=\"authorization == 'CUSTOM_7'\">PERM_CUSTOM_7</if>"
+        + "<if test=\"authorization == 'CUSTOM_7'\">a.PERM_CUSTOM_7</if>"
-        + "<if test=\"authorization == 'CUSTOM_8'\">PERM_CUSTOM_8</if>"
+        + "<if test=\"authorization == 'CUSTOM_8'\">a.PERM_CUSTOM_8</if>"
-        + "<if test=\"authorization == 'CUSTOM_9'\">PERM_CUSTOM_9</if>"
+        + "<if test=\"authorization == 'CUSTOM_9'\">a.PERM_CUSTOM_9</if>"
-        + "<if test=\"authorization == 'CUSTOM_10'\">PERM_CUSTOM_10</if>"
+        + "<if test=\"authorization == 'CUSTOM_10'\">a.PERM_CUSTOM_10</if>"
-        + "<if test=\"authorization == 'CUSTOM_11'\">PERM_CUSTOM_11</if>"
+        + "<if test=\"authorization == 'CUSTOM_11'\">a.PERM_CUSTOM_11</if>"
-        + "<if test=\"authorization == 'CUSTOM_12'\">PERM_CUSTOM_12</if> = 1</script>")
+        + "<if test=\"authorization == 'CUSTOM_12'\">a.PERM_CUSTOM_12</if> = 1</script>")
     @Results(value = {
         @Result(property = "id", column = "ID"),
-        @Result(property = "workbasketKey", column = "WORKBASKET_KEY"),
+        @Result(property = "workbasketId", column = "WORKBASKET_ID"),
         @Result(property = "accessId", column = "ACCESS_ID"),
         @Result(property = "permRead", column = "PERM_READ"),
         @Result(property = "permOpen", column = "PERM_OPEN"),
@@ -176,15 +181,14 @@ public interface WorkbasketAccessMapper {
         @Result(property = "permCustom10", column = "PERM_CUSTOM_10"),
         @Result(property = "permCustom11", column = "PERM_CUSTOM_11"),
         @Result(property = "permCustom12", column = "PERM_CUSTOM_12")})
-    List<WorkbasketAccessItemImpl> findByWorkbasketAndAccessIdAndAuthorization(
+    List<WorkbasketAccessItemImpl> findByWorkbasketAccessByWorkbasketKeyDomainAndAuthorization(
-        @Param("workbasketKey") String workbasketKey, @Param("accessIds") List<String> accessIds,
+        @Param("workbasketKey") String workbasketKey, @Param("domain") String domain,
-        @Param("authorization") String authorization);
+        @Param("accessIds") List<String> accessIds, @Param("authorization") String authorization);
 
-    @Select("<script>SELECT A.ID, A.WORKBASKET_KEY, A.ACCESS_ID, A.PERM_READ, A.PERM_OPEN, A.PERM_APPEND, A.PERM_TRANSFER, A.PERM_DISTRIBUTE, A.PERM_CUSTOM_1, A.PERM_CUSTOM_2, A.PERM_CUSTOM_3, A.PERM_CUSTOM_4, A.PERM_CUSTOM_5, A.PERM_CUSTOM_6, A.PERM_CUSTOM_7, A.PERM_CUSTOM_8, A.PERM_CUSTOM_9, A.PERM_CUSTOM_10, A.PERM_CUSTOM_11, A.PERM_CUSTOM_12 "
+    @Select("<script>SELECT ID, WORKBASKET_ID, ACCESS_ID, PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 "
-        + "FROM WORKBASKET_ACCESS_LIST AS A "
+        + "FROM WORKBASKET_ACCESS_LIST "
-        + "LEFT JOIN WORKBASKET AS W ON A.WORKBASKET_KEY = W.KEY "
+        + "WHERE WORKBASKET_ID = #{workbasketId} "
-        + "WHERE W.ID = #{workbasketId} "
+        + "AND ACCESS_ID IN(<foreach item='item' collection='accessIds' separator=',' >#{item}</foreach>)"
-        + "AND A.ACCESS_ID IN(<foreach item='item' collection='accessIds' separator=',' >#{item}</foreach>)"
         + "AND <if test=\"authorization == 'OPEN'\">PERM_OPEN</if>"
         + "<if test=\"authorization == 'READ'\">PERM_READ</if>"
         + "<if test=\"authorization == 'APPEND'\">PERM_APPEND</if>"

lib/taskana-core/src/main/java/pro/taskana/mappings/WorkbasketMapper.java

@@ -40,7 +40,7 @@ public interface WorkbasketMapper {
         @Result(property = "orgLevel4", column = "ORG_LEVEL_4")})
     WorkbasketImpl findById(@Param("id") String id);
 
-    @Select("SELECT ID, KEY, CREATED, MODIFIED, NAME, DOMAIN, TYPE, DESCRIPTION, OWNER, CUSTOM_1 ,CUSTOM_2 ,CUSTOM_3 ,CUSTOM_4 ,ORG_LEVEL_1 ,ORG_LEVEL_2 ,ORG_LEVEL_3 ,ORG_LEVEL_4 FROM WORKBASKET WHERE KEY = #{key}")
+    @Select("SELECT ID, KEY, CREATED, MODIFIED, NAME, DOMAIN, TYPE, DESCRIPTION, OWNER, CUSTOM_1 ,CUSTOM_2 ,CUSTOM_3 ,CUSTOM_4 ,ORG_LEVEL_1 ,ORG_LEVEL_2 ,ORG_LEVEL_3 ,ORG_LEVEL_4 FROM WORKBASKET WHERE KEY = #{key} and DOMAIN = #{domain}")
     @Results(value = {@Result(property = "id", column = "ID"),
         @Result(property = "key", column = "KEY"),
         @Result(property = "created", column = "CREATED"),
@@ -58,7 +58,7 @@ public interface WorkbasketMapper {
         @Result(property = "orgLevel2", column = "ORG_LEVEL_2"),
         @Result(property = "orgLevel3", column = "ORG_LEVEL_3"),
         @Result(property = "orgLevel4", column = "ORG_LEVEL_4")})
-    WorkbasketImpl findByKey(@Param("key") String key);
+    WorkbasketImpl findByKeyAndDomain(@Param("key") String key, @Param("domain") String domain);
 
     @Select("SELECT ID, KEY, NAME, DESCRIPTION, OWNER, DOMAIN, TYPE, ORG_LEVEL_1, ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4 FROM WORKBASKET WHERE ID IN (SELECT TARGET_ID FROM DISTRIBUTION_TARGETS WHERE SOURCE_ID = #{id})")
     @Results(value = {
@@ -91,7 +91,7 @@ public interface WorkbasketMapper {
         @Result(property = "orgLevel4", column = "ORG_LEVEL_4")})
     List<WorkbasketSummaryImpl> findDistributionSources(@Param("id") String id);
 
-    @Select("SELECT ID, KEY, NAME, DESCRIPTION, OWNER, DOMAIN, TYPE, ORG_LEVEL_1, ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4  FROM WORKBASKET WHERE key = #{key}")
+    @Select("SELECT ID, KEY, NAME, DESCRIPTION, OWNER, DOMAIN, TYPE, ORG_LEVEL_1, ORG_LEVEL_2, ORG_LEVEL_3, ORG_LEVEL_4  FROM WORKBASKET WHERE ID = #{id}")
     @Results(value = {
         @Result(property = "id", column = "ID"),
         @Result(property = "key", column = "KEY"),
@@ -104,7 +104,7 @@ public interface WorkbasketMapper {
         @Result(property = "orgLevel2", column = "ORG_LEVEL_2"),
         @Result(property = "orgLevel3", column = "ORG_LEVEL_3"),
         @Result(property = "orgLevel4", column = "ORG_LEVEL_4")})
-    List<WorkbasketSummaryImpl> findSummaryByKey(@Param("key") String key);
+    List<WorkbasketSummaryImpl> findSummaryById(@Param("key") String id);
 
     @Select("SELECT * FROM WORKBASKET ORDER BY id")
     @Results(value = {

lib/taskana-core/src/main/resources/sql/taskana-schema.sql

@@ -1,61 +1,47 @@
 CREATE TABLE TASKANA_SCHEMA_VERSION(
-	ID CHAR(40) NOT NULL,
+        ID CHAR(40) NOT NULL,
-	VERSION VARCHAR(255) NOT NULL,
+        VERSION VARCHAR(255) NOT NULL,
-	PRIMARY KEY (ID)
+        PRIMARY KEY (ID)
 );
 INSERT INTO TASKANA_SCHEMA_VERSION VALUES ('1', '0.0.1');
 
-CREATE TABLE TASK (
+
-	ID CHAR(40) NOT NULL,
+CREATE TABLE CLASSIFICATION(
-	CREATED TIMESTAMP NULL,
+    ID CHAR(40) NOT NULL,
-	CLAIMED TIMESTAMP NULL,
+    KEY VARCHAR(32) NOT NULL,
-	COMPLETED TIMESTAMP NULL,
+    PARENT_ID VARCHAR(40) NOT NULL,
-	MODIFIED TIMESTAMP NULL,
+    CATEGORY VARCHAR(32),
-	PLANNED TIMESTAMP NULL,
+    TYPE VARCHAR(32),
-	DUE TIMESTAMP NULL,
+    DOMAIN VARCHAR(255) NOT NULL,
-	NAME VARCHAR(255) NULL,
+    VALID_IN_DOMAIN BOOLEAN NOT NULL,
-	DESCRIPTION VARCHAR(1024) NULL,
+    CREATED TIMESTAMP NULL,
-	NOTE VARCHAR(4096) NULL,
+    NAME VARCHAR(255) NULL,
-	PRIORITY INT NULL,
+    DESCRIPTION VARCHAR(255) NULL,
-	STATE VARCHAR(20) NULL,
+    PRIORITY INT NULL,
-	CLASSIFICATION_KEY VARCHAR(32) NULL,
+    SERVICE_LEVEL VARCHAR(255) NULL,
-	CLASSIFICATION_CATEGORY VARCHAR(32),
+    APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
-	WORKBASKET_KEY VARCHAR(64) NULL,
+    CUSTOM_1 VARCHAR(255) NULL,
-	DOMAIN VARCHAR(32) NULL,
+    CUSTOM_2 VARCHAR(255) NULL,
-	BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+    CUSTOM_3 VARCHAR(255) NULL,
-    PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+    CUSTOM_4 VARCHAR(255) NULL,
-	OWNER VARCHAR(255) NULL,
+    CUSTOM_5 VARCHAR(255) NULL,
-	POR_COMPANY VARCHAR(32) NOT NULL,
+    CUSTOM_6 VARCHAR(255) NULL,
-    POR_SYSTEM VARCHAR(32) NOT NULL,
+    CUSTOM_7 VARCHAR(255) NULL,
-    POR_INSTANCE VARCHAR(32) NOT NULL,
+    CUSTOM_8 VARCHAR(255) NULL,
-    POR_TYPE VARCHAR(32) NOT NULL,
+    PRIMARY KEY (ID),
-    POR_VALUE VARCHAR(128) NOT NULL,
+    CONSTRAINT UC_CLASS_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
-	IS_READ BOOLEAN NOT NULL,
-	IS_TRANSFERRED BOOLEAN NOT NULL,
-	CUSTOM_ATTRIBUTES BLOB NULL,
-	CUSTOM_1 VARCHAR(255) NULL,
-	CUSTOM_2 VARCHAR(255) NULL,
-	CUSTOM_3 VARCHAR(255) NULL,
-	CUSTOM_4 VARCHAR(255) NULL,
-	CUSTOM_5 VARCHAR(255) NULL,
-	CUSTOM_6 VARCHAR(255) NULL,
-	CUSTOM_7 VARCHAR(255) NULL,
-	CUSTOM_8 VARCHAR(255) NULL,
-	CUSTOM_9 VARCHAR(255) NULL,
-	CUSTOM_10 VARCHAR(255) NULL,
-	PRIMARY KEY (ID)
 );
 
 CREATE TABLE WORKBASKET(
-	ID CHAR(40) NOT NULL,
+    ID CHAR(40) NOT NULL,
-	KEY VARCHAR(64) NOT NULL,
+    KEY VARCHAR(64) NOT NULL,
-	CREATED TIMESTAMP NULL,
+    CREATED TIMESTAMP NULL,
-	MODIFIED TIMESTAMP NULL,
+    MODIFIED TIMESTAMP NULL,
-	NAME VARCHAR(255) NOT NULL,
+    NAME VARCHAR(255) NOT NULL,
-	DOMAIN VARCHAR(32) NOT NULL,
+    DOMAIN VARCHAR(32) NOT NULL,
-	TYPE VARCHAR(16) NOT NULL,
+    TYPE VARCHAR(16) NOT NULL,
-	DESCRIPTION VARCHAR(255) NULL,
+    DESCRIPTION VARCHAR(255) NULL,
-	OWNER VARCHAR(255) NULL,
+    OWNER VARCHAR(255) NULL,
     CUSTOM_1 VARCHAR(255) NULL,
     CUSTOM_2 VARCHAR(255) NULL,
     CUSTOM_3 VARCHAR(255) NULL,
@@ -64,71 +50,92 @@ CREATE TABLE WORKBASKET(
     ORG_LEVEL_2 VARCHAR(255) NULL,
     ORG_LEVEL_3 VARCHAR(255) NULL,
     ORG_LEVEL_4 VARCHAR(255) NULL,
-	PRIMARY KEY (ID),
+    PRIMARY KEY (ID),
-	CONSTRAINT UC_NAME UNIQUE (ID)
+    CONSTRAINT WB_KEY_DOMAIN UNIQUE (KEY, DOMAIN)
+);
+
+CREATE TABLE TASK (
+        ID CHAR(40) NOT NULL,
+        CREATED TIMESTAMP NULL,
+        CLAIMED TIMESTAMP NULL,
+        COMPLETED TIMESTAMP NULL,
+        MODIFIED TIMESTAMP NULL,
+        PLANNED TIMESTAMP NULL,
+        DUE TIMESTAMP NULL,
+        NAME VARCHAR(255) NULL,
+        DESCRIPTION VARCHAR(1024) NULL,
+        NOTE VARCHAR(4096) NULL,
+        PRIORITY INT NULL,
+        STATE VARCHAR(20) NULL,
+        CLASSIFICATION_CATEGORY VARCHAR(32) NULL,
+        CLASSIFICATION_KEY VARCHAR(32) NULL,
+        CLASSIFICATION_ID CHAR(40) NULL,
+        WORKBASKET_ID CHAR(40) NULL,
+        WORKBASKET_KEY VARCHAR(64) NULL,
+        DOMAIN VARCHAR(32) NULL,
+        BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+        PARENT_BUSINESS_PROCESS_ID VARCHAR(128) NULL,
+        OWNER VARCHAR(255) NULL,
+        POR_COMPANY VARCHAR(32) NOT NULL,
+        POR_SYSTEM VARCHAR(32) NOT NULL,
+        POR_INSTANCE VARCHAR(32) NOT NULL,
+        POR_TYPE VARCHAR(32) NOT NULL,
+        POR_VALUE VARCHAR(128) NOT NULL,
+        IS_READ BOOLEAN NOT NULL,
+        IS_TRANSFERRED BOOLEAN NOT NULL,
+        CUSTOM_ATTRIBUTES BLOB NULL,
+        CUSTOM_1 VARCHAR(255) NULL,
+        CUSTOM_2 VARCHAR(255) NULL,
+        CUSTOM_3 VARCHAR(255) NULL,
+        CUSTOM_4 VARCHAR(255) NULL,
+        CUSTOM_5 VARCHAR(255) NULL,
+        CUSTOM_6 VARCHAR(255) NULL,
+        CUSTOM_7 VARCHAR(255) NULL,
+        CUSTOM_8 VARCHAR(255) NULL,
+        CUSTOM_9 VARCHAR(255) NULL,
+        CUSTOM_10 VARCHAR(255) NULL,
+        PRIMARY KEY (ID),
+        CONSTRAINT TASK_WB FOREIGN KEY  (WORKBASKET_ID) REFERENCES WORKBASKET ON DELETE NO ACTION,
+        CONSTRAINT TASK_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
 );
 
 CREATE TABLE DISTRIBUTION_TARGETS(
-	SOURCE_ID CHAR(40) NOT NULL,
+        SOURCE_ID CHAR(40) NOT NULL,
-	TARGET_ID CHAR(40) NOT NULL,
+        TARGET_ID CHAR(40) NOT NULL,
-	PRIMARY KEY (SOURCE_ID, TARGET_ID)
+        PRIMARY KEY (SOURCE_ID, TARGET_ID)
-);
-
-CREATE TABLE CLASSIFICATION(
-	ID CHAR(40) NOT NULL,
-	KEY VARCHAR(32) NOT NULL,
-	PARENT_ID VARCHAR(40) NOT NULL,
-	CATEGORY VARCHAR(32),
-    TYPE VARCHAR(32),
-    DOMAIN VARCHAR(255) NOT NULL,
-    VALID_IN_DOMAIN BOOLEAN NOT NULL,
-	CREATED TIMESTAMP NULL,
-	NAME VARCHAR(255) NULL,
-	DESCRIPTION VARCHAR(255) NULL,
-	PRIORITY INT NULL,
-	SERVICE_LEVEL VARCHAR(255) NULL,
-	APPLICATION_ENTRY_POINT VARCHAR(255) NULL,
-	CUSTOM_1 VARCHAR(255) NULL,
-	CUSTOM_2 VARCHAR(255) NULL,
-	CUSTOM_3 VARCHAR(255) NULL,
-	CUSTOM_4 VARCHAR(255) NULL,
-	CUSTOM_5 VARCHAR(255) NULL,
-	CUSTOM_6 VARCHAR(255) NULL,
-	CUSTOM_7 VARCHAR(255) NULL,
-	CUSTOM_8 VARCHAR(255) NULL
 );
 
 CREATE TABLE WORKBASKET_ACCESS_LIST(
-	ID CHAR(40) NOT NULL,
+        ID CHAR(40) NOT NULL,
-	WORKBASKET_KEY VARCHAR(64) NOT NULL,
+        WORKBASKET_ID CHAR(40) NOT NULL,
-	ACCESS_ID VARCHAR(255) NULL,
+        ACCESS_ID VARCHAR(255) NULL,
-	PERM_READ BOOLEAN NOT NULL,
+        PERM_READ BOOLEAN NOT NULL,
-	PERM_OPEN BOOLEAN NOT NULL,
+        PERM_OPEN BOOLEAN NOT NULL,
-	PERM_APPEND BOOLEAN NOT NULL,
+        PERM_APPEND BOOLEAN NOT NULL,
-	PERM_TRANSFER BOOLEAN NOT NULL,
+        PERM_TRANSFER BOOLEAN NOT NULL,
-	PERM_DISTRIBUTE BOOLEAN NOT NULL,
+        PERM_DISTRIBUTE BOOLEAN NOT NULL,
-	PERM_CUSTOM_1 BOOLEAN NOT NULL,
+        PERM_CUSTOM_1 BOOLEAN NOT NULL,
-	PERM_CUSTOM_2 BOOLEAN NOT NULL,
+        PERM_CUSTOM_2 BOOLEAN NOT NULL,
-	PERM_CUSTOM_3 BOOLEAN NOT NULL,
+        PERM_CUSTOM_3 BOOLEAN NOT NULL,
-	PERM_CUSTOM_4 BOOLEAN NOT NULL,
+        PERM_CUSTOM_4 BOOLEAN NOT NULL,
-	PERM_CUSTOM_5 BOOLEAN NOT NULL,
+        PERM_CUSTOM_5 BOOLEAN NOT NULL,
-	PERM_CUSTOM_6 BOOLEAN NOT NULL,
+        PERM_CUSTOM_6 BOOLEAN NOT NULL,
-	PERM_CUSTOM_7 BOOLEAN NOT NULL,
+        PERM_CUSTOM_7 BOOLEAN NOT NULL,
-	PERM_CUSTOM_8 BOOLEAN NOT NULL,
+        PERM_CUSTOM_8 BOOLEAN NOT NULL,
-	PERM_CUSTOM_9 BOOLEAN NOT NULL,
+        PERM_CUSTOM_9 BOOLEAN NOT NULL,
-	PERM_CUSTOM_10 BOOLEAN NOT NULL,
+        PERM_CUSTOM_10 BOOLEAN NOT NULL,
-	PERM_CUSTOM_11 BOOLEAN NOT NULL,
+        PERM_CUSTOM_11 BOOLEAN NOT NULL,
-	PERM_CUSTOM_12 BOOLEAN NOT NULL,
+        PERM_CUSTOM_12 BOOLEAN NOT NULL,
-	PRIMARY KEY (ID)
+        PRIMARY KEY (ID)
 );
 
 CREATE TABLE OBJECT_REFERENCE(
-	ID CHAR(40) NOT NULL,
+        ID CHAR(40) NOT NULL,
-	COMPANY VARCHAR(32) NOT NULL,
+        COMPANY VARCHAR(32) NOT NULL,
-	SYSTEM VARCHAR(32) NOT NULL,
+        SYSTEM VARCHAR(32) NOT NULL,
-	SYSTEM_INSTANCE VARCHAR(32) NOT NULL,
+        SYSTEM_INSTANCE VARCHAR(32) NOT NULL,
-	TYPE VARCHAR(32) NOT NULL,
+        TYPE VARCHAR(32) NOT NULL,
-	VALUE VARCHAR(128) NOT NULL
+        VALUE VARCHAR(128) NOT NULL
 );
 
 CREATE TABLE ATTACHMENT(
@@ -137,6 +144,7 @@ CREATE TABLE ATTACHMENT(
     CREATED TIMESTAMP NULL,
     MODIFIED TIMESTAMP NULL,
     CLASSIFICATION_KEY VARCHAR(32) NULL,
+    CLASSIFICATION_ID CHAR(40) NULL,
     REF_COMPANY VARCHAR(32) NOT NULL,
     REF_SYSTEM VARCHAR(32) NOT NULL,
     REF_INSTANCE VARCHAR(32) NOT NULL,
@@ -145,5 +153,6 @@ CREATE TABLE ATTACHMENT(
     CHANNEL VARCHAR(64) NULL,
     RECEIVED TIMESTAMP NULL,
     CUSTOM_ATTRIBUTES BLOB NULL,
-    PRIMARY KEY (ID)
+    PRIMARY KEY (ID),
+    CONSTRAINT ATT_CLASS FOREIGN KEY (CLASSIFICATION_ID) REFERENCES CLASSIFICATION ON DELETE NO ACTION
 );

lib/taskana-core/src/test/java/acceptance/task/CreateTaskAccTest.java

@@ -47,7 +47,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         Task createdTask = taskService.createTask(newTask);
@@ -79,7 +79,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         ConcurrencyException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("L12010");
         newTask.addAttachment(createAttachment("DOCTYPE_DEFAULT",
             createObjectReference("COMPANY_A", "SYSTEM_B", "INSTANCE_B", "ArchiveId",
@@ -109,7 +109,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException, TaskNotFoundException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("L12010");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         newTask.addAttachment(createAttachment("DOCTYPE_DEFAULT",
@@ -214,7 +214,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
     }
 
     private Task makeNewTask(TaskService taskService) throws ClassificationNotFoundException {
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("L12010");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         newTask.setClassificationKey("L12010");
@@ -230,7 +230,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         newTask.setName("Test Name");
@@ -249,7 +249,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         newTask.setName("Test Name");
@@ -283,7 +283,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("GPK_KSC");
+        Task newTask = taskService.newTask("GPK_KSC", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         taskService.createTask(newTask);
@@ -298,7 +298,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException {
 
         TaskService taskService = taskanaEngine.getTaskService();
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         try {
             taskService.createTask(newTask);
@@ -308,7 +308,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         }
 
         // Exception
-        newTask = taskService.newTask("USER_1_1");
+        newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", null));
         try {
@@ -319,7 +319,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         }
 
         // Exception
-        newTask = taskService.newTask("USER_1_1");
+        newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", null, "1234567"));
         try {
@@ -330,7 +330,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         }
 
         // Exception
-        newTask = taskService.newTask("USER_1_1");
+        newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", null, "VNR", "1234567"));
         try {
@@ -341,7 +341,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         }
 
         // Exception
-        newTask = taskService.newTask("USER_1_1");
+        newTask = taskService.newTask("USER_1_1", "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", null, "INSTANCE_A", "VNR", "1234567"));
         try {
@@ -352,7 +352,7 @@ public class CreateTaskAccTest extends AbstractAccTest {
         }
 
         // Exception
-        newTask = taskService.newTask("USER_1_1");
+        newTask = taskService.newTask("WBI:100000000000000000000000000000000006");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference(null, "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         try {
@@ -374,9 +374,9 @@ public class CreateTaskAccTest extends AbstractAccTest {
         TaskService taskService = taskanaEngine.getTaskService();
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
 
-        Workbasket workbasket = workbasketService.getWorkbasketByKey("USER_1_1");
+        Workbasket workbasket = workbasketService.getWorkbasket("USER_1_1", "DOMAIN_A");
 
-        Task newTask = taskService.newTask("USER_1_1");
+        Task newTask = taskService.newTask("WBI:100000000000000000000000000000000006");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         Task createdTask = taskService.createTask(newTask);

lib/taskana-core/src/test/java/acceptance/task/QueryTasksAccTest.java

@@ -4,6 +4,7 @@ import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
 
 import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -15,6 +16,7 @@ import org.junit.runner.RunWith;
 
 import acceptance.AbstractAccTest;
 import pro.taskana.BaseQuery.SortDirection;
+import pro.taskana.KeyDomain;
 import pro.taskana.TaskService;
 import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
@@ -134,48 +136,26 @@ public class QueryTasksAccTest extends AbstractAccTest {
         userName = "teamlead_1",
         groupNames = {"group_1"})
     @Test
-    public void testQueryForWorkbasketKey()
+    public void testQueryForWorkbasketKeyDomain()
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
+        List<KeyDomain> workbasketIdentifiers = Arrays.asList(new KeyDomain("GPK_KSC", "DOMAIN_A"),
+            new KeyDomain("USER_1_2", "DOMAIN_A"));
 
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyLike("user%")
+            .workbasketKeyDomainIn(workbasketIdentifiers.toArray(new KeyDomain[0]))
             .list();
-        assertThat(results.size(), equalTo(22));
+        assertThat(results.size(), equalTo(42));
 
         String[] ids = results.stream()
-            .map(t -> t.getWorkbasketSummary().getKey())
+            .map(t -> t.getWorkbasketSummary().getId())
             .collect(Collectors.toList())
             .toArray(new String[0]);
 
         List<TaskSummary> result2 = taskService.createTaskQuery()
-            .workbasketKeyIn(ids)
+            .workbasketIdIn(ids)
             .list();
-        assertThat(result2.size(), equalTo(22));
+        assertThat(result2.size(), equalTo(42));
-    }
-
-    @WithAccessId(
-        userName = "teamlead_1",
-        groupNames = {"group_1"})
-    @Test
-    public void testQueryForDomain()
-        throws SQLException, NotAuthorizedException, InvalidArgumentException {
-        TaskService taskService = taskanaEngine.getTaskService();
-
-        List<TaskSummary> results = taskService.createTaskQuery()
-            .domainLike("dom%b")
-            .list();
-        assertThat(results.size(), equalTo(4));
-
-        String[] ids = results.stream()
-            .map(TaskSummary::getDomain)
-            .collect(Collectors.toList())
-            .toArray(new String[0]);
-
-        List<TaskSummary> result2 = taskService.createTaskQuery()
-            .domainIn(ids)
-            .list();
-        assertThat(result2.size(), equalTo(4));
     }
 
     @WithAccessId(

lib/taskana-core/src/test/java/acceptance/task/QueryTasksByWorkbasketAccTest.java

@@ -1,19 +1,16 @@
 package acceptance.task;
 
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
 import java.sql.SQLException;
-import java.util.List;
 
 import org.h2.store.fs.FileUtils;
 import org.junit.AfterClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import acceptance.AbstractAccTest;
+import pro.taskana.KeyDomain;
 import pro.taskana.TaskService;
-import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.NotAuthorizedException;
 import pro.taskana.exceptions.NotAuthorizedToQueryWorkbasketException;
@@ -30,6 +27,7 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest {
         super();
     }
 
+    @Ignore  // BB
     @WithAccessId(
         userName = "user_1_1",
         groupNames = {"group_1"})
@@ -38,10 +36,11 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         taskService.createTaskQuery()
-            .workbasketKeyIn("USER_2_1")
+            .workbasketKeyDomainIn(new KeyDomain("USER_2_1", "DOMAIN_A"))
             .list();
     }
 
+    @Ignore  // BB
     @WithAccessId(
         userName = "user_1_1",
         groupNames = {"group_1"})
@@ -50,37 +49,10 @@ public class QueryTasksByWorkbasketAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         taskService.createTaskQuery()
-            .workbasketKeyIn("USER_1_1", "USER_2_1")
+            .workbasketKeyDomainIn(new KeyDomain("USER_1_1", "DOMAIN_A"), new KeyDomain("USER_2_1", "DOMAIN_A"))
             .list();
     }
 
-    @WithAccessId(userName = "user_1_1")
-    @Test
-    public void testQueryAllTasksForDomains() throws NotAuthorizedException {
-        TaskService taskService = taskanaEngine.getTaskService();
-        List<TaskSummary> results = taskService.createTaskQuery()
-            .domainIn("DOMAIN_B", "", "DOMAIN_A")
-            .list();
-        assertThat(results.size(), equalTo(64));
-
-        results = taskService.createTaskQuery()
-            .domainIn("DOMAIN_A")
-            .workbasketKeyIn("USER_1_1")
-            .list();
-        assertThat(results.size(), equalTo(2));
-    }
-
-    @WithAccessId(userName = "user_1_1")
-    @Test
-    public void testQueryTasksForWorkbasket() throws NotAuthorizedException {
-        TaskService taskService = taskanaEngine.getTaskService();
-        List<TaskSummary> results = taskService.createTaskQuery()
-            .domainIn("DOMAIN_A")
-            .workbasketKeyIn("USER_1_1")
-            .list();
-        assertThat(results.size(), equalTo(2));
-    }
-
     @AfterClass
     public static void cleanUpClass() {
         FileUtils.deleteRecursive("~/data", true);

lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithPaginationAccTest.java

@@ -13,6 +13,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import acceptance.AbstractAccTest;
+import pro.taskana.KeyDomain;
 import pro.taskana.TaskService;
 import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
@@ -39,7 +40,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .list(0, 10);
         assertThat(results.size(), equalTo(10));
     }
@@ -52,7 +53,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .list(10, 10);
         assertThat(results.size(), equalTo(10));
     }
@@ -67,19 +68,19 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
 
         // both will be 0, working
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .list(-1, -3);
         assertThat(results.size(), equalTo(0));
 
         // limit will be 0
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .list(1, -3);
         assertThat(results.size(), equalTo(0));
 
         // offset will be 0
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .list(-1, 3);
         assertThat(results.size(), equalTo(3));
     }
@@ -96,7 +97,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         int pageNumber = 1;
         int pageSize = 4;
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(4));
 
@@ -104,7 +105,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 3;
         pageSize = 1;
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(1));
 
@@ -112,7 +113,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 0;
         pageSize = 100;
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(22));
 
@@ -120,7 +121,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 2;
         pageSize = 10;
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(2));
     }
@@ -137,7 +138,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         int pageNumber = 1;
         int pageSize = 0;
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(0));
 
@@ -145,7 +146,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         pageNumber = 1;
         pageSize = -1;
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(0));
 
@@ -153,7 +154,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         pageNumber = -1;
         pageSize = 10;
         results = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
         assertThat(results.size(), equalTo(10));
     }
@@ -179,7 +180,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         int pageNumber = 5;
         int pageSize = 10;
         taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .listPage(pageNumber, pageSize);
     }
 
@@ -191,7 +192,7 @@ public class QueryTasksWithPaginationAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         long count = taskService.createTaskQuery()
-            .workbasketKeyIn("GPK_KSC")
+            .workbasketKeyDomainIn(new KeyDomain("GPK_KSC", "DOMAIN_A"))
             .count();
         assertThat(count, equalTo(22L));
     }

lib/taskana-core/src/test/java/acceptance/task/QueryTasksWithSortingAccTest.java

@@ -14,6 +14,7 @@ import org.junit.runner.RunWith;
 
 import acceptance.AbstractAccTest;
 import pro.taskana.BaseQuery.SortDirection;
+import pro.taskana.KeyDomain;
 import pro.taskana.TaskService;
 import pro.taskana.TaskSummary;
 import pro.taskana.exceptions.InvalidArgumentException;
@@ -43,7 +44,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("key5")
+            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
             .orderByModified(desc)
             .orderByDomain(null)
             .list();
@@ -66,7 +67,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("key5")
+            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
             .orderByDomain(asc)
             .orderByName(asc)
             .orderByCreated(null)
@@ -98,7 +99,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("key5")
+            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
             .orderByPrimaryObjectReferenceSystem(SortDirection.DESCENDING)
             .orderByNote(null)
             .orderByDue(null)
@@ -124,7 +125,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("key5")
+            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
             .orderByPrimaryObjectReferenceSystemInstance(desc)
             .orderByParentBusinessProcessId(asc)
             .orderByPlanned(asc)
@@ -150,7 +151,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
-            .workbasketKeyIn("key5")
+            .workbasketKeyDomainIn(new KeyDomain("key5", "DOMAIN_B"))
             .orderByPrimaryObjectReferenceCompany(desc)
             .orderByClaimed(asc)
             .list();
@@ -178,7 +179,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         List<TaskSummary> results = taskService.createTaskQuery()
             .stateIn(TaskState.READY)
             .orderByWorkbasketKey(null)
-            .workbasketKeyIn("key5")
+            .workbasketIdIn("5")
             .orderByPriority(desc)
             .orderByPrimaryObjectReferenceValue(asc)
             .orderByCompleted(desc)
@@ -204,7 +205,7 @@ public class QueryTasksWithSortingAccTest extends AbstractAccTest {
         TaskService taskService = taskanaEngine.getTaskService();
         List<TaskSummary> results = taskService.createTaskQuery()
             .stateIn(TaskState.READY)
-            .workbasketKeyIn("key5")
+            .workbasketIdIn("5")
             .orderByBusinessProcessId(asc)
             .orderByClassificationKey(null)
             .orderByPrimaryObjectReferenceType(SortDirection.DESCENDING)

lib/taskana-core/src/test/java/acceptance/task/TransferTaskAccTest.java

@@ -51,7 +51,7 @@ public class TransferTaskAccTest extends AbstractAccTest {
         userName = "teamlead_1",
         groupNames = {"group_1"})
     @Test
-    public void testTransferTask()
+    public void testTransferTaskToWorkbasketId()
         throws SQLException, NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException,
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException, TaskNotFoundException,
         InvalidStateException, InvalidOwnerException {
@@ -60,7 +60,29 @@ public class TransferTaskAccTest extends AbstractAccTest {
         taskService.claim(task.getId());
         taskService.setTaskRead(task.getId(), true);
 
-        taskService.transfer(task.getId(), "USER_1_1");
+        taskService.transfer(task.getId(), "WBI:100000000000000000000000000000000006");
+
+        Task transferredTask = taskService.getTask("TKI:000000000000000000000000000000000003");
+        assertNotNull(transferredTask);
+        assertTrue(transferredTask.isTransferred());
+        assertFalse(transferredTask.isRead());
+        assertEquals(TaskState.READY, transferredTask.getState());
+    }
+
+    @WithAccessId(
+        userName = "teamlead_1",
+        groupNames = {"group_1"})
+    @Test
+    public void testTransferTaskToWorkbasketKeyDomain()
+        throws SQLException, NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException,
+        WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException, TaskNotFoundException,
+        InvalidStateException, InvalidOwnerException {
+        TaskService taskService = taskanaEngine.getTaskService();
+        Task task = taskService.getTask("TKI:000000000000000000000000000000000003");
+        taskService.claim(task.getId());
+        taskService.setTaskRead(task.getId(), true);
+
+        taskService.transfer(task.getId(), "USER_1_1", "DOMAIN_A");
 
         Task transferredTask = taskService.getTask("TKI:000000000000000000000000000000000003");
         assertNotNull(transferredTask);
@@ -80,7 +102,7 @@ public class TransferTaskAccTest extends AbstractAccTest {
         Task task = taskService.getTask("TKI:000000000000000000000000000000000000");
         String domain1 = task.getDomain();
 
-        Task transferedTask = taskService.transfer(task.getId(), "GPK_B_KSC_1");
+        Task transferedTask = taskService.transfer(task.getId(), "GPK_B_KSC_1", "DOMAIN_B");
 
         assertNotNull(transferedTask);
         assertNotEquals(domain1, transferedTask.getDomain());
@@ -116,7 +138,7 @@ public class TransferTaskAccTest extends AbstractAccTest {
         userName = "teamlead_1",
         groupNames = {"group_1"})
     @Test
-    public void testBulkTransferTask()
+    public void testBulkTransferTaskToWorkbasketById()
         throws SQLException, NotAuthorizedException, InvalidArgumentException, ClassificationNotFoundException,
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException, TaskNotFoundException,
         InvalidStateException, InvalidOwnerException {
@@ -126,10 +148,11 @@ public class TransferTaskAccTest extends AbstractAccTest {
         taskIdList.add("TKI:000000000000000000000000000000000004");
         taskIdList.add("TKI:000000000000000000000000000000000005");
 
-        BulkOperationResults<String, TaskanaException> results = taskService.transferTasks("USER_1_1", taskIdList);
+        BulkOperationResults<String, TaskanaException> results = taskService
+            .transferTasks("WBI:100000000000000000000000000000000006", taskIdList);
         assertFalse(results.containsErrors());
 
-        Workbasket wb = taskanaEngine.getWorkbasketService().getWorkbasketByKey("USER_1_1");
+        Workbasket wb = taskanaEngine.getWorkbasketService().getWorkbasket("USER_1_1", "DOMAIN_A");
         Task transferredTask = taskService.getTask("TKI:000000000000000000000000000000000004");
         assertNotNull(transferredTask);
         assertTrue(transferredTask.isTransferred());
@@ -157,7 +180,7 @@ public class TransferTaskAccTest extends AbstractAccTest {
         WorkbasketNotFoundException, TaskAlreadyExistException, InvalidWorkbasketException, TaskNotFoundException,
         InvalidStateException, InvalidOwnerException {
         TaskService taskService = taskanaEngine.getTaskService();
-        Workbasket wb = taskanaEngine.getWorkbasketService().getWorkbasketByKey("USER_1_1");
+        Workbasket wb = taskanaEngine.getWorkbasketService().getWorkbasket("USER_1_1", "DOMAIN_A");
         Instant before = Instant.now();
         ArrayList<String> taskIdList = new ArrayList<>();
         taskIdList.add("TKI:000000000000000000000000000000000006"); // working
@@ -166,7 +189,8 @@ public class TransferTaskAccTest extends AbstractAccTest {
         taskIdList.add(null);   // InvalidArgument (added with ""), duplicate
         taskIdList.add("TKI:000000000000000000000000000000000099"); // TaskNotFound
 
-        BulkOperationResults<String, TaskanaException> results = taskService.transferTasks("USER_1_1", taskIdList);
+        BulkOperationResults<String, TaskanaException> results = taskService
+            .transferTasks("WBI:100000000000000000000000000000000006", taskIdList);
         assertTrue(results.containsErrors());
         assertThat(results.getErrorMap().values().size(), equalTo(3));
         // react to result

lib/taskana-core/src/test/java/acceptance/workbasket/CreateWorkbasketAccTest.java

@@ -35,10 +35,9 @@ public class CreateWorkbasketAccTest extends AbstractAccTest {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
 
         int before = workbasketService.getWorkbaskets().size();
-        Workbasket workbasket = workbasketService.newWorkbasket("key");
+        Workbasket workbasket = workbasketService.newWorkbasket("key", "novatec");
         workbasket.setName("Megabasket");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workbasket.setOrgLevel1("company");
         workbasketService.createWorkbasket(workbasket);
         Assert.assertEquals(before + 1, workbasketService.getWorkbaskets().size());
@@ -49,10 +48,9 @@ public class CreateWorkbasketAccTest extends AbstractAccTest {
         throws WorkbasketNotFoundException, NotAuthorizedException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
 
-        Workbasket workbasket = workbasketService.newWorkbasket(null);
+        Workbasket workbasket = workbasketService.newWorkbasket(null, "novatec");
         workbasket.setName("Megabasket");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workbasket.setOrgLevel1("company");
         try { // missing key
             workbasketService.createWorkbasket(workbasket);
@@ -60,9 +58,8 @@ public class CreateWorkbasketAccTest extends AbstractAccTest {
         } catch (InvalidWorkbasketException e) {
         }
 
-        workbasket = workbasketService.newWorkbasket("key");
+        workbasket = workbasketService.newWorkbasket("key", "novatec");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workbasket.setOrgLevel1("company");
         try {  // missing name
             workbasketService.createWorkbasket(workbasket);
@@ -70,9 +67,8 @@ public class CreateWorkbasketAccTest extends AbstractAccTest {
         } catch (InvalidWorkbasketException e) {
         }
 
-        workbasket = workbasketService.newWorkbasket("key");
+        workbasket = workbasketService.newWorkbasket("key", "novatec");
         workbasket.setName("Megabasket");
-        workbasket.setDomain("novatec");
         workbasket.setOrgLevel1("company");
         try {  // missing type
             workbasketService.createWorkbasket(workbasket);
@@ -80,7 +76,7 @@ public class CreateWorkbasketAccTest extends AbstractAccTest {
         } catch (InvalidWorkbasketException e) {
         }
 
-        workbasket = workbasketService.newWorkbasket("key");
+        workbasket = workbasketService.newWorkbasket("key", null);
         workbasket.setName("Megabasket");
         workbasket.setType(WorkbasketType.GROUP);
         workbasket.setOrgLevel1("company");

lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java

@@ -42,11 +42,11 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest {
     @Test
     public void testDeleteWorkbasket()
         throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException, InvalidArgumentException {
-        Workbasket wb = workbasketService.getWorkbasketByKey("TEAMLEAD_2");
+        Workbasket wb = workbasketService.getWorkbasket("TEAMLEAD_2", "DOMAIN_A");
         workbasketService.deleteWorkbasket(wb.getId());
 
         try {
-            workbasketService.getWorkbasketByKey("TEAMLEAD_2");
+            workbasketService.getWorkbasket("TEAMLEAD_2", "DOMAIN_A");
             fail("There should be no result for a deleted Workbasket.");
         } catch (WorkbasketNotFoundException e) {
             // Workbasket is deleted
@@ -57,14 +57,14 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest {
     @Test
     public void testDeleteWorkbasketAlsoAsDistributionTarget()
         throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException, InvalidArgumentException {
-        Workbasket wb = workbasketService.getWorkbasketByKey("GPK_KSC_1");
+        Workbasket wb = workbasketService.getWorkbasket("GPK_KSC_1", "DOMAIN_A");
         int distTargets = workbasketService.getDistributionTargets("WBI:100000000000000000000000000000000001")
             .size();
 
         // WB deleted
         workbasketService.deleteWorkbasket(wb.getId());
         try {
-            workbasketService.getWorkbasketByKey("GPK_KSC_1");
+            workbasketService.getWorkbasket("GPK_KSC_1", "DOMAIN_A");
             fail("There should be no result for a deleted Workbasket.");
         } catch (WorkbasketNotFoundException e) {
             // Workbasket is deleted
@@ -106,7 +106,7 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest {
     @Test(expected = WorkbasketInUseException.class)
     public void testDeleteWorkbasketWhichIsUsed()
         throws WorkbasketNotFoundException, NotAuthorizedException, WorkbasketInUseException, InvalidArgumentException {
-        Workbasket wb = workbasketService.getWorkbasketByKey("USER_1_1");   // all rights, DOMAIN_A with Tasks
+        Workbasket wb = workbasketService.getWorkbasket("USER_1_1", "DOMAIN_A");   // all rights, DOMAIN_A with Tasks
         workbasketService.deleteWorkbasket(wb.getId());
     }
 

lib/taskana-core/src/test/java/acceptance/workbasket/DistributionTargetsAccTest.java

@@ -38,7 +38,7 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
         userName = "user_1_1",
         groupNames = {"teamlead_1"})
     @Test
-    public void testGetDistributionTargetsSucceeds() throws NotAuthorizedException, WorkbasketNotFoundException {
+    public void testGetDistributionTargetsSucceedsById() throws NotAuthorizedException, WorkbasketNotFoundException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         WorkbasketSummary workbasketSummary = workbasketService.createWorkbasketQuery()
             .keyIn("GPK_KSC")
@@ -58,6 +58,30 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
 
     }
 
+    @WithAccessId(
+        userName = "user_1_1",
+        groupNames = {"teamlead_1"})
+    @Test
+    public void testGetDistributionTargetsSucceeds() throws NotAuthorizedException, WorkbasketNotFoundException {
+        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+        WorkbasketSummary workbasketSummary = workbasketService.createWorkbasketQuery()
+            .keyIn("GPK_KSC")
+            .single();
+
+        List<WorkbasketSummary> retrievedDistributionTargets = workbasketService
+            .getDistributionTargets(workbasketSummary.getKey(), workbasketSummary.getDomain());
+
+        assertEquals(4, retrievedDistributionTargets.size());
+        List<String> expectedTargetIds = new ArrayList<>(
+            Arrays.asList("WBI:100000000000000000000000000000000002", "WBI:100000000000000000000000000000000003",
+                "WBI:100000000000000000000000000000000004", "WBI:100000000000000000000000000000000005"));
+
+        for (WorkbasketSummary wbSummary : retrievedDistributionTargets) {
+            assertTrue(expectedTargetIds.contains(wbSummary.getId()));
+        }
+
+    }
+
     @WithAccessId(
         userName = "user_1_1",
         groupNames = {"teamlead_1", "group_1", "group_2"})
@@ -148,13 +172,13 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
     public void testAddAndRemoveDistributionTargets()
         throws NotAuthorizedException, WorkbasketNotFoundException, InvalidWorkbasketException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
-        Workbasket workbasket = workbasketService.getWorkbasketByKey("GPK_KSC_1");
+        Workbasket workbasket = workbasketService.getWorkbasket("GPK_KSC_1", "DOMAIN_A");
 
         List<WorkbasketSummary> distributionTargets = workbasketService.getDistributionTargets(workbasket.getId());
         assertEquals(4, distributionTargets.size());
 
         // add a new distribution target
-        Workbasket newTarget = workbasketService.getWorkbasketByKey("GPK_B_KSC_2");
+        Workbasket newTarget = workbasketService.getWorkbasket("GPK_B_KSC_2", "DOMAIN_B");
         workbasketService.addDistributionTarget(workbasket.getId(), newTarget.getId());
 
         distributionTargets = workbasketService.getDistributionTargets(workbasket.getId());
@@ -180,7 +204,7 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
         throws NotAuthorizedException, WorkbasketNotFoundException, InvalidWorkbasketException, SQLException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
 
-        Workbasket sourceWorkbasket = workbasketService.getWorkbasketByKey("GPK_KSC_1");
+        Workbasket sourceWorkbasket = workbasketService.getWorkbasket("GPK_KSC_1", "DOMAIN_A");
 
         List<WorkbasketSummary> initialDistributionTargets = workbasketService
             .getDistributionTargets(sourceWorkbasket.getId());
@@ -207,7 +231,7 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
         userName = "user_2_2",
         groupNames = {"group_1", "group_2"})
     @Test
-    public void testQueryWorkbasketsWhereGivenWorkbasketIsDistributionTarget()
+    public void testGetDistributionSourcesById()
         throws NotAuthorizedException, WorkbasketNotFoundException, InvalidWorkbasketException, SQLException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
 
@@ -215,6 +239,33 @@ public class DistributionTargetsAccTest extends AbstractAccTest {
             .getDistributionSources("WBI:100000000000000000000000000000000004");
 
         assertEquals(2, distributionSources.size());
+        List<String> expectedIds = new ArrayList<>(
+            Arrays.asList("WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002"));
+
+        for (WorkbasketSummary foundSummary : distributionSources) {
+            assertTrue(expectedIds.contains(foundSummary.getId()));
+        }
+
+    }
+
+    @WithAccessId(
+        userName = "user_2_2",
+        groupNames = {"group_1", "group_2"})
+    @Test
+    public void testGetDistributionSourcesByKeyDomain()
+        throws NotAuthorizedException, WorkbasketNotFoundException, InvalidWorkbasketException, SQLException {
+        WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
+
+        List<WorkbasketSummary> distributionSources = workbasketService
+            .getDistributionSources("TEAMLEAD_1", "DOMAIN_A");
+
+        assertEquals(2, distributionSources.size());
+        List<String> expectedIds = new ArrayList<>(
+            Arrays.asList("WBI:100000000000000000000000000000000001", "WBI:100000000000000000000000000000000002"));
+
+        for (WorkbasketSummary foundSummary : distributionSources) {
+            assertTrue(expectedIds.contains(foundSummary.getId()));
+        }
     }
 
     @WithAccessId(

lib/taskana-core/src/test/java/acceptance/workbasket/GetWorkbasketAccTest.java

@@ -57,7 +57,8 @@ public class GetWorkbasketAccTest extends AbstractAccTest {
     @Test
     public void testGetWorkbasketPermissions() {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
-        List<WorkbasketAuthorization> permissions = workbasketService.getPermissionsForWorkbasket("USER_1_2");
+        List<WorkbasketAuthorization> permissions = workbasketService
+            .getPermissionsForWorkbasket("WBI:100000000000000000000000000000000007");
 
         Assert.assertEquals(4, permissions.size());
         Assert.assertTrue(permissions.contains(WorkbasketAuthorization.READ));

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccTest.java

@@ -39,7 +39,7 @@ public class QueryWorkbasketAccTest extends AbstractAccTest {
         List<WorkbasketSummary> results = workbasketService.createWorkbasketQuery()
             .domainIn("DOMAIN_B")
             .list();
-        Assert.assertEquals(3L, results.size());
+        Assert.assertEquals(4L, results.size());
     }
 
     @Test

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketAccessItemsAccTest.java

@@ -48,7 +48,7 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
         WorkbasketAccessItemQuery query = workbasketService.createWorkbasketAccessItemQuery()
             .accessIdIn("user_1_1", "group_1")
             .orderByAccessId(desc)
-            .orderByWorkbasketKey(desc);
+            .orderByWorkbasketId(desc);
         List<WorkbasketAccessItem> results = query.list();
         long count = query.count();
         Assert.assertEquals(10L, results.size());
@@ -62,7 +62,7 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         List<WorkbasketAccessItem> results = workbasketService.createWorkbasketAccessItemQuery()
             .accessIdIn("user_1_1", "group_1")
-            .workbasketKeyIn("USER_1_1", "GPK_KSC_1")
+            .workbasketIdIn("WBI:100000000000000000000000000000000006", "WBI:100000000000000000000000000000000002")
             .list();
         Assert.assertEquals(3L, results.size());
     }
@@ -72,7 +72,7 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         List<WorkbasketAccessItem> results = workbasketService.createWorkbasketAccessItemQuery()
-            .workbasketKeyIn("USER_1_1")
+            .workbasketIdIn("WBI:100000000000000000000000000000000006")
             .list();
         Assert.assertEquals(3L, results.size());
     }
@@ -82,8 +82,8 @@ public class QueryWorkbasketAccessItemsAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         List<WorkbasketAccessItem> results = workbasketService.createWorkbasketAccessItemQuery()
-            .workbasketKeyIn("USER_1_1")
+            .workbasketIdIn("WBI:100000000000000000000000000000000006")
-            .orderByWorkbasketKey(desc)
+            .orderByWorkbasketId(desc)
             .orderByAccessId(asc)
             .list();
         Assert.assertEquals(3L, results.size());

lib/taskana-core/src/test/java/acceptance/workbasket/QueryWorkbasketsWithPaginationAccTest.java

@@ -99,7 +99,7 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
         results = workbasketService.createWorkbasketQuery()
             .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(14));
+        assertThat(results.size(), equalTo(13));
 
         // Getting last results on multiple pages
         pageNumber = 2;
@@ -107,7 +107,7 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
         results = workbasketService.createWorkbasketQuery()
             .domainIn("DOMAIN_A")
             .listPage(pageNumber, pageSize);
-        assertThat(results.size(), equalTo(4));
+        assertThat(results.size(), equalTo(3));
     }
 
     @Test
@@ -167,7 +167,7 @@ public class QueryWorkbasketsWithPaginationAccTest extends AbstractAccTest {
         long count = workbasketService.createWorkbasketQuery()
             .domainIn("DOMAIN_A")
             .count();
-        assertThat(count, equalTo(14L));
+        assertThat(count, equalTo(13L));
     }
 
     @AfterClass

lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAccTest.java

@@ -39,13 +39,12 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException,
         InvalidWorkbasketException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
-        Workbasket workbasket = workbasketService.getWorkbasketByKey("GPK_KSC");
+        Workbasket workbasket = workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A");
         Instant modified = workbasket.getModified();
 
         workbasket.setName("new name");
         workbasket.setDescription("new description");
         workbasket.setType(WorkbasketType.TOPIC);
-        workbasket.setDomain("DOMAIN_C");
         workbasket.setOrgLevel1("new level 1");
         workbasket.setOrgLevel2("new level 2");
         workbasket.setOrgLevel3("new level 3");
@@ -57,7 +56,7 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest {
         workbasket.setDescription("new description");
         workbasketService.updateWorkbasket(workbasket);
 
-        Workbasket updatedWorkbasket = workbasketService.getWorkbasketByKey("GPK_KSC");
+        Workbasket updatedWorkbasket = workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A");
         Assert.assertEquals(workbasket.getId(), updatedWorkbasket.getId());
         Assert.assertEquals(workbasket.getCreated(), updatedWorkbasket.getCreated());
         Assert.assertNotEquals(modified, updatedWorkbasket.getModified());
@@ -74,7 +73,7 @@ public class UpdateWorkbasketAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException,
         InvalidWorkbasketException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
-        Workbasket workbasket = workbasketService.getWorkbasketByKey("GPK_KSC");
+        Workbasket workbasket = workbasketService.getWorkbasket("GPK_KSC", "DOMAIN_A");
 
         workbasket.setName("new name");
         workbasketService.updateWorkbasket(workbasket);

lib/taskana-core/src/test/java/acceptance/workbasket/UpdateWorkbasketAuthorizationsAccTest.java

@@ -12,6 +12,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import acceptance.AbstractAccTest;
+import pro.taskana.KeyDomain;
 import pro.taskana.Task;
 import pro.taskana.TaskService;
 import pro.taskana.TaskSummary;
@@ -44,7 +45,8 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest {
     @Test
     public void testUpdateWorkbasketAccessItemSucceeds() throws InvalidArgumentException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
-        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("key1", "user1");
+        WorkbasketAccessItem accessItem = workbasketService
+            .newWorkbasketAccessItem("key1000000000000000000000000000000000000", "user1");
         accessItem.setPermAppend(true);
         accessItem.setPermCustom11(true);
         accessItem.setPermRead(true);
@@ -69,7 +71,8 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest {
         throws SQLException, NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException,
         InvalidWorkbasketException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
-        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("key1", "user1");
+        WorkbasketAccessItem accessItem = workbasketService
+            .newWorkbasketAccessItem("1000000000000000000000000000000000000000", "user1");
         accessItem.setPermAppend(true);
         accessItem.setPermCustom11(true);
         accessItem.setPermRead(true);
@@ -93,7 +96,7 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest {
         Assert.assertEquals(true, accessItem.isPermCustom1());
         Assert.assertEquals(false, accessItem.isPermCustom2());
 
-        ((WorkbasketAccessItemImpl) accessItem).setWorkbasketKey("key2");
+        ((WorkbasketAccessItemImpl) accessItem).setWorkbasketId("2");
         try {
             workbasketService.updateWorkbasketAuthorization(accessItem);
             fail("InvalidArgumentException was expected because key was changed");
@@ -115,16 +118,17 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest {
         String wbKey = "USER_2_1";
         String groupName = "group_2";
 
-        Task newTask = taskService.newTask(wbKey);
+        Task newTask = taskService.newTask(wbKey, "DOMAIN_A");
         newTask.setClassificationKey("T2100");
         newTask.setPrimaryObjRef(createObjectReference("COMPANY_A", "SYSTEM_A", "INSTANCE_A", "VNR", "1234567"));
         Task createdTask = taskService.createTask(newTask);
         List<TaskSummary> tasks = taskService.createTaskQuery()
-            .workbasketKeyIn(wbKey)
+            .workbasketKeyDomainIn(new KeyDomain(wbKey, "DOMAIN_A"))
             .list();
         Assert.assertEquals(1, tasks.size());
 
-        List<WorkbasketAccessItem> accessItems = workbasketService.getWorkbasketAuthorizations(wbKey);
+        List<WorkbasketAccessItem> accessItems = workbasketService
+            .getWorkbasketAuthorizations("WBI:100000000000000000000000000000000008");
         WorkbasketAccessItem theAccessItem = accessItems.stream()
             .filter(x -> groupName.equals(x.getAccessId()))
             .findFirst()
@@ -136,7 +140,7 @@ public class UpdateWorkbasketAuthorizationsAccTest extends AbstractAccTest {
 
         try {
             taskService.createTaskQuery()
-                .workbasketKeyIn(wbKey)
+                .workbasketKeyDomainIn(new KeyDomain(wbKey, "DOMAIN_A"))
                 .list();
             fail("NotAuthorizedToQueryWorkbasketException was expected ");
         } catch (NotAuthorizedToQueryWorkbasketException ignored) {

lib/taskana-core/src/test/java/pro/taskana/database/TestDataGenerator.java

@@ -51,14 +51,14 @@ public class TestDataGenerator {
             runner.setStopOnError(true);
             runner.setLogWriter(this.logWriter);
             runner.setErrorLogWriter(this.errorLogWriter);
-            runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream("/sql/task.sql")));
-            runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream("/sql/workbasket.sql")));
-            runner.runScript(
-                new InputStreamReader(this.getClass().getResourceAsStream("/sql/distribution-targets.sql")));
             runner.runScript(
                 new InputStreamReader(this.getClass().getResourceAsStream("/sql/classification.sql")));
+            runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream("/sql/workbasket.sql")));
+            runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream("/sql/task.sql")));
             runner.runScript(
                 new InputStreamReader(this.getClass().getResourceAsStream("/sql/workbasket-access-list.sql")));
+            runner.runScript(
+                new InputStreamReader(this.getClass().getResourceAsStream("/sql/distribution-targets.sql")));
             runner.runScript(
                 new InputStreamReader(this.getClass().getResourceAsStream("/sql/object-reference.sql")));
         } finally {

lib/taskana-core/src/test/java/pro/taskana/impl/TaskServiceImplTest.java

@@ -133,7 +133,7 @@ public class TaskServiceImplTest {
         wb.setName("workbasket");
         wb.setDomain(dummyClassification.getDomain());
         doThrow(TaskNotFoundException.class).when(cutSpy).getTask(expectedTask.getId());
-        doReturn(wb).when(workbasketServiceMock).getWorkbasketByKey(wb.getKey());
+        doReturn(wb).when(workbasketServiceMock).getWorkbasket(wb.getKey(), wb.getDomain());
         doNothing().when(taskMapperMock).insert(expectedTask);
         doReturn(dummyClassification).when(
             classificationServiceImplMock)
@@ -144,7 +144,7 @@ public class TaskServiceImplTest {
 
         verify(taskanaEngineImpl, times(1)).openConnection();
         verify(workbasketServiceMock, times(1)).checkAuthorization(any(), any());
-        verify(workbasketServiceMock, times(1)).getWorkbasketByKey(any());
+        verify(workbasketServiceMock, times(1)).getWorkbasket(any(), any());
         verify(classificationServiceImplMock, times(1)).getClassification(any(), any());
         verify(taskMapperMock, times(1)).insert(expectedTask);
         verify(taskanaEngineImpl, times(1)).returnConnection();
@@ -179,7 +179,8 @@ public class TaskServiceImplTest {
         expectedTask.setPrimaryObjRef(expectedObjectReference);
         ClassificationSummary classification = expectedTask.getClassificationSummary();
         doThrow(TaskNotFoundException.class).when(cutSpy).getTask(expectedTask.getId());
-        doReturn(wb).when(workbasketServiceMock).getWorkbasketByKey(expectedTask.getWorkbasketKey());
+        doReturn(wb).when(workbasketServiceMock).getWorkbasket(expectedTask.getWorkbasketKey(),
+            expectedTask.getDomain());
         doReturn(expectedObjectReference).when(objectReferenceMapperMock)
             .findByObjectReference(expectedObjectReference);
         doReturn(dummyClassification).when(
@@ -189,8 +190,9 @@ public class TaskServiceImplTest {
         Task actualTask = cutSpy.createTask(expectedTask);
 
         verify(taskanaEngineImpl, times(1)).openConnection();
-        verify(workbasketServiceMock, times(1)).getWorkbasketByKey(wb.getKey());
+        verify(workbasketServiceMock, times(1)).getWorkbasket(wb.getKey(), wb.getDomain());
-        verify(workbasketServiceMock, times(1)).checkAuthorization(wb.getKey(), WorkbasketAuthorization.APPEND);
+        verify(workbasketServiceMock, times(1)).checkAuthorization(wb.getId(),
+            WorkbasketAuthorization.APPEND);
         verify(classificationServiceImplMock, times(1)).getClassification(classification.getKey(),
             classification.getDomain());
         verify(taskMapperMock, times(1)).insert(expectedTask);
@@ -221,7 +223,7 @@ public class TaskServiceImplTest {
         wb.setName("workbasket");
         wb.setDomain("dummy-domain");
 
-        doReturn(wb).when(workbasketServiceMock).getWorkbasketByKey(wb.getKey());
+        doReturn(wb).when(workbasketServiceMock).getWorkbasket(wb.getKey(), wb.getDomain());
         Classification dummyClassification = createDummyClassification();
         TaskImpl expectedTask = createUnitTestTask("", "DUMMYTASK", "key1", dummyClassification);
         expectedTask.setPrimaryObjRef(expectedObjectReference);
@@ -237,8 +239,9 @@ public class TaskServiceImplTest {
         expectedTask.getPrimaryObjRef().setId(actualTask.getPrimaryObjRef().getId());   // get only new ID
 
         verify(taskanaEngineImpl, times(1)).openConnection();
-        verify(workbasketServiceMock, times(1)).getWorkbasketByKey(expectedTask.getWorkbasketKey());
+        verify(workbasketServiceMock, times(1)).getWorkbasket(expectedTask.getWorkbasketKey(),
-        verify(workbasketServiceMock, times(1)).checkAuthorization(expectedTask.getWorkbasketKey(),
+            expectedTask.getDomain());
+        verify(workbasketServiceMock, times(1)).checkAuthorization(expectedTask.getWorkbasketSummary().getId(),
             WorkbasketAuthorization.APPEND);
         verify(classificationServiceImplMock, times(1)).getClassification(classification.getKey(),
             wb.getDomain());
@@ -273,16 +276,17 @@ public class TaskServiceImplTest {
         wb.setId("workbasketId");
         wb.setKey("workbasketKey");
         wb.setName("workbasket");
+        wb.setDomain("Domain1");
         TaskImpl task = new TaskImpl();
-        task.setWorkbasketKey(wb.getKey());
+        task.setWorkbasketSummary(wb.asSummary());
         task.setClassificationKey("classificationKey");
         task.setClassificationSummary(classification.asSummary());
         task.setPrimaryObjRef(expectedObjectReference);
         task.setDescription("simply awesome task");
         doThrow(TaskNotFoundException.class).when(cutSpy).getTask(task.getId());
-        doReturn(wb).when(workbasketServiceMock).getWorkbasketByKey(wb.getKey());
+        doReturn(wb).when(workbasketServiceMock).getWorkbasket(wb.getId());
         doReturn(classification).when(classificationServiceImplMock).getClassification(classification.getKey(),
-            classification.getDomain());
+            wb.getDomain());
         doReturn(expectedObjectReference).when(objectReferenceMapperMock)
             .findByObjectReference(expectedObjectReference);
         doNothing().when(taskMapperMock).insert(task);
@@ -291,6 +295,7 @@ public class TaskServiceImplTest {
 
         TaskImpl task2 = new TaskImpl();
         task2.setWorkbasketKey(wb.getKey());
+        task2.getWorkbasketSummaryImpl().setId(wb.getId());
         task2.setClassificationKey("classificationKey");
         task2.setPrimaryObjRef(expectedObjectReference);
         task2.setPlanned(Instant.now().minus(Duration.ofHours(1L)));
@@ -300,8 +305,8 @@ public class TaskServiceImplTest {
         cutSpy.createTask(task2);
 
         verify(taskanaEngineImpl, times(2)).openConnection();
+        verify(workbasketServiceMock, times(2)).getWorkbasket(any());
         verify(workbasketServiceMock, times(2)).checkAuthorization(any(), any());
-        verify(workbasketServiceMock, times(2)).getWorkbasketByKey(any());
         verify(classificationServiceImplMock, times(2)).getClassification(any(), any());
         verify(taskMapperMock, times(1)).insert(task);
         verify(taskMapperMock, times(1)).insert(task2);
@@ -355,15 +360,19 @@ public class TaskServiceImplTest {
         TaskServiceImpl cutSpy = Mockito.spy(cut);
         Classification dummyClassification = createDummyClassification();
         TaskImpl task = createUnitTestTask("", "dummyTask", "1", dummyClassification);
+        Workbasket dummyWorkbasket = createWorkbasket("2", "k1");
+        task.setWorkbasketSummary(dummyWorkbasket.asSummary());
+        doReturn(dummyWorkbasket).when(workbasketServiceMock).getWorkbasket(any());
         doThrow(TaskNotFoundException.class).when(cutSpy).getTask(task.getId());
-        doThrow(NotAuthorizedException.class).when(workbasketServiceMock).checkAuthorization(task.getWorkbasketKey(),
+        doThrow(NotAuthorizedException.class).when(workbasketServiceMock).checkAuthorization(
+            task.getWorkbasketSummary().getId(),
             WorkbasketAuthorization.APPEND);
         try {
             cutSpy.createTask(task);
         } catch (NotAuthorizedException e) {
             verify(taskanaEngineImpl, times(1)).openConnection();
-            verify(workbasketServiceMock, times(1)).getWorkbasketByKey(task.getWorkbasketKey());
+            verify(workbasketServiceMock, times(1)).getWorkbasket(task.getWorkbasketSummary().getId());
-            verify(workbasketServiceMock, times(1)).checkAuthorization(task.getWorkbasketKey(),
+            verify(workbasketServiceMock, times(1)).checkAuthorization(task.getWorkbasketSummary().getId(),
                 WorkbasketAuthorization.APPEND);
             verify(taskanaEngineImpl, times(1)).returnConnection();
             verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock,
@@ -383,12 +392,13 @@ public class TaskServiceImplTest {
         Classification dummyClassification = createDummyClassification();
         TaskImpl task = createUnitTestTask("", "dumma-task", "1", dummyClassification);
         doThrow(TaskNotFoundException.class).when(cutSpy).getTask(task.getId());
-        doThrow(WorkbasketNotFoundException.class).when(workbasketServiceMock).getWorkbasketByKey(any());
+        doThrow(WorkbasketNotFoundException.class).when(workbasketServiceMock).getWorkbasket(any(), any());
         try {
             cutSpy.createTask(task);
         } catch (WorkbasketNotFoundException e) {
             verify(taskanaEngineImpl, times(1)).openConnection();
-            verify(workbasketServiceMock, times(1)).getWorkbasketByKey(task.getWorkbasketKey());
+            verify(workbasketServiceMock, times(1)).getWorkbasket(task.getWorkbasketKey(),
+                task.getWorkbasketSummary().getDomain());
             verify(taskanaEngineImpl, times(1)).returnConnection();
             verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock,
                 taskanaEngineMock,
@@ -848,27 +858,30 @@ public class TaskServiceImplTest {
         ClassificationAlreadyExistException, InvalidWorkbasketException, ClassificationNotFoundException {
         TaskServiceImpl cutSpy = Mockito.spy(cut);
         Workbasket destinationWorkbasket = createWorkbasket("2", "k1");
+        Workbasket sourceWorkbasket = createWorkbasket("47", "key47");
         Classification dummyClassification = createDummyClassification();
-        TaskImpl task = createUnitTestTask("1", "Unit Test Task 1", "k1", dummyClassification);
+        TaskImpl task = createUnitTestTask("1", "Unit Test Task 1", "key47", dummyClassification);
+        task.setWorkbasketSummary(sourceWorkbasket.asSummary());
         task.setRead(true);
-        doReturn(destinationWorkbasket).when(workbasketServiceMock).getWorkbasketByKey(destinationWorkbasket.getKey());
+        doReturn(destinationWorkbasket).when(workbasketServiceMock).getWorkbasket(destinationWorkbasket.getId());
+        doReturn(sourceWorkbasket).when(workbasketServiceMock).getWorkbasket(sourceWorkbasket.getId());
         doReturn(taskanaEngineConfigurationMock).when(taskanaEngineMock).getConfiguration();
         doReturn(false).when(taskanaEngineConfigurationMock).isSecurityEnabled();
         doReturn(task).when(cutSpy).getTask(task.getId());
         doNothing().when(taskMapperMock).update(any());
-        doNothing().when(workbasketServiceMock).checkAuthorization(destinationWorkbasket.getKey(),
+        doNothing().when(workbasketServiceMock).checkAuthorization(destinationWorkbasket.getId(),
             WorkbasketAuthorization.APPEND);
-        doNothing().when(workbasketServiceMock).checkAuthorization(task.getWorkbasketKey(),
+        doNothing().when(workbasketServiceMock).checkAuthorization(sourceWorkbasket.getId(),
             WorkbasketAuthorization.TRANSFER);
 
-        Task actualTask = cutSpy.transfer(task.getId(), destinationWorkbasket.getKey());
+        Task actualTask = cutSpy.transfer(task.getId(), destinationWorkbasket.getId());
 
         verify(taskanaEngineImpl, times(1)).openConnection();
-        verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasket.getKey(),
+        verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasket.getId(),
             WorkbasketAuthorization.APPEND);
-        verify(workbasketServiceMock, times(1)).checkAuthorization(task.getWorkbasketKey(),
+        verify(workbasketServiceMock, times(1)).checkAuthorization(sourceWorkbasket.getId(),
             WorkbasketAuthorization.TRANSFER);
-        verify(workbasketServiceMock, times(1)).getWorkbasketByKey(destinationWorkbasket.getKey());
+        verify(workbasketServiceMock, times(1)).getWorkbasket(destinationWorkbasket.getId());
         verify(taskMapperMock, times(1)).update(any());
         verify(taskanaEngineImpl, times(1)).returnConnection();
         verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock, taskanaEngineMock,
@@ -893,20 +906,15 @@ public class TaskServiceImplTest {
         doReturn(taskanaEngineConfigurationMock).when(taskanaEngineMock).getConfiguration();
         doReturn(true).when(taskanaEngineConfigurationMock).isSecurityEnabled();
         doReturn(task).when(cutSpy).getTask(task.getId());
-        doReturn(destinationWorkbasket).when(workbasketServiceMock).getWorkbasketByKey(destinationWorkbasket.getKey());
+        doReturn(destinationWorkbasket).when(workbasketServiceMock).getWorkbasket(destinationWorkbasket.getId());
         doNothing().when(taskMapperMock).update(any());
-        doNothing().when(workbasketServiceMock).checkAuthorization(destinationWorkbasket.getKey(),
+        doNothing().when(workbasketServiceMock).checkAuthorization(any(), any());
-            WorkbasketAuthorization.APPEND);
+        // doNothing().when(workbasketServiceMock).checkAuthorizationById(any(), WorkbasketAuthorization.TRANSFER);
-        doNothing().when(workbasketServiceMock).checkAuthorization(task.getWorkbasketKey(),
+        Task actualTask = cutSpy.transfer(task.getId(), destinationWorkbasket.getId());
-            WorkbasketAuthorization.TRANSFER);
-        Task actualTask = cutSpy.transfer(task.getId(), destinationWorkbasket.getKey());
 
         verify(taskanaEngineImpl, times(1)).openConnection();
-        verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasket.getKey(),
+        verify(workbasketServiceMock, times(2)).checkAuthorization(any(), any());
-            WorkbasketAuthorization.APPEND);
+        verify(workbasketServiceMock, times(1)).getWorkbasket(destinationWorkbasket.getId());
-        verify(workbasketServiceMock, times(1)).checkAuthorization("k1",
-            WorkbasketAuthorization.TRANSFER);
-        verify(workbasketServiceMock, times(1)).getWorkbasketByKey(destinationWorkbasket.getKey());
         verify(taskanaEngineMock, times(0)).getConfiguration();
         verify(taskanaEngineConfigurationMock, times(0)).isSecurityEnabled();
         verify(taskMapperMock, times(1)).update(any());
@@ -925,19 +933,19 @@ public class TaskServiceImplTest {
     public void testTransferDestinationWorkbasketDoesNotExist()
         throws Exception {
 
-        String destinationWorkbasketKey = "2";
+        String destinationWorkbasketId = "2";
         Classification dummyClassification = createDummyClassification();
         Task task = createUnitTestTask("1", "Unit Test Task 1", "1", dummyClassification);
         TaskServiceImpl cutSpy = Mockito.spy(cut);
         doThrow(WorkbasketNotFoundException.class).when(workbasketServiceMock)
-            .checkAuthorization(destinationWorkbasketKey, WorkbasketAuthorization.APPEND);
+            .checkAuthorization(destinationWorkbasketId, WorkbasketAuthorization.APPEND);
         doReturn(task).when(cutSpy).getTask(task.getId());
 
         try {
-            cutSpy.transfer(task.getId(), destinationWorkbasketKey);
+            cutSpy.transfer(task.getId(), destinationWorkbasketId);
         } catch (Exception e) {
             verify(taskanaEngineImpl, times(1)).openConnection();
-            verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasketKey,
+            verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasketId,
                 WorkbasketAuthorization.APPEND);
             verify(taskanaEngineImpl, times(1)).returnConnection();
             verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock,
@@ -973,19 +981,20 @@ public class TaskServiceImplTest {
     @Test(expected = NotAuthorizedException.class)
     public void testTransferNotAuthorizationOnWorkbasketAppend()
         throws Exception {
-        String destinationWorkbasketKey = "2";
+        String destinationWorkbasketId = "2";
         Classification dummyClassification = createDummyClassification();
         Task task = createUnitTestTask("1", "Unit Test Task 1", "1", dummyClassification);
         TaskServiceImpl cutSpy = Mockito.spy(cut);
         doReturn(task).when(cutSpy).getTask(task.getId());
-        doThrow(NotAuthorizedException.class).when(workbasketServiceMock).checkAuthorization(destinationWorkbasketKey,
+        doThrow(NotAuthorizedException.class).when(workbasketServiceMock).checkAuthorization(
+            destinationWorkbasketId,
             WorkbasketAuthorization.APPEND);
 
         try {
-            cutSpy.transfer(task.getId(), destinationWorkbasketKey);
+            cutSpy.transfer(task.getId(), destinationWorkbasketId);
         } catch (Exception e) {
             verify(taskanaEngineImpl, times(1)).openConnection();
-            verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasketKey,
+            verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasketId,
                 WorkbasketAuthorization.APPEND);
             verify(taskanaEngineImpl, times(1)).returnConnection();
             verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock,
@@ -999,23 +1008,24 @@ public class TaskServiceImplTest {
     @Test(expected = NotAuthorizedException.class)
     public void testTransferNotAuthorizationOnWorkbasketTransfer()
         throws Exception {
-        String destinationWorkbasketKey = "2";
+        String destinationWorkbasketId = "2";
         Classification dummyClassification = createDummyClassification();
         Task task = createUnitTestTask("1", "Unit Test Task 1", "1", dummyClassification);
         TaskServiceImpl cutSpy = Mockito.spy(cut);
         doReturn(task).when(cutSpy).getTask(task.getId());
-        doNothing().when(workbasketServiceMock).checkAuthorization(destinationWorkbasketKey,
+        doNothing().when(workbasketServiceMock).checkAuthorization(destinationWorkbasketId,
             WorkbasketAuthorization.APPEND);
-        doThrow(NotAuthorizedException.class).when(workbasketServiceMock).checkAuthorization(task.getWorkbasketKey(),
+        doThrow(NotAuthorizedException.class).when(workbasketServiceMock).checkAuthorization(
+            task.getWorkbasketSummary().getId(),
             WorkbasketAuthorization.TRANSFER);
 
         try {
-            cutSpy.transfer(task.getId(), destinationWorkbasketKey);
+            cutSpy.transfer(task.getId(), destinationWorkbasketId);
         } catch (Exception e) {
             verify(taskanaEngineImpl, times(1)).openConnection();
-            verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasketKey,
+            verify(workbasketServiceMock, times(1)).checkAuthorization(destinationWorkbasketId,
                 WorkbasketAuthorization.APPEND);
-            verify(workbasketServiceMock, times(1)).checkAuthorization(task.getWorkbasketKey(),
+            verify(workbasketServiceMock, times(1)).checkAuthorization(task.getWorkbasketSummary().getId(),
                 WorkbasketAuthorization.TRANSFER);
             verify(taskanaEngineImpl, times(1)).returnConnection();
             verifyNoMoreInteractions(attachmentMapperMock, taskanaEngineConfigurationMock,
@@ -1308,6 +1318,7 @@ public class TaskServiceImplTest {
     private WorkbasketImpl createWorkbasket(String id, String key) {
         WorkbasketImpl workbasket = new WorkbasketImpl();
         workbasket.setId(id);
+        workbasket.setDomain("Domain1");
         workbasket.setKey(key);
         workbasket.setName("Workbasket " + id);
         return workbasket;

lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketServiceImplTest.java

@@ -86,14 +86,15 @@ public class WorkbasketServiceImplTest {
         Workbasket wb = createTestWorkbasket(wbId, "Key-1");
         WorkbasketAuthorization authorization = WorkbasketAuthorization.READ;
         doReturn(wb).when(workbasketMapperMock).findById(wbId);
-        doThrow(NotAuthorizedException.class).when(cutSpy).checkAuthorization(wb.getKey(), authorization);
+        doThrow(NotAuthorizedException.class).when(cutSpy).checkAuthorization(wb.getId(),
+            authorization);
 
         try {
             cutSpy.getWorkbasket(wbId);
         } catch (NotAuthorizedException ex) {
             verify(taskanaEngineImplMock, times(1)).openConnection();
             verify(workbasketMapperMock, times(1)).findById(wbId);
-            verify(cutSpy, times(1)).checkAuthorization(wb.getKey(), authorization);
+            verify(cutSpy, times(1)).checkAuthorization(wb.getId(), authorization);
             verify(taskanaEngineImplMock, times(1)).returnConnection();
             verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
                 distributionTargetMapperMock,
@@ -127,13 +128,13 @@ public class WorkbasketServiceImplTest {
         Workbasket wb = createTestWorkbasket(wbId, "key-1");
         WorkbasketAuthorization authorization = WorkbasketAuthorization.READ;
         doReturn(wb).when(workbasketMapperMock).findById(wbId);
-        doNothing().when(cutSpy).checkAuthorization(wb.getKey(), authorization);
+        doNothing().when(cutSpy).checkAuthorization(wb.getId(), authorization);
 
         Workbasket actualWb = cutSpy.getWorkbasket(wbId);
 
         verify(taskanaEngineImplMock, times(1)).openConnection();
         verify(workbasketMapperMock, times(1)).findById(wbId);
-        verify(cutSpy, times(1)).checkAuthorization(wb.getKey(), authorization);
+        verify(cutSpy, times(1)).checkAuthorization(wb.getId(), authorization);
         verify(taskanaEngineImplMock, times(1)).returnConnection();
         verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
             distributionTargetMapperMock,
@@ -147,15 +148,15 @@ public class WorkbasketServiceImplTest {
         String wbKey = "Key-1";
         Workbasket wb = createTestWorkbasket("ID", wbKey);
         WorkbasketAuthorization authorization = WorkbasketAuthorization.READ;
-        doReturn(wb).when(workbasketMapperMock).findByKey(wbKey);
+        doReturn(wb).when(workbasketMapperMock).findByKeyAndDomain(wbKey, "domain");
-        doThrow(NotAuthorizedException.class).when(cutSpy).checkAuthorization(wbKey, authorization);
+        doThrow(NotAuthorizedException.class).when(cutSpy).checkAuthorization(wbKey, "domain", authorization);
 
         try {
-            cutSpy.getWorkbasketByKey(wbKey);
+            cutSpy.getWorkbasket(wbKey, "domain");
         } catch (NotAuthorizedException ex) {
             verify(taskanaEngineImplMock, times(1)).openConnection();
-            verify(workbasketMapperMock, times(1)).findByKey(wbKey);
+            verify(workbasketMapperMock, times(1)).findByKeyAndDomain(wbKey, "domain");
-            verify(cutSpy, times(1)).checkAuthorization(wbKey, authorization);
+            verify(cutSpy, times(1)).checkAuthorization(wbKey, "domain", authorization);
             verify(taskanaEngineImplMock, times(1)).returnConnection();
             verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
                 distributionTargetMapperMock,
@@ -169,13 +170,13 @@ public class WorkbasketServiceImplTest {
     public void testGetWorkbasketByKey_AuthenticatedWithoutResult()
         throws NotAuthorizedException, WorkbasketNotFoundException {
         String wbKey = "Key-1";
-        doReturn(null).when(workbasketMapperMock).findByKey(wbKey);
+        doReturn(null).when(workbasketMapperMock).findByKeyAndDomain(wbKey, "dummy");
 
         try {
-            cutSpy.getWorkbasketByKey(wbKey);
+            cutSpy.getWorkbasket(wbKey, "dummy");
         } catch (WorkbasketNotFoundException ex) {
             verify(taskanaEngineImplMock, times(1)).openConnection();
-            verify(workbasketMapperMock, times(1)).findByKey(wbKey);
+            verify(workbasketMapperMock, times(1)).findByKeyAndDomain(wbKey, "dummy");
             verify(taskanaEngineImplMock, times(1)).returnConnection();
             verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
                 distributionTargetMapperMock,
@@ -189,13 +190,13 @@ public class WorkbasketServiceImplTest {
         String wbKey = "Key-1";
         Workbasket wb = createTestWorkbasket("ID-1", wbKey);
         WorkbasketAuthorization authorization = WorkbasketAuthorization.READ;
-        doNothing().when(cutSpy).checkAuthorization(wbKey, authorization);
+        doNothing().when(cutSpy).checkAuthorization(wbKey, "test", authorization);
-        doReturn(wb).when(workbasketMapperMock).findByKey(wbKey);
+        doReturn(wb).when(workbasketMapperMock).findByKeyAndDomain(wbKey, "test");
 
-        Workbasket actualWb = cutSpy.getWorkbasketByKey(wbKey);
+        Workbasket actualWb = cutSpy.getWorkbasket(wbKey, "test");
         verify(taskanaEngineImplMock, times(1)).openConnection();
-        verify(cutSpy, times(1)).checkAuthorization(wbKey, authorization);
+        verify(cutSpy, times(1)).checkAuthorization(wbKey, "test", authorization);
-        verify(workbasketMapperMock, times(1)).findByKey(wbKey);
+        verify(workbasketMapperMock, times(1)).findByKeyAndDomain(wbKey, "test");
         verify(taskanaEngineImplMock, times(1)).returnConnection();
         verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
             distributionTargetMapperMock,
@@ -475,7 +476,7 @@ public class WorkbasketServiceImplTest {
         doReturn(wb).when(cutSpy).getWorkbasket(wb.getId());
         doReturn(taskServiceMock).when(taskanaEngineImplMock).getTaskService();
         doReturn(taskQueryMock).when(taskServiceMock).createTaskQuery();
-        doReturn(taskQueryMock).when(taskQueryMock).workbasketKeyIn(wb.getKey());
+        doReturn(taskQueryMock).when(taskQueryMock).workbasketIdIn(wb.getId());
         doReturn(usages).when(taskQueryMock).list();
 
         try {
@@ -485,7 +486,7 @@ public class WorkbasketServiceImplTest {
             verify(cutSpy, times(1)).getWorkbasket(wb.getId());
             verify(taskanaEngineImplMock, times(1)).getTaskService();
             verify(taskServiceMock, times(1)).createTaskQuery();
-            verify(taskQueryMock, times(1)).workbasketKeyIn(wb.getKey());
+            verify(taskQueryMock, times(1)).workbasketIdIn(wb.getId());
             verify(taskQueryMock, times(1)).list();
             verify(taskanaEngineImplMock, times(1)).returnConnection();
             verifyNoMoreInteractions(taskQueryMock, taskServiceMock, workbasketMapperMock, workbasketAccessMapperMock,
@@ -502,7 +503,7 @@ public class WorkbasketServiceImplTest {
         doReturn(wb).when(cutSpy).getWorkbasket(wb.getId());
         doReturn(taskServiceMock).when(taskanaEngineImplMock).getTaskService();
         doReturn(taskQueryMock).when(taskServiceMock).createTaskQuery();
-        doReturn(taskQueryMock).when(taskQueryMock).workbasketKeyIn(wb.getKey());
+        doReturn(taskQueryMock).when(taskQueryMock).workbasketIdIn(wb.getId());
         doReturn(new ArrayList<>()).when(taskQueryMock).list();
 
         cutSpy.deleteWorkbasket(wb.getId());
@@ -511,7 +512,7 @@ public class WorkbasketServiceImplTest {
         verify(cutSpy, times(1)).getWorkbasket(wb.getId());
         verify(taskanaEngineImplMock, times(1)).getTaskService();
         verify(taskServiceMock, times(1)).createTaskQuery();
-        verify(taskQueryMock, times(1)).workbasketKeyIn(wb.getKey());
+        verify(taskQueryMock, times(1)).workbasketIdIn(wb.getId());
         verify(taskQueryMock, times(1)).list();
         verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsBySourceId(wb.getId());
         verify(distributionTargetMapperMock, times(1)).deleteAllDistributionTargetsByTargetId(wb.getId());

lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntAutocommitTest.java

@@ -23,6 +23,7 @@ import org.junit.runner.RunWith;
 
 import pro.taskana.Classification;
 import pro.taskana.ClassificationService;
+import pro.taskana.KeyDomain;
 import pro.taskana.Task;
 import pro.taskana.TaskSummary;
 import pro.taskana.TaskanaEngine;
@@ -99,15 +100,14 @@ public class TaskServiceImplIntAutocommitTest {
         WorkbasketNotFoundException, NotAuthorizedException, ClassificationNotFoundException,
         ClassificationAlreadyExistException, TaskAlreadyExistException, InvalidWorkbasketException,
         InvalidArgumentException {
-        Workbasket wb = workbasketService.newWorkbasket("workbasket");
+        Workbasket wb = workbasketService.newWorkbasket("workbasket", "novatec");
         wb.setName("workbasket");
         wb.setType(WorkbasketType.GROUP);
-        wb.setDomain("novatec");
         taskanaEngine.getWorkbasketService().createWorkbasket(wb);
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
         taskanaEngine.getClassificationService().createClassification(classification);
 
-        Task task = taskServiceImpl.newTask(wb.getKey());
+        Task task = taskServiceImpl.newTask(wb.getId());
         task.setName("Unit Test Task");
 
         task.setClassificationKey(classification.getKey());
@@ -126,10 +126,9 @@ public class TaskServiceImplIntAutocommitTest {
         throws FileNotFoundException, SQLException, TaskNotFoundException, NotAuthorizedException,
         WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException,
         TaskAlreadyExistException, InvalidWorkbasketException, InvalidArgumentException {
-        Workbasket wb = workbasketService.newWorkbasket("wb1k1");
+        Workbasket wb = workbasketService.newWorkbasket("wb1k1", "novatec");
         wb.setName("sdf");
         wb.setType(WorkbasketType.GROUP);
-        wb.setDomain("novatec");
         taskanaEngine.getWorkbasketService().createWorkbasket(wb);
 
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
@@ -139,7 +138,7 @@ public class TaskServiceImplIntAutocommitTest {
             classification.getKey(),
             classification.getDomain());
 
-        TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getKey());
+        TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getKey(), "novatec");
         task.setName("Unit Test Task");
         task.setClassificationKey(classification.getKey());
         task.setPrimaryObjRef(JunitHelper.createDefaultObjRef());
@@ -163,15 +162,14 @@ public class TaskServiceImplIntAutocommitTest {
         ((TaskanaEngineImpl) te).setConnectionManagementMode(ConnectionManagementMode.AUTOCOMMIT);
         TaskServiceImpl taskServiceImpl = (TaskServiceImpl) te.getTaskService();
 
-        Workbasket wb = workbasketService.newWorkbasket("workbasket");
+        Workbasket wb = workbasketService.newWorkbasket("workbasket", "novatec");
         wb.setName("workbasket");
         wb.setType(WorkbasketType.GROUP);
-        wb.setDomain("novatec");
         te.getWorkbasketService().createWorkbasket(wb);
         Classification classification = te.getClassificationService().newClassification("novatec", "TEST", "t1");
         te.getClassificationService().createClassification(classification);
 
-        Task task = taskServiceImpl.newTask(wb.getKey());
+        Task task = taskServiceImpl.newTask(wb.getId());
         task.setName("Unit Test Task");
         task.setClassificationKey(classification.getKey());
         task.setPrimaryObjRef(JunitHelper.createDefaultObjRef());
@@ -185,15 +183,14 @@ public class TaskServiceImplIntAutocommitTest {
     public void should_ReturnList_when_BuilderIsUsed() throws SQLException, NotAuthorizedException,
         WorkbasketNotFoundException, ClassificationNotFoundException, ClassificationAlreadyExistException,
         TaskAlreadyExistException, InvalidWorkbasketException, InvalidArgumentException, SystemException {
-        Workbasket wb = workbasketService.newWorkbasket("key");
+        Workbasket wb = workbasketService.newWorkbasket("key", "novatec");
         wb.setName("workbasket");
         wb.setType(WorkbasketType.GROUP);
-        wb.setDomain("novatec");
         taskanaEngine.getWorkbasketService().createWorkbasket(wb);
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
         taskanaEngine.getClassificationService().createClassification(classification);
 
-        Task task = taskServiceImpl.newTask(wb.getKey());
+        Task task = taskServiceImpl.newTask(wb.getKey(), wb.getDomain());
         task.setName("Unit Test Task");
         task.setClassificationKey(classification.getKey());
         task.setPrimaryObjRef(JunitHelper.createDefaultObjRef());
@@ -204,7 +201,7 @@ public class TaskServiceImplIntAutocommitTest {
             .descriptionLike("test")
             .priorityIn(1, 2, 2)
             .stateIn(TaskState.CLAIMED)
-            .workbasketKeyIn("asd", "asdasdasd")
+            .workbasketKeyDomainIn(new KeyDomain("asd", "novatec"), new KeyDomain("asdasdasd", "novatec"))
             .ownerIn("test", "test2", "bla")
             .customFieldsIn("test")
             .classificationKeyIn("pId1", "pId2")
@@ -232,19 +229,17 @@ public class TaskServiceImplIntAutocommitTest {
         final int sleepTime = 100;
 
         // Source Workbasket
-        wb = (WorkbasketImpl) workbasketService.newWorkbasket("key1");
+        wb = (WorkbasketImpl) workbasketService.newWorkbasket("key1", "domain");
         wb.setName("Basic-Workbasket");
         wb.setDescription("Just used as base WB for Task here");
-        wb.setDomain("domain");
         wb.setType(WorkbasketType.GROUP);
         wb.setOwner("The Tester ID");
         sourceWB = workbasketService.createWorkbasket(wb);
 
         // Destination Workbasket
-        wb = (WorkbasketImpl) workbasketService.newWorkbasket("k1");
+        wb = (WorkbasketImpl) workbasketService.newWorkbasket("k1", "domain");
         wb.setName("Desination-WorkBasket");
 
-        wb.setDomain("domain");
         wb.setType(WorkbasketType.CLEARANCE);
         wb.setDescription("Destination WB where Task should be transfered to");
         wb.setOwner("The Tester ID");
@@ -257,7 +252,7 @@ public class TaskServiceImplIntAutocommitTest {
         classificationService.createClassification(classification);
 
         // Task which should be transfered
-        task = (TaskImpl) taskServiceImpl.newTask(sourceWB.getKey());
+        task = (TaskImpl) taskServiceImpl.newTask(sourceWB.getId());
         task.setName("Task Name");
         task.setDescription("Task used for transfer Test");
         task.setRead(true);
@@ -268,10 +263,10 @@ public class TaskServiceImplIntAutocommitTest {
         task = (TaskImpl) taskServiceImpl.createTask(task);
         Thread.sleep(sleepTime);    // Sleep for modification-timestamp
 
-        resultTask = taskServiceImpl.transfer(task.getId(), destinationWB.getKey());
+        resultTask = taskServiceImpl.transfer(task.getId(), destinationWB.getId());
         assertThat(resultTask.isRead(), equalTo(false));
         assertThat(resultTask.isTransferred(), equalTo(true));
-        assertThat(resultTask.getWorkbasketKey(), equalTo(destinationWB.getKey()));
+        assertThat(resultTask.getWorkbasketSummary().getId(), equalTo(destinationWB.getId()));
         assertThat(resultTask.getModified(), not(equalTo(null)));
         assertThat(resultTask.getModified(), not(equalTo(task.getModified())));
         assertThat(resultTask.getCreated(), not(equalTo(null)));
@@ -308,36 +303,33 @@ public class TaskServiceImplIntAutocommitTest {
         classification.setName("Transfert-Task Classification");
         classificationService.createClassification(classification);
 
-        WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("k5");
+        WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("k5", "test-domain");
         wb.setName("BASE WB");
         wb.setDescription("Normal base WB");
         wb.setOwner(user);
-        wb.setDomain("test-domain");
         wb.setType(WorkbasketType.TOPIC);
         wb = (WorkbasketImpl) workbasketService.createWorkbasket(wb);
         createWorkbasketWithSecurity(wb, wb.getOwner(), true, true, true, true);
 
-        WorkbasketImpl wbNoAppend = (WorkbasketImpl) workbasketService.newWorkbasket("key77");
+        WorkbasketImpl wbNoAppend = (WorkbasketImpl) workbasketService.newWorkbasket("key77", "d2");
         wbNoAppend.setName("Test-Security-WorkBasket-APPEND");
         wbNoAppend.setDescription("Workbasket without permission APPEND on Task");
         wbNoAppend.setOwner(user);
-        wbNoAppend.setDomain("d2");
         wbNoAppend.setType(WorkbasketType.PERSONAL);
 
         wbNoAppend = (WorkbasketImpl) workbasketService.createWorkbasket(wbNoAppend);
         createWorkbasketWithSecurity(wbNoAppend, wbNoAppend.getOwner(), true, true, false, true);
 
-        WorkbasketImpl wbNoTransfer = (WorkbasketImpl) workbasketService.newWorkbasket("k99");
+        WorkbasketImpl wbNoTransfer = (WorkbasketImpl) workbasketService.newWorkbasket("k99", "test-domain");
         wbNoTransfer.setName("Test-Security-WorkBasket-TRANSFER");
         wbNoTransfer.setDescription("Workbasket without permission TRANSFER on Task");
         wbNoTransfer.setOwner(user);
-        wbNoTransfer.setDomain("test-domain");
         wbNoTransfer.setType(WorkbasketType.CLEARANCE);
 
         wbNoTransfer = (WorkbasketImpl) workbasketService.createWorkbasket(wbNoTransfer);
         createWorkbasketWithSecurity(wbNoTransfer, wbNoTransfer.getOwner(), true, true, true, false);
 
-        TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getKey());
+        TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getId());
         task.setName("Task Name");
         task.setDescription("Task used for transfer Test");
         task.setOwner(user);
@@ -347,7 +339,7 @@ public class TaskServiceImplIntAutocommitTest {
 
         // Check failing with missing APPEND
         try {
-            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wbNoAppend.getKey());
+            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wbNoAppend.getId());
             fail("Transfer Task should be FAILD, because there are no APPEND-Rights on destination WB.");
         } catch (NotAuthorizedException e) {
             if (!e.getMessage().contains("APPEND")) {
@@ -360,10 +352,11 @@ public class TaskServiceImplIntAutocommitTest {
 
         // Check failing with missing TRANSFER
         task.setId("");
-        task.setWorkbasketKey(wbNoTransfer.getKey());
+        task.getWorkbasketSummaryImpl().setId(wbNoTransfer.getId());
+        task.setWorkbasketKey(null);
         task = (TaskImpl) taskServiceImpl.createTask(task);
         try {
-            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wb.getKey());
+            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wb.getId());
             fail("Transfer Task should be FAILD, because there are no TRANSFER-Rights on current WB.");
         } catch (NotAuthorizedException e) {
             if (!e.getMessage().contains("TRANSFER")) {
@@ -379,15 +372,14 @@ public class TaskServiceImplIntAutocommitTest {
         WorkbasketNotFoundException, NotAuthorizedException, ClassificationNotFoundException,
         ClassificationAlreadyExistException, TaskAlreadyExistException, InvalidWorkbasketException,
         InvalidArgumentException {
-        Workbasket wb = workbasketService.newWorkbasket("workbasket");
+        Workbasket wb = workbasketService.newWorkbasket("workbasket", "novatec");
         wb.setName("workbasket");
         wb.setType(WorkbasketType.GROUP);
-        wb.setDomain("novatec");
         taskanaEngine.getWorkbasketService().createWorkbasket(wb);
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
         taskanaEngine.getClassificationService().createClassification(classification);
 
-        Task task = taskServiceImpl.newTask(wb.getKey());
+        Task task = taskServiceImpl.newTask(wb.getId());
         task.setName("Unit Test Task");
 
         task.setClassificationKey(classification.getKey());
@@ -410,7 +402,7 @@ public class TaskServiceImplIntAutocommitTest {
 
     private void createWorkbasketWithSecurity(Workbasket wb, String accessId, boolean permOpen,
         boolean permRead, boolean permAppend, boolean permTransfer) {
-        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem(wb.getKey(), accessId);
+        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem(wb.getId(), accessId);
         accessItem.setPermOpen(permOpen);
         accessItem.setPermRead(permRead);
         accessItem.setPermAppend(permAppend);

lib/taskana-core/src/test/java/pro/taskana/impl/integration/TaskServiceImplIntExplicitTest.java

@@ -27,6 +27,7 @@ import org.junit.runner.RunWith;
 
 import pro.taskana.Classification;
 import pro.taskana.ClassificationService;
+import pro.taskana.KeyDomain;
 import pro.taskana.Task;
 import pro.taskana.TaskSummary;
 import pro.taskana.TaskanaEngine;
@@ -54,6 +55,7 @@ import pro.taskana.impl.TaskState;
 import pro.taskana.impl.TaskanaEngineImpl;
 import pro.taskana.impl.WorkbasketImpl;
 import pro.taskana.impl.WorkbasketServiceImpl;
+import pro.taskana.impl.WorkbasketSummaryImpl;
 import pro.taskana.impl.WorkbasketType;
 import pro.taskana.impl.configuration.DBCleaner;
 import pro.taskana.impl.configuration.TaskanaEngineConfigurationTest;
@@ -110,23 +112,23 @@ public class TaskServiceImplIntExplicitTest {
 
         generateSampleAccessItems();
 
-        WorkbasketImpl workbasket = (WorkbasketImpl) workbasketService.newWorkbasket("k1");
+        WorkbasketImpl workbasket = (WorkbasketImpl) workbasketService.newWorkbasket("k1", "novatec");
         workbasket.setName("workbasket");
+        // workbasket.setId("1 "); // set id manually for authorization tests
         workbasket.setId("1"); // set id manually for authorization tests
 
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         Classification classification = classificationService.newClassification("novatec", "TEST", "type1");
         taskanaEngineImpl.getWorkbasketService().createWorkbasket(workbasket);
         taskanaEngineImpl.getClassificationService().createClassification(classification);
         connection.commit();
-        Task task = taskServiceImpl.newTask(workbasket.getKey());
+        Task task = taskServiceImpl.newTask(workbasket.getId());
         task.setName("Unit Test Task");
         task.setClassificationKey(classification.getKey());
         task.setPrimaryObjRef(JunitHelper.createDefaultObjRef());
         task = taskServiceImpl.createTask(task);
         connection.commit();
-        taskServiceImpl.getTask(workbasket.getId());
+        task = taskServiceImpl.getTask(task.getId());
 
         TaskanaEngineImpl te2 = (TaskanaEngineImpl) taskanaEngineConfiguration.buildTaskanaEngine();
         TaskServiceImpl taskServiceImpl2 = (TaskServiceImpl) te2.getTaskService();
@@ -181,17 +183,16 @@ public class TaskServiceImplIntExplicitTest {
         WorkbasketServiceImpl workBasketServiceImpl = (WorkbasketServiceImpl) te.getWorkbasketService();
         ClassificationServiceImpl classificationServiceImpl = (ClassificationServiceImpl) te.getClassificationService();
 
-        Workbasket workbasket = workbasketService.newWorkbasket("K99");
+        Workbasket workbasket = workbasketService.newWorkbasket("K99", "novatec");
         workbasket.setName("workbasket");
 
         workbasket.setName("workbasket99");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workbasket = workBasketServiceImpl.createWorkbasket(workbasket);
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
         classification = classificationServiceImpl.createClassification(classification);
 
-        Task task = taskServiceImpl.newTask(workbasket.getKey());
+        Task task = taskServiceImpl.newTask(workbasket.getId());
         task.setName("Unit Test Task");
         task.setClassificationKey(classification.getKey());
         task.setPrimaryObjRef(JunitHelper.createDefaultObjRef());
@@ -227,22 +228,21 @@ public class TaskServiceImplIntExplicitTest {
         objectReference.setValue("4444");
         objectReference.setType("type");
 
-        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("wb", "Elena");
+        Instant tomorrow = Instant.now().plus(Duration.ofDays(1L));
+
+        Workbasket wb = workbasketService.newWorkbasket("k1", "novatec");
+        wb.setType(WorkbasketType.PERSONAL);
+        wb.setName("aName");
+
+        wb = workbasketService.createWorkbasket(wb);
+
+        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem(wb.getId(), "Elena");
         accessItem.setPermAppend(true);
         accessItem.setPermRead(true);
         accessItem.setPermOpen(true);
         workbasketService.createWorkbasketAuthorization(accessItem);
 
-        Instant tomorrow = Instant.now().plus(Duration.ofDays(1L));
+        Task test = taskServiceImpl.newTask(wb.getId());
-
-        Workbasket wb = workbasketService.newWorkbasket("k1");
-        wb.setDomain("novatec");
-        wb.setName("wbk1");
-        wb.setType(WorkbasketType.PERSONAL);
-
-        workbasketService.createWorkbasket(wb);
-
-        Task test = taskServiceImpl.newTask("k1");
         test.setPrimaryObjRef(objectReference);
         test.setPlanned(tomorrow);
         test.setClassificationKey(classification.getKey());
@@ -257,7 +257,7 @@ public class TaskServiceImplIntExplicitTest {
         Assert.assertNotEquals(resultTask.getPlanned(), resultTask.getCreated());
         Assert.assertNotNull(resultTask.getDue());
 
-        Task task2 = taskServiceImpl.newTask(task.getWorkbasketKey());
+        Task task2 = taskServiceImpl.newTask(task.getWorkbasketSummary().getId());
         task2.setClassificationKey(classification.getKey());
         task2.setPrimaryObjRef(objectReference);
         task2.setDescription("desc");
@@ -284,7 +284,7 @@ public class TaskServiceImplIntExplicitTest {
         generateSampleAccessItems();
 
         Task test = this.generateDummyTask();
-        ((TaskImpl) test).setWorkbasketKey("2");
+        ((WorkbasketSummaryImpl) (test.getWorkbasketSummary())).setId("2");
         taskServiceImpl.createTask(test);
     }
 
@@ -299,9 +299,8 @@ public class TaskServiceImplIntExplicitTest {
 
         generateSampleAccessItems();
 
-        Workbasket wb = workbasketService.newWorkbasket("WB NR.1");
+        Workbasket wb = workbasketService.newWorkbasket("WB NR.1", "nova");
         wb.setName("dummy-WB");
-        wb.setDomain("nova");
         wb.setType(WorkbasketType.PERSONAL);
         wb = workbasketService.createWorkbasket(wb);
         this.createWorkbasketWithSecurity(wb, CurrentUserContext.getUserid(), true, true,
@@ -327,16 +326,15 @@ public class TaskServiceImplIntExplicitTest {
 
         generateSampleAccessItems();
 
-        WorkbasketImpl workbasket = (WorkbasketImpl) workbasketService.newWorkbasket("k1");
+        WorkbasketImpl workbasket = (WorkbasketImpl) workbasketService.newWorkbasket("k1", "novatec");
         workbasket.setName("workbasket");
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
         classificationService.createClassification(classification);
         workbasket.setId("1"); // set id manually for authorization tests
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workbasket = (WorkbasketImpl) workbasketService.createWorkbasket(workbasket);
 
-        Task task = taskServiceImpl.newTask("k1");
+        Task task = taskServiceImpl.newTask(workbasket.getId());
         task.setName("Unit Test Task");
         task.setClassificationKey(classification.getKey());
         task.setPrimaryObjRef(JunitHelper.createDefaultObjRef());
@@ -347,7 +345,7 @@ public class TaskServiceImplIntExplicitTest {
             .descriptionLike("test")
             .priorityIn(1, 2, 2)
             .stateIn(TaskState.CLAIMED)
-            .workbasketKeyIn("k1")
+            .workbasketKeyDomainIn(new KeyDomain("k1", "novatec"))
             .ownerIn("test", "test2", "bla")
             .customFieldsIn("test")
             .classificationKeyIn("pId1", "pId2")
@@ -380,11 +378,10 @@ public class TaskServiceImplIntExplicitTest {
         taskanaEngineImpl.setConnection(connection);
 
         // Source Workbasket
-        wb = (WorkbasketImpl) workbasketService.newWorkbasket("sourceWbKey");
+        wb = (WorkbasketImpl) workbasketService.newWorkbasket("sourceWbKey", "domain");
         wb.setName("Basic-Workbasket");
         wb.setDescription("Just used as base WB for Task here");
         wb.setOwner(user);
-        wb.setDomain("domain");
         wb.setType(WorkbasketType.PERSONAL);
         sourceWB = workbasketService.createWorkbasket(wb);
 
@@ -392,11 +389,10 @@ public class TaskServiceImplIntExplicitTest {
         createWorkbasketWithSecurity(sourceWB, sourceWB.getOwner(), true, true, true, true);
 
         // Destination Workbasket
-        wb = (WorkbasketImpl) workbasketService.newWorkbasket("wb2Key");
+        wb = (WorkbasketImpl) workbasketService.newWorkbasket("wb2Key", "domain");
         wb.setName("Desination-WorkBasket");
         wb.setDescription("Destination WB where Task should be transfered to");
         wb.setOwner(user);
-        wb.setDomain("domain");
         wb.setType(WorkbasketType.TOPIC);
 
         destinationWB = workbasketService.createWorkbasket(wb);
@@ -409,7 +405,7 @@ public class TaskServiceImplIntExplicitTest {
         classificationService.createClassification(classification);
 
         // Task which should be transfered
-        task = (TaskImpl) taskServiceImpl.newTask(sourceWB.getKey());
+        task = (TaskImpl) taskServiceImpl.newTask(sourceWB.getId());
         task.setName("Task Name");
         task.setDescription("Task used for transfer Test");
         task.setRead(true);
@@ -422,7 +418,7 @@ public class TaskServiceImplIntExplicitTest {
         Thread.sleep(sleepTime);    // Sleep for modification-timestamp
         connection.commit();
 
-        resultTask = taskServiceImpl.transfer(task.getId(), destinationWB.getKey());
+        resultTask = taskServiceImpl.transfer(task.getId(), destinationWB.getId());
         connection.commit();
         assertThat(resultTask.isRead(), equalTo(false));
         assertThat(resultTask.isTransferred(), equalTo(true));
@@ -460,41 +456,37 @@ public class TaskServiceImplIntExplicitTest {
         workbasketService = taskanaEngine.getWorkbasketService();
 
         ClassificationImpl classification = (ClassificationImpl) classificationService.newClassification("test-domain",
-            "KEY",
+            "KEY", "t1");
-            "t1");
         classification.setCategory("Test Classification");
         classification.setName("Transfert-Task Classification");
         classificationService.createClassification(classification);
 
-        WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("wbKey1");
+        WorkbasketImpl wb = (WorkbasketImpl) workbasketService.newWorkbasket("wbKey1", "test-domain");
         wb.setName("BASE WB");
         wb.setDescription("Normal base WB");
         wb.setOwner(user);
-        wb.setDomain("test-domain");
         wb.setType(WorkbasketType.GROUP);
         wb = (WorkbasketImpl) workbasketService.createWorkbasket(wb);
         createWorkbasketWithSecurity(wb, wb.getOwner(), true, true, true, true);
 
-        WorkbasketImpl wbNoAppend = (WorkbasketImpl) workbasketService.newWorkbasket("keyNoAppend");
+        WorkbasketImpl wbNoAppend = (WorkbasketImpl) workbasketService.newWorkbasket("keyNoAppend", "anotherDomain");
         wbNoAppend.setName("Test-Security-WorkBasket-APPEND");
         wbNoAppend.setDescription("Workbasket without permission APPEND on Task");
         wbNoAppend.setOwner(user);
 
-        wbNoAppend.setDomain("anotherDomain");
         wbNoAppend.setType(WorkbasketType.CLEARANCE);
         wbNoAppend = (WorkbasketImpl) workbasketService.createWorkbasket(wbNoAppend);
         createWorkbasketWithSecurity(wbNoAppend, wbNoAppend.getOwner(), true, true, false, true);
 
-        WorkbasketImpl wbNoTransfer = (WorkbasketImpl) workbasketService.newWorkbasket("keyNoTransfer");
+        WorkbasketImpl wbNoTransfer = (WorkbasketImpl) workbasketService.newWorkbasket("keyNoTransfer", "test-domain");
         wbNoTransfer.setName("Test-Security-WorkBasket-TRANSFER");
         wbNoTransfer.setDescription("Workbasket without permission TRANSFER on Task");
         wbNoTransfer.setOwner(user);
-        wbNoTransfer.setDomain("test-domain");
         wbNoTransfer.setType(WorkbasketType.GROUP);
         wbNoTransfer = (WorkbasketImpl) workbasketService.createWorkbasket(wbNoTransfer);
         createWorkbasketWithSecurity(wbNoTransfer, wbNoTransfer.getOwner(), true, true, true, false);
 
-        TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getKey());
+        TaskImpl task = (TaskImpl) taskServiceImpl.newTask(wb.getId());
         task.setName("Task Name");
         task.setDescription("Task used for transfer Test");
         task.setOwner(user);
@@ -504,7 +496,7 @@ public class TaskServiceImplIntExplicitTest {
 
         // Check failing with missing APPEND
         try {
-            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wbNoAppend.getKey());
+            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wbNoAppend.getId());
             fail("Transfer Task should be FAILD, because there are no APPEND-Rights on destination WB.");
         } catch (NotAuthorizedException e) {
             if (!e.getMessage().contains("APPEND")) {
@@ -518,9 +510,10 @@ public class TaskServiceImplIntExplicitTest {
         // Check failing with missing TRANSFER
         task.setId("");
         task.setWorkbasketKey(wbNoTransfer.getKey());
+        task.getWorkbasketSummaryImpl().setId(wbNoTransfer.getId());
         task = (TaskImpl) taskServiceImpl.createTask(task);
         try {
-            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wb.getKey());
+            task = (TaskImpl) taskServiceImpl.transfer(task.getId(), wb.getId());
             fail("Transfer Task should be FAILD, because there are no TRANSFER-Rights on current WB.");
         } catch (NotAuthorizedException e) {
             if (!e.getMessage().contains("TRANSFER")) {
@@ -533,29 +526,28 @@ public class TaskServiceImplIntExplicitTest {
 
     private Task generateDummyTask() throws ClassificationAlreadyExistException, ClassificationNotFoundException,
         WorkbasketNotFoundException, InvalidWorkbasketException, NotAuthorizedException {
-        WorkbasketImpl workbasket = (WorkbasketImpl) workbasketService.newWorkbasket("wb");
+        WorkbasketImpl workbasket = (WorkbasketImpl) workbasketService.newWorkbasket("wb", "novatec");
         workbasket.setName("wb");
         workbasket.setId("1"); // set id manually for authorization tests
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         taskanaEngine.getWorkbasketService().createWorkbasket(workbasket);
 
         Classification classification = classificationService.newClassification("novatec", "TEST", "t1");
         taskanaEngine.getClassificationService().createClassification(classification);
 
-        Task task = taskServiceImpl.newTask(workbasket.getKey());
+        Task task = taskServiceImpl.newTask(workbasket.getId());
         task.setClassificationKey(classification.getKey());
         return task;
     }
 
     private void generateSampleAccessItems() {
-        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("k1", "Elena");
+        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem("1", "Elena");
         accessItem.setPermAppend(true);
         accessItem.setPermRead(true);
         accessItem.setPermOpen(true);
         workbasketService.createWorkbasketAuthorization(accessItem);
 
-        WorkbasketAccessItem accessItem2 = workbasketService.newWorkbasketAccessItem("k2", "DummyGroup");
+        WorkbasketAccessItem accessItem2 = workbasketService.newWorkbasketAccessItem("2", "DummyGroup");
         accessItem.setPermRead(true);
         accessItem2.setPermOpen(true);
         workbasketService.createWorkbasketAuthorization(accessItem2);
@@ -563,7 +555,7 @@ public class TaskServiceImplIntExplicitTest {
 
     private void createWorkbasketWithSecurity(Workbasket wb, String accessId, boolean permOpen,
         boolean permRead, boolean permAppend, boolean permTransfer) {
-        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem(wb.getKey(), accessId);
+        WorkbasketAccessItem accessItem = workbasketService.newWorkbasketAccessItem(wb.getId(), accessId);
         accessItem.setPermOpen(permOpen);
         accessItem.setPermRead(permRead);
         accessItem.setPermAppend(permAppend);

lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntAutocommitTest.java

@@ -95,12 +95,11 @@ public class WorkbasketServiceImplIntAutocommitTest {
     public void testInsertWorkbasket()
         throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketNotFoundException {
         int before = workBasketService.getWorkbaskets().size();
-        WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key");
+        WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key", "novatec");
         String id1 = IdGenerator.generateWithPrefix("TWB");
         workbasket.setId(id1);
         workbasket.setName("Megabasket");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket);
         Assert.assertEquals(before + 1, workBasketService.getWorkbaskets().size());
     }
@@ -109,26 +108,23 @@ public class WorkbasketServiceImplIntAutocommitTest {
     public void testSelectAllWorkbaskets()
         throws NotAuthorizedException, InvalidWorkbasketException, WorkbasketNotFoundException {
         int before = workBasketService.getWorkbaskets().size();
-        WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0");
+        WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec");
         String id0 = IdGenerator.generateWithPrefix("TWB");
         workbasket0.setId(id0);
         workbasket0.setName("Superbasket");
         workbasket0.setType(WorkbasketType.PERSONAL);
-        workbasket0.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket0);
-        WorkbasketImpl workbasket1 = (WorkbasketImpl) workBasketService.newWorkbasket("key1");
+        WorkbasketImpl workbasket1 = (WorkbasketImpl) workBasketService.newWorkbasket("key1", "novatec");
         String id1 = IdGenerator.generateWithPrefix("TWB");
         workbasket1.setId(id1);
         workbasket1.setName("Megabasket");
         workbasket1.setType(WorkbasketType.GROUP);
-        workbasket1.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket1);
-        WorkbasketImpl workbasket2 = (WorkbasketImpl) workBasketService.newWorkbasket("key2");
+        WorkbasketImpl workbasket2 = (WorkbasketImpl) workBasketService.newWorkbasket("key2", "novatec");
         String id2 = IdGenerator.generateWithPrefix("TWB");
         workbasket2.setId(id2);
         workbasket2.setName("Hyperbasket");
         workbasket2.setType(WorkbasketType.GROUP);
-        workbasket2.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket2);
         Assert.assertEquals(before + THREE, workBasketService.getWorkbaskets().size());
     }
@@ -224,23 +220,27 @@ public class WorkbasketServiceImplIntAutocommitTest {
 
     @Test
     public void testInsertWorkbasketAccessUser() throws NotAuthorizedException {
-        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem("k1", "Arthur Dent");
+        WorkbasketAccessItem accessItem = workBasketService
+            .newWorkbasketAccessItem("k100000000000000000000000000000000000000", "Arthur Dent");
         accessItem.setPermOpen(true);
         accessItem.setPermRead(true);
         workBasketService.createWorkbasketAuthorization(accessItem);
 
-        Assert.assertEquals(1, workBasketService.getWorkbasketAuthorizations("k1").size());
+        Assert.assertEquals(1,
+            workBasketService.getWorkbasketAuthorizations("k100000000000000000000000000000000000000").size());
     }
 
     @Test
     public void testUpdateWorkbasketAccessUser() throws NotAuthorizedException, InvalidArgumentException {
-        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem("k2",
+        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(
+            "k200000000000000000000000000000000000000",
             "Zaphod Beeblebrox");
         accessItem.setPermOpen(true);
         accessItem.setPermRead(true);
         workBasketService.createWorkbasketAuthorization(accessItem);
 
-        Assert.assertEquals(1, workBasketService.getWorkbasketAuthorizations("k2").size());
+        Assert.assertEquals(1,
+            workBasketService.getWorkbasketAuthorizations("k200000000000000000000000000000000000000").size());
 
         accessItem.setPermAppend(true);
         workBasketService.updateWorkbasketAuthorization(accessItem);
@@ -260,12 +260,6 @@ public class WorkbasketServiceImplIntAutocommitTest {
 
         generateSampleDataForQuery();
 
-        Instant tomorrow = now.plus(Duration.ofDays(1L));
-        Instant yesterday = now.minus(Duration.ofDays(1L));
-        Instant tenDaysAgo = now.minus(Duration.ofDays(10L));
-        Instant twentyDaysAgo = now.minus(Duration.ofDays(20L));
-        Instant thirtyDaysAgo = now.minus(Duration.ofDays(30L));
-
         WorkbasketQuery query1 = workBasketService.createWorkbasketQuery()
             .accessIdsHavePermission(WorkbasketAuthorization.OPEN, "Bernd")
             .nameIn("Basket4");
@@ -336,28 +330,26 @@ public class WorkbasketServiceImplIntAutocommitTest {
 
     private void generateSampleDataForQuery()
         throws InvalidWorkbasketException, WorkbasketNotFoundException, NotAuthorizedException {
-        WorkbasketImpl basket1 = (WorkbasketImpl) workBasketService.newWorkbasket("k1");
+        WorkbasketImpl basket1 = (WorkbasketImpl) workBasketService.newWorkbasket("k1", "novatec");
-        basket1.setId("1");
+        basket1.setId("1000000000000000000000000000000000000000");
         basket1.setName("Basket1");
         basket1.setOwner("Eberhardt");
         basket1.setType(WorkbasketType.GROUP);
-        basket1.setDomain("novatec");
         basket1 = (WorkbasketImpl) workBasketService.createWorkbasket(basket1);
-        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(basket1.getKey(), "Bernd");
+        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(basket1.getId(), "Bernd");
         accessItem.setPermTransfer(true);
         accessItem.setPermCustom1(true);
         accessItem.setPermOpen(true);
         accessItem.setPermRead(true);
         workBasketService.createWorkbasketAuthorization(accessItem);
 
-        WorkbasketImpl basket2 = (WorkbasketImpl) workBasketService.newWorkbasket("k2");
+        WorkbasketImpl basket2 = (WorkbasketImpl) workBasketService.newWorkbasket("k2", "consulting");
-        basket2.setId("2");
+        basket2.setId("2000000000000000000000000000000000000000");
         basket2.setName("Basket2");
         basket2.setOwner("Konstantin");
         basket2.setType(WorkbasketType.CLEARANCE);
-        basket2.setDomain("consulting");
         basket2 = (WorkbasketImpl) workBasketService.createWorkbasket(basket2);
-        WorkbasketAccessItem accessItem2 = workBasketService.newWorkbasketAccessItem(basket2.getKey(), "group2");
+        WorkbasketAccessItem accessItem2 = workBasketService.newWorkbasketAccessItem(basket2.getId(), "group2");
         accessItem2.setPermTransfer(true);
         accessItem2.setPermRead(true);
         accessItem2.setPermCustom4(true);
@@ -365,28 +357,26 @@ public class WorkbasketServiceImplIntAutocommitTest {
         accessItem2.setPermOpen(true);
         workBasketService.createWorkbasketAuthorization(accessItem2);
 
-        WorkbasketImpl basket3 = (WorkbasketImpl) workBasketService.newWorkbasket("k3");
+        WorkbasketImpl basket3 = (WorkbasketImpl) workBasketService.newWorkbasket("k3", "develop");
-        basket3.setId("3");
+        basket3.setId("3000000000000000000000000000000000000000");
         basket3.setName("Basket3");
         basket3.setOwner("Holger");
         basket3.setType(WorkbasketType.TOPIC);
-        basket3.setDomain("develop");
         basket3 = (WorkbasketImpl) workBasketService.createWorkbasket(basket3);
-        WorkbasketAccessItem accessItem3 = workBasketService.newWorkbasketAccessItem(basket3.getKey(), "group3");
+        WorkbasketAccessItem accessItem3 = workBasketService.newWorkbasketAccessItem(basket3.getId(), "group3");
         accessItem3.setPermOpen(true);
         accessItem3.setPermRead(true);
         accessItem3.setPermAppend(true);
         workBasketService.createWorkbasketAuthorization(accessItem3);
 
-        WorkbasketImpl basket4 = (WorkbasketImpl) workBasketService.newWorkbasket("k4");
+        WorkbasketImpl basket4 = (WorkbasketImpl) workBasketService.newWorkbasket("k4", "");
-        basket4.setId("4");
+        basket4.setId("4000000000000000000000000000000000000000");
         basket4.setName("Basket4");
         basket4.setOwner("Holger");
         basket4.setType(WorkbasketType.PERSONAL);
-        basket4.setDomain("");
         List<String> distTargets = new ArrayList<>(Arrays.asList(basket1.getId(), basket2.getId(), basket3.getId()));
         basket4 = (WorkbasketImpl) workBasketService.createWorkbasket(basket4);
-        WorkbasketAccessItem accessItem4 = workBasketService.newWorkbasketAccessItem(basket4.getKey(), "Bernd");
+        WorkbasketAccessItem accessItem4 = workBasketService.newWorkbasketAccessItem(basket4.getId(), "Bernd");
         accessItem4.setPermOpen(true);
         accessItem4.setPermRead(true);
         workBasketService.createWorkbasketAuthorization(accessItem4);
@@ -423,7 +413,7 @@ public class WorkbasketServiceImplIntAutocommitTest {
 
     private void createWorkbasketWithSecurity(Workbasket wb, String accessId, boolean permOpen,
         boolean permRead, boolean permAppend, boolean permTransfer) {
-        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(wb.getKey(), accessId);
+        WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(wb.getId(), accessId);
         accessItem.setPermOpen(permOpen);
         accessItem.setPermRead(permRead);
         accessItem.setPermAppend(permAppend);
@@ -432,9 +422,8 @@ public class WorkbasketServiceImplIntAutocommitTest {
     }
 
     private Workbasket createTestWorkbasket(String id, String key, String domain, String name, WorkbasketType type) {
-        WorkbasketImpl wb = (WorkbasketImpl) workBasketService.newWorkbasket(key);
+        WorkbasketImpl wb = (WorkbasketImpl) workBasketService.newWorkbasket(key, domain);
         wb.setId(id);
-        wb.setDomain(domain);
         wb.setName(name);
         wb.setDescription("Description of a Workbasket...");
         wb.setType(type);

lib/taskana-core/src/test/java/pro/taskana/impl/integration/WorkbasketServiceImplIntExplicitTest.java

@@ -80,12 +80,11 @@ public class WorkbasketServiceImplIntExplicitTest {
         taskanaEngineImpl.setConnection(connection);
         workBasketService = taskanaEngine.getWorkbasketService();
         int before = workBasketService.getWorkbaskets().size();
-        WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key");
+        WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key", "novatec");
         String id1 = IdGenerator.generateWithPrefix("TWB");
         workbasket.setId(id1);
         workbasket.setName("Megabasket");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket);
         Assert.assertEquals(before + 1, workBasketService.getWorkbaskets().size());
         taskanaEngineImpl.closeConnection();
@@ -98,26 +97,23 @@ public class WorkbasketServiceImplIntExplicitTest {
         taskanaEngineImpl.setConnection(connection);
         workBasketService = taskanaEngine.getWorkbasketService();
         int before = workBasketService.getWorkbaskets().size();
-        WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0");
+        WorkbasketImpl workbasket0 = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec");
         String id0 = IdGenerator.generateWithPrefix("TWB");
         workbasket0.setId(id0);
         workbasket0.setName("Superbasket");
         workbasket0.setType(WorkbasketType.GROUP);
-        workbasket0.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket0);
-        WorkbasketImpl workbasket1 = (WorkbasketImpl) workBasketService.newWorkbasket("key1");
+        WorkbasketImpl workbasket1 = (WorkbasketImpl) workBasketService.newWorkbasket("key1", "novatec");
         String id1 = IdGenerator.generateWithPrefix("TWB");
         workbasket1.setId(id1);
         workbasket1.setName("Megabasket");
         workbasket1.setType(WorkbasketType.GROUP);
-        workbasket1.setDomain("novatec");
         workbasket1 = (WorkbasketImpl) workBasketService.createWorkbasket(workbasket1);
-        WorkbasketImpl workbasket2 = (WorkbasketImpl) workBasketService.newWorkbasket("key2");
+        WorkbasketImpl workbasket2 = (WorkbasketImpl) workBasketService.newWorkbasket("key2", "novatec");
         String id2 = IdGenerator.generateWithPrefix("TWB");
         workbasket2.setId(id2);
         workbasket2.setName("Hyperbasket");
         workbasket2.setType(WorkbasketType.GROUP);
-        workbasket2.setDomain("novatec");
         workBasketService.createWorkbasket(workbasket2);
         Assert.assertEquals(before + THREE, workBasketService.getWorkbaskets().size());
         connection.commit();
@@ -131,12 +127,11 @@ public class WorkbasketServiceImplIntExplicitTest {
         Connection connection = dataSource.getConnection();
         taskanaEngineImpl.setConnection(connection);
         workBasketService = taskanaEngine.getWorkbasketService();
-        WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key0");
+        WorkbasketImpl workbasket = (WorkbasketImpl) workBasketService.newWorkbasket("key0", "novatec");
         String id0 = IdGenerator.generateWithPrefix("TWB");
         workbasket.setId(id0);
         workbasket.setName("Superbasket");
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("novatec");
         workbasket = (WorkbasketImpl) workBasketService.createWorkbasket(workbasket);
 
         createWorkbasketWithSecurity(workbasket, "Elena", true, true, true, true);
@@ -278,7 +273,7 @@ public class WorkbasketServiceImplIntExplicitTest {
     private void createWorkbasketWithSecurity(Workbasket wb, String accessId, boolean permOpen,
         boolean permRead, boolean permAppend, boolean permTransfer) {
         WorkbasketAccessItem accessItem = workBasketService.newWorkbasketAccessItem(
-            wb.getKey(), accessId);
+            wb.getId(), accessId);
         accessItem.setPermOpen(permOpen);
         accessItem.setPermRead(permRead);
         accessItem.setPermAppend(permAppend);
@@ -287,9 +282,8 @@ public class WorkbasketServiceImplIntExplicitTest {
     }
 
     private Workbasket createTestWorkbasket(String id, String key, String domain, String name, WorkbasketType type) {
-        WorkbasketImpl wb = (WorkbasketImpl) workBasketService.newWorkbasket(key);
+        WorkbasketImpl wb = (WorkbasketImpl) workBasketService.newWorkbasket(key, domain);
         wb.setId(id);
-        wb.setDomain(domain);
         wb.setName(name);
         wb.setDescription("Description of a Workbasket...");
         wb.setType(type);

lib/taskana-core/src/test/resources/sql/monitor-sample-data.sql

@@ -1,66 +1,14 @@
--- TASK TABLE          (ID                                        , CREATED          , CLAIMED          , COMPLETED        , MODIFIED         , PLANNED          , DUE    , NAME    , DESCRIPTION        , NOTE              , PRIORITY, STATE    , CLASSIFICATION_KEY, CLASSIFICATION_CATEGORY,  WORKBASKET_KEY, DOMAIN    , BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER , POR_COMPANY , POR_SYSTEM , POR_INSTANCE , POR_TYPE , POR_VALUE , IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1               , CUSTOM_2              , CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task01', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task02', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task03', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task04', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task05', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task06', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L30000'          , 'AUTOMATIC'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task07', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task08', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L40000'          , 'MANUAL'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task09', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L40000'          , 'MANUAL'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task10', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task11', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task12', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task13', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task14', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task15', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task16', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task17', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L30000'          , 'AUTOMATIC'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task18', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task19', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task20', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task21', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task22', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task23', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task24', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task25', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L30000'          , 'AUTOMATIC'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task26', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task27', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task28', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task29', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L40000'          , 'MANUAL'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task30', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L40000'          , 'MANUAL'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task31', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L40000'          , 'MANUAL'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task32', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L40000'          , 'MANUAL'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task33', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L10000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task34', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task35', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L20000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task36', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L30000'          , 'AUTOMATIC'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task37', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task38', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task39', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task40', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task41', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'L50000'          , 'EXTERN'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task42', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L50000'          , 'EXTERN'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task43', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L50000'          , 'EXTERN'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task44', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L30000'          , 'AUTOMATIC'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task45', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L30000'          , 'AUTOMATIC'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task46', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L30000'          , 'AUTOMATIC'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task47', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L40000'          , 'MANUAL'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task48', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L40000'          , 'MANUAL'				  , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task49', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L40000'          , 'MANUAL'				  , 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task50', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'L40000'          , 'MANUAL'				  , 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
-
 -- WORKBASKET TABLE           (ID                                        , KEY       , CREATED          , MODIFIED         , NAME              , DOMAIN               , TYPE      , DESCRIPTION              , OWNER       , CUSTOM_1    , CUSTOM_2    , CUSTOM_3    , CUSTOM_4    , ORG_LEVEL_1 , ORG_LEVEL_2 , ORG_LEVEL_3 , ORG_LEVEL_4 );
 INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000001', 'USER_1_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 1', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 1', 'John'      , ''          , ''          , ''          , ''          , ''          , ''          , ''          , ''          );
 INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000002', 'USER_1_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 2', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 2', 'John'      , ''          , ''          , ''          , ''          , ''          , ''          , ''          , ''          );
 INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000003', 'USER_1_3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 3', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 3', 'John'      , ''          , ''          , ''          , ''          , ''          , ''          , ''          , ''          );
 INSERT INTO WORKBASKET VALUES ('WBI:000000000000000000000000000000000004', 'USER_1_4', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 4', 'MONITOR_TEST_DOMAIN', 'PERSONAL', 'Monitor Test Postkorb 4', 'John'      , ''          , ''          , ''          , ''          , ''          , ''          , ''          , ''          );
 
--- WORKBASKET_ACCESS_LIST TABLE           (ID                                        , WORKBASKET_KEY, ACCESS_ID       , PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 );
+-- WORKBASKET_ACCESS_LIST TABLE           (ID                                        , WORKBASKET_ID                             , ACCESS_ID       , PERM_READ, PERM_OPEN, PERM_APPEND, PERM_TRANSFER, PERM_DISTRIBUTE, PERM_CUSTOM_1, PERM_CUSTOM_2, PERM_CUSTOM_3, PERM_CUSTOM_4, PERM_CUSTOM_5, PERM_CUSTOM_6, PERM_CUSTOM_7, PERM_CUSTOM_8, PERM_CUSTOM_9, PERM_CUSTOM_10, PERM_CUSTOM_11, PERM_CUSTOM_12 );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000001', 'USER_1_1'    , 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000002', 'USER_1_2'    , 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000003', 'USER_1_3'    , 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000003', 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000004', 'USER_1_4'    , 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000004', 'monitor_user_1', true     , true     , true       , true         , false          , false        , false        , false        , false        , false        , false        , false        , false        , false        , false         , false         , false          );
 
 -- CLASSIFICATION TABLE          (ID                                        , KEY     , PARENT_ID                                     , CATEGORY   , TYPE  , DOMAIN    , VALID_IN_DOMAIN, CREATED          , NAME                  , DESCRIPTION         , PRIORITY, SERVICE_LEVEL, APPLICATION_ENTRY_POINT, CUSTOM_1              , CUSTOM_2, CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8 );
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000001', 'L10000', ''                                            , 'EXTERN'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'OLD-Leistungsfall'   , 'OLD-Leistungsfall' , 3       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR'     , ''      , ''      , ''      , ''      , ''      , ''      , ''       );
@@ -68,20 +16,72 @@ INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000002', 'L
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000003', 'L30000', 'CLI:000000000000000000000000000000000001'    , 'AUTOMATIC', 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Widerruf'            , 'Widerruf'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR'     , ''      , ''      , ''      , ''      , ''      , ''      , ''       );
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000004', 'L40000', 'CLI:000000000000000000000000000000000001'    , 'MANUAL'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Dynamikaenderung'    , 'Dynamikaenderung'  , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR'     , ''      , ''      , ''      , ''      , ''      , ''      , ''       );
 INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000005', 'L50000', 'CLI:000000000000000000000000000000000001'    , 'EXTERN'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Dynamik-Ablehnung'   , 'Dynamik-Ablehnung' , 5       , 'P5D'        , ''                     , 'VNR,RVNR,KOLVNR'     , ''      , ''      , ''      , ''      , ''      , ''      , ''       );
-INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000006', 'L11000', ''                       , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 1'            , 'Anhang 1'          , 3       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR'     , ''      , ''      , ''      , ''      , ''      , ''      , ''       );
+INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000006', 'L11000', ''                                            , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 1'            , 'Anhang 1'          , 3       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR'     , ''      , ''      , ''      , ''      , ''      , ''      , ''       );
-INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000007', 'L22000', ''                       , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 2'            , 'Anhang 2'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR, ANR', ''      , ''      , ''      , ''      , ''      , ''      , ''       );
+INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000007', 'L22000', ''                                            , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 2'            , 'Anhang 2'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR, ANR', ''      , ''      , ''      , ''      , ''      , ''      , ''       );
-INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000008', 'L33000', ''                       , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 3'            , 'Anhang 3'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR, ANR', ''      , ''      , ''      , ''      , ''      , ''      , ''       );
+INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000008', 'L33000', ''                                            , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 3'            , 'Anhang 3'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR, ANR', ''      , ''      , ''      , ''      , ''      , ''      , ''       );
-INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000009', 'L99000', ''                       , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 9'            , 'Anhang 9'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR, ANR', ''      , ''      , ''      , ''      , ''      , ''      , ''       );
+INSERT INTO CLASSIFICATION VALUES('CLI:000000000000000000000000000000000009', 'L99000', ''                                            , 'Anhang'   , 'TASK', 'DOMAIN_A', TRUE           , CURRENT_TIMESTAMP, 'Anhang 9'            , 'Anhang 9'          , 1       , 'P1D'        , ''                     , 'VNR,RVNR,KOLVNR, ANR', ''      , ''      , ''      , ''      , ''      , ''      , ''       );
 
--- ATTACHMENT TABLE          (ID                                        , TASK_ID                                   , CREATED          , MODIFIED         , CLASSIFICATION_KEY, REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED         , CUSTOM_ATTRIBUTES );
+-- ATTACHMENT TABLE          (ID                                        , TASK_ID                                   , CREATED          , MODIFIED         , CLASSIFICATION_KEY,CLASSIFICATION_ID                         , REF_COMPANY, REF_SYSTEM, REF_INSTANCE, REF_TYPE, REF_VALUE, CHANNEL, RECEIVED         , CUSTOM_ATTRIBUTES );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000001', 'TKI:000000000000000000000000000000000001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L11000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000001', 'TKI:000000000000000000000000000000000001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L11000'          ,'CLI:000000000000000000000000000000000006', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000002', 'TKI:000000000000000000000000000000000013', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L11000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000002', 'TKI:000000000000000000000000000000000013', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L11000'          ,'CLI:000000000000000000000000000000000006', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000003', 'TKI:000000000000000000000000000000000014', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000003', 'TKI:000000000000000000000000000000000014', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          ,'CLI:000000000000000000000000000000000007', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000004', 'TKI:000000000000000000000000000000000024', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000004', 'TKI:000000000000000000000000000000000024', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          ,'CLI:000000000000000000000000000000000007', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000005', 'TKI:000000000000000000000000000000000025', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L33000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000005', 'TKI:000000000000000000000000000000000025', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L33000'          ,'CLI:000000000000000000000000000000000008', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000006', 'TKI:000000000000000000000000000000000033', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L11000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000006', 'TKI:000000000000000000000000000000000033', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L11000'          ,'CLI:000000000000000000000000000000000006', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000007', 'TKI:000000000000000000000000000000000034', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000007', 'TKI:000000000000000000000000000000000034', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          ,'CLI:000000000000000000000000000000000007', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000008', 'TKI:000000000000000000000000000000000035', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000008', 'TKI:000000000000000000000000000000000035', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L22000'          ,'CLI:000000000000000000000000000000000007', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000009', 'TKI:000000000000000000000000000000000036', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L33000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000009', 'TKI:000000000000000000000000000000000036', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L33000'          ,'CLI:000000000000000000000000000000000008', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000010', 'TKI:000000000000000000000000000000000044', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L33000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000010', 'TKI:000000000000000000000000000000000044', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L33000'          ,'CLI:000000000000000000000000000000000008', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
-INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000011', 'TKI:000000000000000000000000000000000045', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L99000'          , ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+INSERT INTO ATTACHMENT VALUES('ATT:000000000000000000000000000000000011', 'TKI:000000000000000000000000000000000045', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'L99000'          ,'CLI:000000000000000000000000000000000009', ''         , ''        , ''          , ''      , ''       , ''     , CURRENT_TIMESTAMP, null              );
+
+-- TASK TABLE          (ID                                        , CREATED          , CLAIMED          , COMPLETED        , MODIFIED         , PLANNED          , DUE    , NAME    , DESCRIPTION        , NOTE              , PRIORITY, STATE    , CLASSIFICATION_CATEGORY , CLASSIFICATION_KEY,  Classification_id                        , workbasket_id                             , WORKBASKET_KEY, DOMAIN    , BUSINESS_PROCESS_ID, PARENT_BUSINESS_PROCESS_ID, OWNER , POR_COMPANY , POR_SYSTEM , POR_INSTANCE , POR_TYPE , POR_VALUE , IS_READ, IS_TRANSFERRED, CUSTOM_ATTRIBUTES, CUSTOM_1               , CUSTOM_2              , CUSTOM_3, CUSTOM_4, CUSTOM_5, CUSTOM_6, CUSTOM_7, CUSTOM_8, CUSTOM_9, CUSTOM_10 );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task01', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task02', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task03', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task04', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task05', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task06', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task07', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task08', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task09', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task10', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task11', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task12', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task13', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task14', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task15', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task16', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task17', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task18', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task19', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task20', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task21', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task22', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task23', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task24', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task25', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task26', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task27', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task28', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task29', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task30', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task31', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task32', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task33', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L10000'          , 'CLI:000000000000000000000000000000000001', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task34', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task35', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L20000'          , 'CLI:000000000000000000000000000000000002', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task36', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task37', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task38', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task39', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task40', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task41', 'Some description.', 'Some custom Note', 1       , 'READY'  , 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle B'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task42', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task43', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'EXTERN'                , 'L50000'          , 'CLI:000000000000000000000000000000000005', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task44', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task45', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task46', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'AUTOMATIC'             , 'L30000'          , 'CLI:000000000000000000000000000000000003', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task47', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task48', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000001', 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task49', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000003', 'USER_1_3'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle C'   , 'Vollkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null             , CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, dueDate, 'Task50', 'Some description.', 'Some custom Note', 1       , 'CLAIMED', 'MANUAL'                , 'L40000'          , 'CLI:000000000000000000000000000000000004', 'WBI:000000000000000000000000000000000002', 'USER_1_2'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'John', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true   , false         , null             , 'Geschaeftsstelle A'   , 'Teilkasko'           , null    , null    , null    , null    , null    , null    , null    , null      );

lib/taskana-core/src/test/resources/sql/task.sql

@@ -1,74 +1,74 @@
--- TASK TABLE          (ID                                        , CREATED              , CLAIMED              , COMPLETED            , modified             , planned              , due                  , name                      , description                                , note                                     , priority, state      , classification_key, classification_category, workbasket_key, domain    , business_process_id, parent_business_process_id, owner         , por_company , por_system , por_system_instance, por_type , por_value      , is_read, is_transferred, custom_attributes, custom1, custom2, custom3, custom4, custom5, custom6, custom7, custom8, custom9, custom10
+-- TASK TABLE          (ID                                        , CREATED              , CLAIMED              , COMPLETED            , modified             , planned              , due                  , name                      , description                                , note                                     , priority, state       , classification_category  , classification_key, classification_id                         , workbasket_id                              , workbasket_key, domain    , business_process_id, parent_business_process_id, owner         , por_company , por_system , por_system_instance, por_type , por_value      , is_read, is_transferred, custom_attributes, custom1, custom2, custom3, custom4, custom5, custom6, custom7, custom8, custom9, custom10
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'    , 'T6310'           , 'AUTOMATIC'			, 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'    , 'L110102'         , 'EXTERN'				, 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'    , 'A12'             , 'EXTERN'				, 'GPK_B_KSC'   , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , 'abc'  , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', 'WBI:100000000000000000000000000000000011' , 'GPK_B_KSC'   , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , 'abc'  , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , 'ade'  , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , 'ade'  , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000005' , 'DOC_0000000000000000005' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000005' , 'DOC_0000000000000000005' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000006' , 'DOC_0000000000000000006' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000006' , 'DOC_0000000000000000006' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000007' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , 'ffg'  , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000007' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , 'ffg'  , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000008' , 'DOC_0000000000000000008' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000008' , 'DOC_0000000000000000008' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000013' , 'DOC_0000000000000000013' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000013' , 'DOC_0000000000000000013' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000016' , 'DOC_0000000000000000016' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000016' , 'DOC_0000000000000000016' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , 'vvg'  , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , 'vvg'  , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000019' , 'DOC_0000000000000000019' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000019' , 'DOC_0000000000000000019' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , 'ijk'  , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , 'ijk'  , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000021' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000021' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000023' , 'DOC_0000000000000000023' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , 'lnp'  , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000023' , 'DOC_0000000000000000023' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , 'lnp'  , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , 'bbq'  , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , 'bbq'  , null     );
 -- Tasks for WorkOnTaskAccTest
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000025' , 'DOC_0000000000000000025' , null        , 'abcd00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , 'ert'    );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000025' , 'DOC_0000000000000000025' , null        , 'abcd00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , 'ert'    );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000026' , 'DOC_0000000000000000026' , 'user_1_1'  , 'bcde00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000026' , 'DOC_0000000000000000026' , 'user_1_1'  , 'bcde00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000027' , 'DOC_0000000000000000027' , 'user_1_2'  , 'cdef00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000027' , 'DOC_0000000000000000027' , 'user_1_2'  , 'cdef00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000028' , 'DOC_0000000000000000028' , 'user_1_1'  , 'efgh00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000028' , 'DOC_0000000000000000028' , 'user_1_1'  , 'efgh00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000029' , 'DOC_0000000000000000029' , 'user_1_2'  , 'fghj00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , 'rew'  , null   , null   , null   , 'dde'    );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000029' , 'DOC_0000000000000000029' , 'user_1_2'  , 'fghj00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , 'rew'  , null   , null   , null   , 'dde'    );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000030' , 'DOC_0000000000000000030' , 'user_1_1'  , 'ABCD00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000030' , 'DOC_0000000000000000030' , 'user_1_1'  , 'ABCD00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000031' , 'DOC_0000000000000000031' , 'user_1_1'  , 'BDCE00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000031' , 'DOC_0000000000000000031' , 'user_1_1'  , 'BDCE00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000032' , 'DOC_0000000000000000032' , 'user_1_2'  , 'CDEF00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000032' , 'DOC_0000000000000000032' , 'user_1_2'  , 'CDEF00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', '2018-01-29 15:55:24', null                 , null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000033' , 'DOC_0000000000000000033' , 'user_1_2'  , 'DEFG00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', '2018-01-29 15:55:24', null                 , null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000033' , 'DOC_0000000000000000033' , 'user_1_2'  , 'DEFG00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000034' , 'DOC_0000000000000000034' , 'user_1_1'  , 'GHIJ00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000034' , 'DOC_0000000000000000034' , 'user_1_1'  , 'GHIJ00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000035' , 'DOC_0000000000000000035' , 'user_1_1'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000035' , 'DOC_0000000000000000035' , 'user_1_1'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000100', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000100' , 'DOC_0000000000000000100' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000100', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000100' , 'DOC_0000000000000000100' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000101', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000101' , 'DOC_0000000000000000101' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , 'el'   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000101', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000101' , 'DOC_0000000000000000101' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , 'el'   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000102', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000102' , 'DOC_0000000000000000102' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000102', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000102' , 'DOC_0000000000000000102' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000103', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'    , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000103' , 'DOC_0000000000000000103' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000103', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000103' , 'DOC_0000000000000000103' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
 -- Tasks for DeleteTaskAccTest
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED'  , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000036' , 'DOC_0000000000000000036' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , 'ew'   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000036' , 'DOC_0000000000000000036' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , 'ew'   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED'  , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000037' , 'DOC_0000000000000000037' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000037' , 'DOC_0000000000000000037' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED'  , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000038' , 'DOC_0000000000000000038' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , '11'   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000038' , 'DOC_0000000000000000038' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , '11'   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED'  , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000039' , 'DOC_0000000000000000039' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000039' , 'DOC_0000000000000000039' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED'  , 'L1050'           , 'EXTERN'				, 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000040' , 'DOC_0000000000000000040' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000040' , 'DOC_0000000000000000040' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
 -- Tasks for QueryTasksWithSortingTest
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'    , 'T6310'           , 'AUTOMATIC'			, 'key5'        , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'    , 'L110102'         , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'    , 'A12'             , 'EXTERN'				, 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , 'ew'   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , 'ew'   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '06'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '06'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '05'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '05'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN' 			, 'key5'        , 'DOMAIN_A', 'PI_0000000000008' , 'DOC_0000000000000000003' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000008' , 'DOC_0000000000000000003' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_B', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASyste1' , '05'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASyste1' , '05'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000051', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_C', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000051', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000052', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_C', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '04'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000052', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '04'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000053', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000053', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000054', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000054', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000055', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASyste1' , '04'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000055', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASyste1' , '04'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000056', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_D', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000056', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000057', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000057', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000058', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_E', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '03'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000058', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '03'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000059', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '02'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000059', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '02'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000060', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_F', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000060', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000061', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000061', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000062', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_G', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000062', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000063', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000063', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000064', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000064', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000065', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'      , 'L1050'           , 'EXTERN'				, 'key5'        , 'DOMAIN_A', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000065', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );

lib/taskana-core/src/test/resources/sql/workbasket-access-list.sql

@@ -1,52 +1,52 @@
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('1', 'key1', 'Elena',        true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('1', '1', 'Elena',        true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('2', 'key2', 'Max',          true, true, true, true, true, true,  true,  true,  true,  false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('2', '2', 'Max',          true, true, true, true, true, true,  true,  true,  true,  false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('3', 'key3', 'Simone',       true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('3', '3', 'Simone',       true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('4', 'key4', 'user_1_1', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('4', '4', 'user_1_1', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
 
--- KSC authorizations (                    ID,                                                                             WB_KEY,           ACCESS_ID,    READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
+-- KSC authorizations (                    ID,                                                                             WB_KEY,    ACCESS_ID, READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
 -- PPKs
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'TEAMLEAD_1', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'TEAMLEAD_2', 'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'USER_1_1',   'user_1_1',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006',   'user_1_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'USER_1_2',   'user_1_2',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007',   'user_1_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'USER_2_1',   'user_2_1',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008',   'user_2_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'USER_2_2',   'user_2_2',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009',   'user_2_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
 -- group internal access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'TEAMLEAD_1', 'group_1',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004',    'group_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'TEAMLEAD_2', 'group_2',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005',    'group_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'USER_1_1',   'group_1',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006',    'group_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'USER_1_2',   'group_1',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007',    'group_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'USER_2_1',   'group_2',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008',    'group_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'USER_2_2',   'group_2',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009',    'group_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 -- teamlead substitution
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'TEAMLEAD_1', 'teamlead_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'TEAMLEAD_2', 'teamlead_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 -- cross team tranfers
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'USER_1_1',   'group_2',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006',    'group_2', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'USER_1_2',   'group_2',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007',    'group_2', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'USER_2_1',   'group_1',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008',    'group_1', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'USER_2_2',   'group_1',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009',    'group_1', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
 -- Team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'GPK_KSC_1',  'group_1',    true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002',    'group_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'GPK_KSC_2',  'group_2',    true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003',    'group_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
 -- Cross team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'GPK_KSC',    'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'GPK_KSC',    'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
 
 -- Access to other domains
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'GPK_B_KSC_1', 'group_1',   true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012',    'group_1', true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'GPK_B_KSC_2', 'group_2',   true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013',    'group_2', true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', 'key5',        'group_1',   true, true,  true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', '5',        'group_1',   true, true,  true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 
 -- Access to workbaskets for sorting test
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('900', 'sort001', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('900', '900', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('901', 'Sort002', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('901', '901', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('902', 'sOrt003', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('902', '902', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('903', 'soRt004', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('903', '903', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('904', 'sorT005', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('904', '904', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('905', 'Sort006', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('905', '905', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('906', 'SOrt007', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('906', '906', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('907', 'SoRt008', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('907', '907', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('908', 'SorT009', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('908', '908', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('909', 'Sort010', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('909', '909', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);

lib/taskana-core/src/test/resources/sql/workbasket.sql

@@ -2,7 +2,7 @@ INSERT INTO WORKBASKET VALUES ('1', 'key1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
 INSERT INTO WORKBASKET VALUES ('2', 'key2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket2', 'DOMAIN_A', 'CLEARANCE', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Susanne', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('3', 'key3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket3', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('4', 'key4', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket4', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
-INSERT INTO WORKBASKET VALUES ('5', 'key5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket5', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO WORKBASKET VALUES ('5', 'key5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket5', 'DOMAIN_B', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
 
 -- KSC workbaskets
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC', '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC', '', '', '', '', '', '', '', '', '');
@@ -32,4 +32,3 @@ INSERT INTO WORKBASKET VALUES ('906', 'SOrt007', CURRENT_TIMESTAMP, CURRENT_TIME
 INSERT INTO WORKBASKET VALUES ('907', 'SoRt008', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BAsxet7', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('908', 'SorT009', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BaSxet8', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('909', 'Sort010', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'BasXet9', 'DOM_XY', 'TOPIC',     'Lorem ipsum dolor sit amet.', 'Max', '', '', '', '', '', '', '', '');
-

lib/taskana-spring-txtest/src/main/java/pro/taskana/springtx/TaskanaTestController.java

@@ -116,12 +116,12 @@ public class TaskanaTestController {
     }
 
     private Workbasket createWorkBasket(String key, String name) {
-        WorkbasketImpl workbasket = (WorkbasketImpl) taskanaEngine.getWorkbasketService().newWorkbasket(key);
+        WorkbasketImpl workbasket = (WorkbasketImpl) taskanaEngine.getWorkbasketService().newWorkbasket(key,
+            "generali");
         String id1 = IdGenerator.generateWithPrefix("TWB");
         workbasket.setId(id1);
         workbasket.setName(name);
         workbasket.setType(WorkbasketType.GROUP);
-        workbasket.setDomain("generali");
         return workbasket;
     }
 }

rest/src/main/java/pro/taskana/rest/TaskController.java

@@ -71,13 +71,13 @@ public class TaskController {
         }
     }
 
-    @RequestMapping(value = "/workbasket/{workbasketKey}/state/{taskState}")
+    @RequestMapping(value = "/workbasket/{workbasketId}/state/{taskState}")
     public ResponseEntity<List<TaskSummary>> getTasksByWorkbasketIdAndState(
-        @PathVariable(value = "workbasketKey") String workbasketKey,
+        @PathVariable(value = "workbasketId") String workbasketId,
         @PathVariable(value = "taskState") TaskState taskState) {
         try {
             List<TaskSummary> taskList = taskService.createTaskQuery()
-                .workbasketKeyIn(workbasketKey)
+                .workbasketIdIn(workbasketId)
                 .stateIn(taskState)
                 .list();
             return ResponseEntity.status(HttpStatus.OK).body(taskList);
@@ -143,12 +143,12 @@ public class TaskController {
         }
     }
 
-    @RequestMapping(value = "/workbasket/{workbasketKey}", method = RequestMethod.GET)
+    @RequestMapping(value = "/workbasket/{workbasketId}", method = RequestMethod.GET)
     public ResponseEntity<List<TaskSummary>> getTasksummariesByWorkbasketId(
-        @PathVariable(value = "workbasketKey") String workbasketKey) {
+        @PathVariable(value = "workbasketId") String workbasketId) {
         List<TaskSummary> taskSummaries = null;
         try {
-            taskSummaries = taskService.createTaskQuery().workbasketKeyIn(workbasketKey).list();
+            taskSummaries = taskService.createTaskQuery().workbasketIdIn(workbasketId).list();
             return ResponseEntity.status(HttpStatus.OK).body(taskSummaries);
         } catch (NotAuthorizedToQueryWorkbasketException e) {
             return ResponseEntity.status(HttpStatus.FORBIDDEN).build();

rest/src/main/java/pro/taskana/rest/query/TaskFilter.java

@@ -28,7 +28,7 @@ public class TaskFilter {
     private static final String DESCRIPTION = "description";
     private static final String NAME = "name";
     private static final String OWNER = "owner";
-    private static final String WORKBASKET_KEY = "workbasketKey";
+    private static final String WORKBASKET_ID = "workbasketId";
     private static final String CUSTOM = "custom";
     private static final String IS_TRANSFERRED = "isTransferred";
     private static final String IS_READ = "isRead";
@@ -81,9 +81,9 @@ public class TaskFilter {
             String[] classificationKeys = extractCommaSeperatedFields(params.get(CLASSIFICATION_KEY));
             taskQuery.classificationKeyIn(classificationKeys);
         }
-        if (params.containsKey(WORKBASKET_KEY)) {
+        if (params.containsKey(WORKBASKET_ID)) {
-            String[] workbaskets = extractCommaSeperatedFields(params.get(WORKBASKET_KEY));
+            String[] workbaskets = extractCommaSeperatedFields(params.get(WORKBASKET_ID));
-            taskQuery.workbasketKeyIn(workbaskets);
+            taskQuery.workbasketIdIn(workbaskets);
         }
         if (params.containsKey(OWNER)) {
             String[] owners = extractCommaSeperatedFields(params.get(OWNER));

rest/src/main/java/pro/taskana/rest/resource/WorkbasketAccessItemResource.java

@@ -9,7 +9,7 @@ public class WorkbasketAccessItemResource extends ResourceSupport {
     public String id;
 
     @NotNull
-    public String workbasketKey;
+    public String workbasketId;
 
     @NotNull
     public String accessId;
@@ -32,14 +32,14 @@ public class WorkbasketAccessItemResource extends ResourceSupport {
     public boolean permCustom11;
     public boolean permCustom12;
 
-    public WorkbasketAccessItemResource(String id, String workbasketKey, String accessId, boolean permRead,
+    public WorkbasketAccessItemResource(String id, String workbasketId, String accessId, boolean permRead,
         boolean permOpen, boolean permAppend, boolean permTransfer, boolean permDistribute, boolean permCustom1,
         boolean permCustom2, boolean permCustom3, boolean permCustom4, boolean permCustom5, boolean permCustom6,
         boolean permCustom7, boolean permCustom8, boolean permCustom9, boolean permCustom10, boolean permCustom11,
         boolean permCustom12) {
         super();
         this.id = id;
-        this.workbasketKey = workbasketKey;
+        this.workbasketId = workbasketId;
         this.accessId = accessId;
         this.permRead = permRead;
         this.permOpen = permOpen;

rest/src/main/java/pro/taskana/rest/resource/mapper/WorkbasketAccessItemMapper.java

@@ -11,7 +11,7 @@ public class WorkbasketAccessItemMapper {
 
     public WorkbasketAccessItemResource toResource(WorkbasketAccessItem wbAccItem) {
         WorkbasketAccessItemResource resource = new WorkbasketAccessItemResource(wbAccItem.getId(),
-            wbAccItem.getWorkbasketKey(),
+            wbAccItem.getWorkbasketId(),
             wbAccItem.getAccessId(), wbAccItem.isPermRead(), wbAccItem.isPermOpen(), wbAccItem.isPermAppend(),
             wbAccItem.isPermTransfer(),
             wbAccItem.isPermDistribute(), wbAccItem.isPermCustom1(), wbAccItem.isPermCustom2(),
@@ -22,7 +22,7 @@ public class WorkbasketAccessItemMapper {
 
         // Add self-decription link to hateoas
         resource.add(
-            linkTo(methodOn(WorkbasketController.class).getWorkbasketAuthorizations(wbAccItem.getWorkbasketKey()))
+            linkTo(methodOn(WorkbasketController.class).getWorkbasketAuthorizations(wbAccItem.getWorkbasketId()))
                 .withSelfRel());
         return resource;
     }

rest/src/main/java/pro/taskana/sampledata/SampleDataGenerator.java

@@ -1,65 +1,66 @@
 package pro.taskana.sampledata;
 
-import org.apache.ibatis.jdbc.ScriptRunner;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.sql.SQLException;
 
+import javax.sql.DataSource;
+
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class SampleDataGenerator {
 
-	private static final Logger logger = LoggerFactory.getLogger(SampleDataGenerator.class);
+    private static final Logger logger = LoggerFactory.getLogger(SampleDataGenerator.class);
-	private ScriptRunner runner;
+    private ScriptRunner runner;
 
-	private static final String SQL = "/sql";
+    private static final String SQL = "/sql";
-	private static final String TEST_DATA = "/sample-data";
+    private static final String TEST_DATA = "/sample-data";
-	private static final String TASK = SQL + TEST_DATA + "/task.sql";
+    private static final String TASK = SQL + TEST_DATA + "/task.sql";
-	private static final String WORKBASKET = SQL + TEST_DATA + "/workbasket.sql";
+    private static final String WORKBASKET = SQL + TEST_DATA + "/workbasket.sql";
-	private static final String DISTRIBUTION_TARGETS = SQL + TEST_DATA + "/distribution-targets.sql";
+    private static final String DISTRIBUTION_TARGETS = SQL + TEST_DATA + "/distribution-targets.sql";
-	private static final String WORKBASKET_ACCESS_LIST = SQL + TEST_DATA + "/workbasket-access-list.sql";
+    private static final String WORKBASKET_ACCESS_LIST = SQL + TEST_DATA + "/workbasket-access-list.sql";
-	private static final String CLASSIFICATION = SQL + TEST_DATA + "/classification.sql";
+    private static final String CLASSIFICATION = SQL + TEST_DATA + "/classification.sql";
-	private static final String OBJECT_REFERENCE = SQL + TEST_DATA + "/object-reference.sql";
+    private static final String OBJECT_REFERENCE = SQL + TEST_DATA + "/object-reference.sql";
 
-	public SampleDataGenerator(DataSource dataSource) throws SQLException {
+    public SampleDataGenerator(DataSource dataSource) throws SQLException {
-		if (logger.isDebugEnabled()) {
+        if (logger.isDebugEnabled()) {
-			logger.debug(dataSource.getConnection().getMetaData().toString());
+            logger.debug(dataSource.getConnection().getMetaData().toString());
-		}
+        }
-		runner = new ScriptRunner(dataSource.getConnection());
+        runner = new ScriptRunner(dataSource.getConnection());
-	}
+    }
 
-	/**
+    /**
-	 * Creates sample data for manual testing purposes.
+     * Creates sample data for manual testing purposes.
-	 * 
+     * 
-	 * @throws SQLException
+     * @throws SQLException
-	 */
+     */
-	public void generateSampleData() throws SQLException {
+    public void generateSampleData() throws SQLException {
-		StringWriter outWriter = new StringWriter();
+        StringWriter outWriter = new StringWriter();
-		PrintWriter logWriter = new PrintWriter(outWriter);
+        PrintWriter logWriter = new PrintWriter(outWriter);
 
-		StringWriter errorWriter = new StringWriter();
+        StringWriter errorWriter = new StringWriter();
-		PrintWriter errorLogWriter = new PrintWriter(errorWriter);
+        PrintWriter errorLogWriter = new PrintWriter(errorWriter);
 
-		runner.setStopOnError(true);
+        runner.setStopOnError(true);
-		runner.setLogWriter(logWriter);
+        runner.setLogWriter(logWriter);
-		runner.setErrorLogWriter(errorLogWriter);
+        runner.setErrorLogWriter(errorLogWriter);
 
-		runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(TASK)));
+        runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET)));
-		runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET)));
+        runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(DISTRIBUTION_TARGETS)));
-		runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(DISTRIBUTION_TARGETS)));
+        runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(CLASSIFICATION)));
-		runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(CLASSIFICATION)));
+        runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(TASK)));
-		runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET_ACCESS_LIST)));
+        runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(WORKBASKET_ACCESS_LIST)));
-		runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(OBJECT_REFERENCE)));
+        runner.runScript(new InputStreamReader(this.getClass().getResourceAsStream(OBJECT_REFERENCE)));
 
-		runner.closeConnection();
+        runner.closeConnection();
 
-		logger.debug(outWriter.toString());
+        logger.debug(outWriter.toString());
-		if (!errorWriter.toString().trim().isEmpty()) {
+        if (!errorWriter.toString().trim().isEmpty()) {
-			logger.error(errorWriter.toString());
+            logger.error(errorWriter.toString());
-		}
+        }
-	}
+    }
 
 }

rest/src/main/resources/sql/sample-data/task.sql

@@ -1,21 +1,74 @@
-INSERT INTO TASK VALUES('1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, 'Task1', 'Lorem ipsum dolor sit amet.', '', 1, 'READY', 'L10000', 'EXTERN', 'key1', 'DOMAIN_A', 'BPI1', 'PBPI1', 'Stefan', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1', true, false, null, null, null, null, null, null, null, null, null, null, null);
+-- TASK TABLE          (ID                                        , CREATED              , CLAIMED              , COMPLETED            , modified             , planned              , due                  , name                      , description                                , note                                     , priority, state       , classification_category  , classification_key, classification_id                         , workbasket_id                              , workbasket_key, domain    , business_process_id, parent_business_process_id, owner         , por_company , por_system , por_system_instance, por_type , por_value      , is_read, is_transferred, custom_attributes, custom1, custom2, custom3, custom4, custom5, custom6, custom7, custom8, custom9, custom10
-INSERT INTO TASK VALUES('2', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task2', 'Lorem ipsum dolor sit amet. ', 'Some custom Note', 1, 'READY', 'L10000', 'EXTERN', 'key1', 'DOMAIN_A', 'BPI2', 'PBPI2', 'Frank', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task3', 'Lorem ipsum dolor sit amet. ', '', 1, 'CLAIMED', 'L10000', 'EXTERN', 'key1', 'DOMAIN_A', 'BPI3', 'PBPI3', 'Stefan', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3', true, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000006' , 'USER_1_1'    , 'DOMAIN_A', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('4', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task4', 'Lorem ipsum dolor sit amet.', 'Some custom Note', 1, 'CLAIMED', 'L1050', 'EXTERN', 'key1', 'DOMAIN_A', 'BPI4', 'PBPI4', 'Frank', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1', false, true, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', 'WBI:100000000000000000000000000000000011' , 'GPK_B_KSC'   , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , 'abc'  , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task5', 'Lorem ipsum dolor sit amet.', '', 1, 'COMPLETED', 'L1050', 'EXTERN', 'key1', 'DOMAIN_A', 'BPI5', 'PBPI5', 'Stefan', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000003', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('6', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task6', 'Lorem ipsum dolor sit amet.', 'Some custom Note', 1, 'COMPLETED', 'L1050', 'EXTERN', 'key1', 'DOMAIN_A', 'BPI6', 'PBPI6', 'Frank', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000004', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , 'ade'  , null   , null   , null   , null   , null   , null   , null   , null     );
-
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000005', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000005' , 'DOC_0000000000000000005' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('7', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task7', 'Lorem ipsum dolor sit amet.', '', 1, 'READY', 'DOCTYPE_DEFAULT', 'EXTERN', 'key2', 'DOMAIN_A', 'BPI7', 'PBPI7', 'Stefan', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1' , false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000006', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000006' , 'DOC_0000000000000000006' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('8', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task8', 'Lorem ipsum dolor sit amet. ', 'Some custom Note', 1, 'READY', 'DOCTYPE_DEFAULT', 'EXTERN', 'key2', 'DOMAIN_A', 'BPI8', 'PBPI8', 'Frank',  'Company2', 'System2', 'Instance2', 'Type2', 'Value2', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000007', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000007' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , 'ffg'  , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('9', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task9', 'Lorem ipsum dolor sit amet.', '', 1, 'CLAIMED', 'T2100', 'MANUAL', 'key2', 'DOMAIN_A', 'BPI9', 'PBPI9', 'Stefan', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3', true, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000008', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000008' , 'DOC_0000000000000000008' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('10', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task10', 'Lorem ipsum dolor sit amet.', 'Some custom Note', 1, 'CLAIMED', 'T2100', 'MANUAL', 'key2', 'DOMAIN_A', 'BPI10', 'PBPI10', 'Frank', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000009', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('11', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task11', 'Lorem ipsum dolor sit amet. ', 'Some custom Note', 1, 'COMPLETED', 'T2100', 'MANUAL', 'key2', 'DOMAIN_A', 'BPI11', 'PBPI11', 'Stefan', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000010', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('12', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task12', 'Lorem ipsum dolor sit amet.', '', 1, 'COMPLETED', 'L10303', 'EXTERN', 'key2', 'DOMAIN_A', 'BPI12', 'PBPI12', 'Frank', 'Company3', 'System3', 'Instance3', 'Type3', 'Value3', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000011', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000012', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000013', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000013' , 'DOC_0000000000000000013' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , 'rty'  , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('13', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task12', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus massa turpis, pellentesque ut libero sit aet, malesuada suscipit dolor. Sed volutpat euismod felis sit amet molestie. Fusce ornare purus dui. ', 'Some custom Note', 1, 'READY', 'T2100', 'MANUAL', 'key2', 'DOMAIN_A', 'BPI13', 'PBPI13', 'Frank', 'Company1', 'System1', 'Instance1', 'Type1', 'Value1', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000014', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('14', CURRENT_TIMESTAMP, null, null, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, 'Task6', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Fusce sagittis vulputate nibh ut malesuada. Etiam ac dictum tellus, nec cursus nunc. Curabitur velit eros, feugiat volutpat laoreet vitae, cursus eu dui. Nulla ut purus sem. Vivamus aliquet odio vitae erat cursus, vitae mattis urna mollis. Nam quam tellus, auctor id volutpat congue, viverra vitae ante. Duis nisi dolor, elementum et mattis at, maximus id velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Duis eu condimentum risus. Praesent libero velit, facilisis sit amet maximus non, scelerisque ullamcorper leo. Ut sit amet iaculis eros. Mauris sagittis nibh lacus, at facilisis magna suscipit at. Aliquam finibus tempor odio id commodo. Vivamus aliquam, justo id porta imperdiet, mi.', '', 1, 'READY', 'T2100', 'MANUAL', 'key1', 'DOMAIN_A', 'BPI14', 'PBPI14', 'Frank', 'Company2', 'System2', 'Instance2', 'Type2', 'Value2', false, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000015', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000016', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000016' , 'DOC_0000000000000000016' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
-INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000000', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, 'Task99', 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note', 1, 'READY', 'T6310', 'AUTOMATIC',  'key4', 'DOMAIN_A', 'BPI21', 'PBPI21', 'Konrad', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000017', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , 'vvg'  , null   , null   , null   , null     );
--- INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000001', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, 'Task01', 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note', 2, 'READY', '12', 'USER_1_1', 'DOMAIN_A', 'BPI21', 'PBPI21', 'Konrad', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000018', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
--- INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000002', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, null, 'Task02', 'Lorem ipsum was n Quatsch dolor sit amet. Aber stimmt.', 'Some custom Note', 2, 'READY', '12', 'Gruppenpostkorb KSC B', 'DOMAIN_B', 'BPI21', 'PBPI21', 'Konrad', 'MyCompany1', 'MySystem1', 'MyInstance1', 'MyType1', 'MyValue1', true, false, null, null, null, null, null, null, null, null, null, null, null);
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000019', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000019' , 'DOC_0000000000000000019' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000020', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , 'ijk'  , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000021', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000021' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000022', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000023', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000023' , 'DOC_0000000000000000023' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , 'lnp'  , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000024', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000001' , 'GPK_KSC'     , 'DOMAIN_A', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , 'bbq'  , null     );
+-- Tasks for WorkOnTaskAccTest
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000025', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000025' , 'DOC_0000000000000000025' , null        , 'abcd00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , 'ert'    );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000026', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000026' , 'DOC_0000000000000000026' , 'user_1_1'  , 'bcde00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000027', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000027' , 'DOC_0000000000000000027' , 'user_1_2'  , 'cdef00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000028', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000028' , 'DOC_0000000000000000028' , 'user_1_1'  , 'efgh00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000029', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000029' , 'DOC_0000000000000000029' , 'user_1_2'  , 'fghj00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , 'rew'  , null   , null   , null   , 'dde'    );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000030', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000030' , 'DOC_0000000000000000030' , 'user_1_1'  , 'ABCD00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000031', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000031' , 'DOC_0000000000000000031' , 'user_1_1'  , 'BDCE00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000032', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000032' , 'DOC_0000000000000000032' , 'user_1_2'  , 'CDEF00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000033', '2018-01-29 15:55:24', null                 , null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000033' , 'DOC_0000000000000000033' , 'user_1_2'  , 'DEFG00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000034', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000034' , 'DOC_0000000000000000034' , 'user_1_1'  , 'GHIJ00'    , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000035', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000035' , 'DOC_0000000000000000035' , 'user_1_1'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000100', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000100' , 'DOC_0000000000000000100' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000101', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000101' , 'DOC_0000000000000000101' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , 'el'   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000102', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000102' , 'DOC_0000000000000000102' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000103', '2018-01-29 15:55:24', '2018-01-30 15:55:24', null                 , '2018-01-30 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000103' , 'DOC_0000000000000000103' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '98765432'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+-- Tasks for DeleteTaskAccTest
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000036', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000036' , 'DOC_0000000000000000036' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , 'ew'   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000037', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000037' , 'DOC_0000000000000000037' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000038', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000038' , 'DOC_0000000000000000038' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , '11'   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000039', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000039' , 'DOC_0000000000000000039' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000040', '2018-01-29 15:55:24', '2018-01-30 15:55:24', '2018-01-30 16:55:24', '2018-01-30 16:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'COMPLETED' , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', 'WBI:100000000000000000000000000000000007' , 'USER_1_2'    , 'DOMAIN_A', 'PI_0000000000040' , 'DOC_0000000000000000040' , 'user_1_2'  , '00'        , 'PASystem' , '00'               , 'SDNR'   , '00011122'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+-- Tasks for QueryTasksWithSortingTest
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000041', '2018-01-29 15:55:00', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:00', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task99'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 1       , 'CLAIMED'   , 'AUTOMATIC'              , 'T6310'           , 'CLI:000000000000000000000000000000000011', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000042', '2018-01-29 15:55:01', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:01', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task01'                  , 'Lorem ipsum was n Quatsch dolor sit amet.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'L110102'         , 'CLI:100000000000000000000000000000000005', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000043', '2018-01-29 15:55:02', '2018-01-30 15:55:00', null                 , '2018-01-30 15:55:02', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Task02'                  , 'Lorem ipsum was n Quatsch t. Aber stimmt.', 'Some custom Note'                       , 2       , 'CLAIMED'   , 'EXTERN'                 , 'A12'             , 'CLI:200000000000000000000000000000000001', '5'                                        , 'key5'        , 'DOMAIN_B', 'BPI21'            , 'PBPI21'                  , 'user_1_1'  , 'MyCompany1', 'MySystem1', 'MyInstance1'      , 'MyType1', 'MyValue1'     , true   , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000044', '2018-01-29 15:55:03', null                 , null                 , '2018-01-29 15:55:03', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000003' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , 'ew'   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000045', '2018-01-29 15:55:04', null                 , null                 , '2018-01-29 15:55:04', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000004' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000046', '2018-01-29 15:55:05', null                 , null                 , '2018-01-29 15:55:05', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '06'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000047', '2018-01-29 15:55:06', null                 , null                 , '2018-01-29 15:55:06', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000003' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000048', '2018-01-29 15:55:07', null                 , null                 , '2018-01-29 15:55:07', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000004' , 'DOC_0000000000000000007' , null        , '00'        , 'PASystem' , '05'               , 'VNR'    , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000049', '2018-01-29 15:55:08', null                 , null                 , '2018-01-29 15:55:08', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000008' , 'DOC_0000000000000000003' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000050', '2018-01-29 15:55:09', null                 , null                 , '2018-01-29 15:55:09', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000009' , 'DOC_0000000000000000009' , null        , '00'        , 'PASyste1' , '05'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000051', '2018-01-29 15:55:10', null                 , null                 , '2018-01-29 15:55:10', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000010' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000052', '2018-01-29 15:55:11', null                 , null                 , '2018-01-29 15:55:11', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000011' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '04'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000053', '2018-01-29 15:55:12', null                 , null                 , '2018-01-29 15:55:12', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000012' , 'DOC_0000000000000000012' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000054', '2018-01-29 15:55:13', null                 , null                 , '2018-01-29 15:55:13', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASystem' , '00'               , 'VNR'    , '22334455'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000055', '2018-01-29 15:55:14', null                 , null                 , '2018-01-29 15:55:14', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000014' , 'DOC_0000000000000000014' , null        , '00'        , 'PASyste1' , '04'               , 'VNR'    , '12345678'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000056', '2018-01-29 15:55:15', null                 , null                 , '2018-01-29 15:55:15', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000015' , 'DOC_0000000000000000015' , null        , '00'        , 'PASyste1' , '00'               , 'VNR'    , '23456789'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000057', '2018-01-29 15:55:16', null                 , null                 , '2018-01-29 15:55:16', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '34567890'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000058', '2018-01-29 15:55:17', null                 , null                 , '2018-01-29 15:55:17', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000017' , 'DOC_0000000000000000017' , null        , '00'        , 'PASystem' , '03'               , 'VNR'    , '45678901'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000059', '2018-01-29 15:55:18', null                 , null                 , '2018-01-29 15:55:18', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000018' , 'DOC_0000000000000000018' , null        , '00'        , 'PASystem' , '02'               , 'VNR'    , '56789012'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000060', '2018-01-29 15:55:19', null                 , null                 , '2018-01-29 15:55:19', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000010' , 'DOC_0000000000000000011' , null        , '00'        , 'PASyste2' , '00'               , 'VNR'    , '67890123'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000061', '2018-01-29 15:55:20', null                 , null                 , '2018-01-29 15:55:20', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000020' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000062', '2018-01-29 15:55:21', null                 , null                 , '2018-01-29 15:55:21', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASyste2' , '01'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000063', '2018-01-29 15:55:22', null                 , null                 , '2018-01-29 15:55:22', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000022' , 'DOC_0000000000000000022' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000064', '2018-01-29 15:55:23', null                 , null                 , '2018-01-29 15:55:23', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000020' , 'DOC_0000000000000000021' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );
+INSERT INTO TASK VALUES('TKI:000000000000000000000000000000000065', '2018-01-29 15:55:24', null                 , null                 , '2018-01-29 15:55:24', '2018-01-29 15:55:00', '2018-01-30 15:55:00', 'Widerruf'                , 'Widerruf'                                 , null                                     , 2       , 'READY'     , 'EXTERN'                 , 'L1050'           , 'CLI:000000000000000000000000000000000003', '5'                                        , 'key5'        , 'DOMAIN_B', 'PI_0000000000024' , 'DOC_0000000000000000024' , null        , '00'        , 'PASystem' , '00'               , 'SDNR'   , '11223344'     , false  , false         , null             , null   , null   , null   , null   , null   , null   , null   , null   , null   , null     );

rest/src/main/resources/sql/sample-data/workbasket-access-list.sql

@@ -1,38 +1,52 @@
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('1', 'key1', 'Elena', 	true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('1', '1', 'Elena',        true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('2', 'key2', 'Max', 		true, true, true, true, true, true,  true,  true,  true,  false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('2', '2', 'Max',          true, true, true, true, true, true,  true,  true,  true,  false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('3', 'key3', 'Simone', 	true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('3', '3', 'Simone',       true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('4', '4', 'user_1_1', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
 
--- KSC authorizations (                    ID, 										   WB_KEY, 	     ACCESS_ID,    READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
+-- KSC authorizations (                    ID,                                                                             WB_KEY,    ACCESS_ID, READ, OPEN, APPEND, TRANSFER, DISTRIBUTE, C1, .., C12)
 -- PPKs
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'TEAMLEAD_1', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000001', 'WBI:100000000000000000000000000000000004', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'TEAMLEAD_2', 'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000002', 'WBI:100000000000000000000000000000000005', 'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'USER_1_1',   'user_1_1',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000003', 'WBI:100000000000000000000000000000000006',   'user_1_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'USER_1_2',   'user_1_2',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000004', 'WBI:100000000000000000000000000000000007',   'user_1_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'USER_2_1',   'user_2_1',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000005', 'WBI:100000000000000000000000000000000008',   'user_2_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'USER_2_2',   'user_2_2',   true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000006', 'WBI:100000000000000000000000000000000009',   'user_2_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
 -- group internal access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'TEAMLEAD_1', 'group_1',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000007', 'WBI:100000000000000000000000000000000004',    'group_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'TEAMLEAD_2', 'group_2',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000008', 'WBI:100000000000000000000000000000000005',    'group_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'USER_1_1',   'group_1',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000009', 'WBI:100000000000000000000000000000000006',    'group_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'USER_1_2',   'group_1',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000010', 'WBI:100000000000000000000000000000000007',    'group_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'USER_2_1',   'group_2',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000011', 'WBI:100000000000000000000000000000000008',    'group_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'USER_2_2',   'group_2',    true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000012', 'WBI:100000000000000000000000000000000009',    'group_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 -- teamlead substitution
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'TEAMLEAD_1', 'teamlead_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000013', 'WBI:100000000000000000000000000000000004', 'teamlead_2', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'TEAMLEAD_2', 'teamlead_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000014', 'WBI:100000000000000000000000000000000005', 'teamlead_1', true, true, true,   true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 -- cross team tranfers
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'USER_1_1',   'group_2',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000015', 'WBI:100000000000000000000000000000000006',    'group_2', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'USER_1_2',   'group_2',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000016', 'WBI:100000000000000000000000000000000007',    'group_2', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'USER_2_1',   'group_1',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000017', 'WBI:100000000000000000000000000000000008',    'group_1', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'USER_2_2',   'group_1',    true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000018', 'WBI:100000000000000000000000000000000009',    'group_1', true, false, true,  false,    false,      false, false, false, false, false, false, false, false, false, false, false, false);
 -- Team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'GPK_KSC_1',  'group_1',    true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000019', 'WBI:100000000000000000000000000000000002',    'group_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'GPK_KSC_2',  'group_2',    true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000020', 'WBI:100000000000000000000000000000000003',    'group_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
 -- Cross team GPK access
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'GPK_KSC',    'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000021', 'WBI:100000000000000000000000000000000001', 'teamlead_1', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'GPK_KSC',    'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000022', 'WBI:100000000000000000000000000000000001', 'teamlead_2', true, true, true,   true,     true,       true, true, true, true, true, true, true, true, true, true, true, true);
 
 -- Access to other domains
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'GPK_B_KSC_1', 'group_1',   true, false, true,  true,     false,      true,   false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000023', 'WBI:100000000000000000000000000000000012',    'group_1', true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
-INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'GPK_B_KSC_2', 'group_2',   true, false, true,  true,     false,      false,  false, false, false, false, false, false, false, false, false, false, false);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000024', 'WBI:100000000000000000000000000000000013',    'group_2', true, false, true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
 
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('WAI:100000000000000000000000000000000025', '5',        'group_1',   true, true,  true,  true,     false,      false, false, false, false, false, false, false, false, false, false, false, false);
+
+-- Access to workbaskets for sorting test
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('900', '900', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('901', '901', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('902', '902', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('903', '903', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('904', '904', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('905', '905', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('906', '906', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('907', '907', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('908', '908', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);
+INSERT INTO WORKBASKET_ACCESS_LIST VALUES ('909', '909', 'max', true, true, true, true, true, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true);

rest/src/main/resources/sql/sample-data/workbasket.sql

@@ -2,15 +2,16 @@ INSERT INTO WORKBASKET VALUES ('1', 'key1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP
 INSERT INTO WORKBASKET VALUES ('2', 'key2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket2', 'DOMAIN_A', 'CLEARANCE', 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Susanne', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('3', 'key3', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket3', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('4', 'key4', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket4', 'DOMAIN_A', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
+INSERT INTO WORKBASKET VALUES ('5', 'key5', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Basket5', 'DOMAIN_B', 'TOPIC',     'Lorem ipsum dolor sit amet, consectetur adipiscing elit.', 'Max', '', '', '', '', '', '', '', '');
 
 -- KSC workbaskets
-INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC', '', '', '', '', '', '', '', '', '');
+INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000001', 'GPK_KSC', '2018-02-01 12:00:00', '2018-02-01 12:00:00', 'Gruppenpostkorb KSC', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000002', 'GPK_KSC_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC 1', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC 1', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000003', 'GPK_KSC_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'Gruppenpostkorb KSC 2', 'DOMAIN_A', 'GROUP', 'Gruppenpostkorb KSC 2', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000004', 'TEAMLEAD_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK Teamlead KSC 1', 'DOMAIN_A', 'PERSONAL', 'PPK Teamlead KSC 1', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000005', 'TEAMLEAD_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK Teamlead KSC 2', 'DOMAIN_A', 'PERSONAL', 'PPK Teamlead KSC 2', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000006', 'USER_1_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 1', 'DOMAIN_A', 'PERSONAL', 'PPK User 1 KSC 1', '', '', '', '', '', '', '', '', '');
-INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000007', 'USER_1_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 2 KSC 1', 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 1', '', '', '', '', '', '', '', '', '');
+INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000007', 'USER_1_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 2 KSC 1', 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 1', 'Peter Maier', '', '', '', '', 'Versicherung', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000008', 'USER_2_1', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 1 KSC 2', 'DOMAIN_A', 'PERSONAL', 'PPK User 1 KSC 2', '', '', '', '', '', '', '', '', '');
 INSERT INTO WORKBASKET VALUES ('WBI:100000000000000000000000000000000009', 'USER_2_2', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'PPK User 2 KSC 2', 'DOMAIN_A', 'PERSONAL', 'PPK User 2 KSC 2', '', '', '', '', '', '', '', '', '');