Subject: [PATCH] YMS-1420 bugfix due to the change of public modificator and corresponding FE problems
---
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskBuilder.java	(date 1727348159493)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequenceHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequenceHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequenceHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequenceHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequenceHandler.java	(date 1727362344031)
@@ -5,13 +5,9 @@
 import javax.inject.Inject;
 
 import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.yard.reference.TransitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskHandler;
-import eu.reply.lea.services.yms.task.TaskReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommand;
-import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommandInfo;
-import eu.reply.sce.backend.core.event.ConfigurableEventProducer;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.TaskDequeueService;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 @SuppressWarnings("rawtypes")
@@ -22,7 +18,7 @@
     private LocationAwareTaskHandler locationAwareTaskHandler;
 
     @Inject
-    private ConfigurableEventProducer<TaskDequeueCommand> taskDequeueCommandProducer;
+    private TaskDequeueService taskDequeueService;
 
     /**
      * Blocks and Dequeues all the task after transitTask
@@ -34,16 +30,13 @@
         LocationAwareTask<?,?,?> transitTask) {
         this.debug("[blockAndDequeueAllTasksAfter] Blocking Dequeing all the tasks after [{}]", transitTask);
         List<LocationAwareTask<?,?,?>> taskSequence = transitTask.getSequence().getTasks();
-        List<LocationAwareTask> locationAwareTasksAfterTask = taskSequence.stream()
+        List<LocationAwareTask<?,?,?>> locationAwareTasksAfterTask = taskSequence.stream()
                 .filter(t -> (t.getSequenceNumber() > transitTask.getSequenceNumber())).collect(Collectors.toList());
         for (LocationAwareTask locationAwareTask : locationAwareTasksAfterTask) {
             this.debug("[blockAndDequeueAllTasksAfter] Blocking Dequeing task [{}]", locationAwareTask);
             locationAwareTaskHandler.blockTask(locationAwareTask);
         }
-        taskDequeueCommandProducer.fire(new TaskDequeueCommand(
-            new TaskDequeueCommandInfo(locationAwareTasksAfterTask.stream().map(t->new TaskReference(t)).collect(Collectors.toList()),
-                                       locationAwareTasksAfterTask.stream().map(t->t.getLocation()).collect(Collectors.toList()),
-                                       new TransitReference(transitTask.getLogisticUnitReference()))));
+        taskDequeueService.dequeueTasks(locationAwareTasksAfterTask);
     }
 
 
Index: ../application/yms-application/lea-yms-application/src/main/resources/update-1.7.0.sql
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/resources/update-1.7.0.sql b/../application/yms-application/lea-yms-application/src/main/resources/update-1.7.0.sql
--- a/../application/yms-application/lea-yms-application/src/main/resources/update-1.7.0.sql	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/resources/update-1.7.0.sql	(date 1727364314465)
@@ -538,3 +538,14 @@
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 
 
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.pickup.PickupTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.pickup.PickupTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.sealing.SealingTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask');
+UPDATE `BusinessSequence` SET `type` = 'eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask' WHERE (`type` = 'eu.reply.lea.services.yms.task.mission.MissionTask');
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/InternalTaskBuilderDirector.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/InternalTaskBuilderDirector.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/InternalTaskBuilderDirector.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/InternalTaskBuilderDirector.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/InternalTaskBuilderDirector.java	(date 1727348144713)
@@ -12,8 +12,8 @@
 import eu.reply.lea.services.yms.task.dockaware.loading.LoadingTaskBuilder;
 import eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTask;
 import eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTaskBuilder;
-import eu.reply.lea.services.yms.task.mission.MissionTask;
-import eu.reply.lea.services.yms.task.mission.MissionTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskBuilder;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskBuilder.java	(date 1727348159427)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 @Logged
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskDetail.java	(date 1727348159291)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 import java.util.Objects;
 import javax.annotation.Nonnull;
@@ -6,7 +6,7 @@
 import javax.persistence.ManyToOne;
 
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 
 @Entity
 public class MissionTaskDetail extends LocationAwareTaskDetail<MissionTask> {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskConfiguration.java	(date 1727348159298)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -8,7 +8,7 @@
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.process.task.entities.exceptions.TaskConfigurationNotFoundException;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/RegistrationTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/RegistrationTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/RegistrationTaskConfigurationProcessor.java	(date 1727348392916)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskBuilder.java	(date 1727348159619)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -7,7 +7,7 @@
 import eu.reply.lea.services.yard.model.Transit;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskHeader.java	(date 1727348144765)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import javax.persistence.Embeddable;
 import javax.validation.constraints.Min;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskConfiguration.java	(date 1727348159521)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -8,7 +8,7 @@
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTask.java	(date 1727348159184)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -22,7 +22,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
 import eu.reply.lea.services.process.task.entities.TaskStatus;
@@ -32,7 +31,7 @@
 import eu.reply.lea.services.yard.model.HandlingRequest;
 import eu.reply.lea.services.yard.model.Transit;
 import eu.reply.lea.services.yard.reference.TransitReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitResourceWeightObserverTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitResourceWeightObserverTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitResourceWeightObserverTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitResourceWeightObserverTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitResourceWeightObserverTest.java	(date 1727348144863)
@@ -14,7 +14,7 @@
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.event.WeighingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.event.WeighingTaskDetailExecutedInfo;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 
 public class LoadingUnitResourceWeightObserverTest {
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/anpr/AnprHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/anpr/AnprHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/anpr/AnprHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/anpr/AnprHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/anpr/AnprHandler.java	(date 1727348392932)
@@ -32,13 +32,13 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.exception.AnprException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckInTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckOutTaskProcessor;
 import eu.reply.sce.backend.core.jee.configuration.Configuration;
 import eu.reply.sce.backend.core.jee.configuration.ModuleConfiguration;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskExecuteAction.java	(date 1727348144904)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import eu.reply.lea.services.masterdata.reference.LanguageReference;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskDetail.java	(date 1727348159487)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import java.util.Objects;
 
@@ -7,8 +7,7 @@
 import javax.persistence.ManyToOne;
 
 import eu.reply.lea.services.common.embedded.LicencePlate;
-import eu.reply.lea.services.process.task.entities.Task;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/RegistrationTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/RegistrationTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/RegistrationTaskProcessor.java	(date 1727348392895)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import com.neovisionaries.i18n.CountryCode;
 import eu.reply.lea.services.common.embedded.DrivingLicence;
@@ -27,11 +27,14 @@
 import eu.reply.lea.services.yard.model.Transit;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.boundary.YardService;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
 import eu.reply.lea.services.yms.task.event.RegistrationTaskClosedEvent;
 import eu.reply.lea.services.yms.task.event.RegistrationTaskClosedEventInfo;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetailInfo;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskExecuteAction;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
@@ -266,7 +269,8 @@
 
         if (action.getRegistrationTaskDetailInfo() != null) {
             for (RegistrationTaskDetailInfo info : action.getRegistrationTaskDetailInfo()) {
-                RegistrationTaskDetail detail = new RegistrationTaskDetail(task, info.getTrailerPlate(), info.getTrailerPlateCountry(), info.getBic(), info.isLoading(), info.isUnloading(), info.isPickup(), info.isDropOff());
+                RegistrationTaskDetail
+                    detail = new RegistrationTaskDetail(task, info.getTrailerPlate(), info.getTrailerPlateCountry(), info.getBic(), info.isLoading(), info.isUnloading(), info.isPickup(), info.isDropOff());
                 task.addDetail(detail);
             }
         }
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskConfiguration.java	(date 1727348159311)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 
 @Entity
 public class SealingTaskConfiguration extends LocationAwareTaskConfiguration<SealingTaskHeader> {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TasksObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TasksObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TasksObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TasksObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TasksObserver.java	(date 1727348082212)
@@ -36,8 +36,8 @@
 import eu.reply.lea.services.yms.task.event.task.ResetTaskInfoForAdviseMessageEvent;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.lea.services.yms.task.factory.TransitTaskBuilderDirector;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskDetail;
 import eu.reply.lea.services.yms.task.sequence.TasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskDetailProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskDetailProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskDetailProcessor.java	(date 1727348266899)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import java.util.Calendar;
 import javax.inject.Inject;
@@ -8,9 +8,10 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.boundary.AbstractProcessor;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
 import eu.reply.lea.services.yms.task.dockaware.action.BaseDockAwareExecuteAction;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 
 public abstract class LocationAwareTaskDetailProcessor<D extends LocationAwareTaskDetail<? extends LocationAwareTask<?,?,?>>> extends
     AbstractProcessor {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/QueueObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/QueueObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/observer/TaskClosureObserver.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/QueueObserver.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/observer/TaskClosureObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/QueueObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/observer/TaskClosureObserver.java	(date 1727348159365)
@@ -1,86 +1,41 @@
-package eu.reply.lea.services.yms.task.observer;
+package eu.reply.lea.services.yms.task.locationaware.observer;
 
 import java.io.Serializable;
-import java.util.Collections;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
-import javax.persistence.EntityManager;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
-import org.slf4j.Logger;
 
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.yard.exceptions.LoadingUnitActionException;
-import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.TaskReference;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskStatusChangedEventInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.queue.QueueHandler;
-import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommand;
-import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommandInfo;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskApplicationService;
 import eu.reply.lea.services.yms.util.ObjectMapperUtility;
-import eu.reply.sce.backend.core.event.ConfigurableEventProducer;
 import eu.reply.sce.backend.core.event.ModuleEvent;
 import eu.reply.sce.backend.core.event.Observer;
-import eu.reply.sce.backend.core.jee.configuration.ModuleConfiguration;
-import eu.reply.sce.backend.core.jee.configuration.entity.EntityReferenceHandler;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
 @Observer
 @Logged
 @ApplicationScoped
-public class QueueObserver implements Serializable {
-
-    @Inject
-    private Logger logger;
+public class TaskClosureObserver implements Serializable {
 
-    @Inject
-    @ModuleConfiguration.Module(ModuleConfiguration.Module.CURRENT)
-    private EntityManager em;
-
-
-    @Inject
-    private QueueHandler queueHandler;
 
     @Inject
-    private EntityReferenceHandler entityReferenceHandler;
-
-    @Inject
-    private ConfigurableEventProducer<TaskDequeueCommand> taskDequeueCommandProducer;
+    private LocationAwareTaskApplicationService locationAwareTaskApplicationService;
 
 
-    /**
-     * Trace message
-     *
-     * @param format format message to be traced.
-     * @param args   value of the format message
-     */
-    public void debug(String format, Object... args) {
-        if (this.logger != null) {
-            this.logger.debug(format, args);
-        }
-    }
-
-
-    @TransactionAttribute(TransactionAttributeType.REQUIRED)
     public void dequeueTask(
         @Observes @ModuleEvent("externalTaskClosedEvent") final JsonNode taskClosedEvent)
         throws MasterdataServiceException, LoadingUnitActionException, JsonProcessingException {
         LocationAwareTaskStatusChangedEventInfo payload =
             ObjectMapperUtility.getMapper().treeToValue(taskClosedEvent, LocationAwareTaskStatusChangedEventInfo.class);
-        final LocationAwareTask<?,?,?>
-            task =  entityReferenceHandler.getEntity(payload.getTaskRef(), em);
-        if (task.getLocation()!=null) {
-            taskDequeueCommandProducer.fire(new TaskDequeueCommand(
-                new TaskDequeueCommandInfo(Collections.singletonList(new TaskReference(task)),
-                                           Collections.singletonList(task.getLocation()),
-                                           new TransitReference(task.getLogisticUnitReference()))));
-        }
+        locationAwareTaskApplicationService.handleTaskClosure(new TaskReference(payload.getTaskRef()));
+
     }
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TaskUpdatedDispatcher.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TaskUpdatedDispatcher.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TaskUpdatedDispatcher.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TaskUpdatedDispatcher.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/observer/TaskUpdatedDispatcher.java	(date 1727348159376)
@@ -22,7 +22,7 @@
 import eu.reply.lea.services.yms.task.event.sms.NotifyWithSmsForTaskEnqueuedEvent;
 import eu.reply.lea.services.yms.task.event.sms.NotifyWithSmsForTaskEnterEvent;
 import eu.reply.lea.services.yms.task.event.sms.NotifyWithSmsForTaskUnlockedEvent;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.event.ConfigurableEventProducer;
 import eu.reply.sce.backend.core.event.ModuleEvent;
Index: ../application/yms-application/lea-yms-application/src/test/resources/META-INF/persistence.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/resources/META-INF/persistence.xml b/../application/yms-application/lea-yms-application/src/test/resources/META-INF/persistence.xml
--- a/../application/yms-application/lea-yms-application/src/test/resources/META-INF/persistence.xml	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/resources/META-INF/persistence.xml	(date 1727348159242)
@@ -24,39 +24,39 @@
 		<!-- YARD tasks -->
 		<class>eu.reply.lea.services.yms.task.queue.Queue</class>
 		<class>eu.reply.lea.services.yms.task.sequence.TransitTasksSequence</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskDetail</class>
 		
-		<class>eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskDetail</class>
 		
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskDetail</class>
 
 		<class>eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTask</class>
 		<class>eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTaskDetail</class>
@@ -74,20 +74,20 @@
 		<class>eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTaskDetail</class>
 		<class>eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTaskConfiguration</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskConfiguration</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskConfiguration</class>
 
-        <class>eu.reply.lea.services.yms.task.mission.MissionTask</class>
-        <class>eu.reply.lea.services.yms.task.mission.MissionTaskDetail</class>
-        <class>eu.reply.lea.services.yms.task.mission.MissionTaskConfiguration</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskDetail</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskConfiguration</class>
         
 		<class>eu.reply.lea.services.yms.task.dockaware.template.DockAwareTaskTemplate</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplate</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate</class>
 		<class>eu.reply.lea.services.yms.task.template.entities.TransitTaskTemplate</class>
 		<class>eu.reply.lea.services.yms.task.template.entities.GenericTransitTaskTemplate</class>
 		<class>eu.reply.lea.services.yms.task.template.RegistrationTaskTemplate</class>
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskHeader.java	(date 1727348159507)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import javax.persistence.Embeddable;
 import javax.persistence.MappedSuperclass;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationTaskChangedEvent.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationTaskChangedEvent.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationTaskChangedEvent.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationTaskChangedEvent.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationTaskChangedEvent.java	(date 1727348159590)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.event;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetail.java	(date 1727348159674)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
 import eu.reply.lea.services.yard.model.LoadingUnitResource;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import eu.reply.lea.services.yms.task.event.SealingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.event.SealingTaskDetailExecutedInfo;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/MissionTaskUpdatedEvent.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/MissionTaskUpdatedEvent.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/MissionTaskUpdatedEvent.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/MissionTaskUpdatedEvent.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/MissionTaskUpdatedEvent.java	(date 1727348144911)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.event;
 
-import eu.reply.lea.services.yms.task.mission.MissionTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask;
 import eu.reply.sce.backend.core.event.ConfigurableEvent;
 
 public class MissionTaskUpdatedEvent extends ConfigurableEvent<MissionTask>{
Index: ../application/yms-application/lea-yms-application/src/test/resources/arquillian/persistence.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/resources/arquillian/persistence.xml b/../application/yms-application/lea-yms-application/src/test/resources/arquillian/persistence.xml
--- a/../application/yms-application/lea-yms-application/src/test/resources/arquillian/persistence.xml	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/resources/arquillian/persistence.xml	(date 1727362478140)
@@ -28,31 +28,31 @@
 		<!-- YARD tasks -->
 		<class>eu.reply.lea.services.yms.task.queue.Queue</class>
 		<class>eu.reply.lea.services.yms.task.sequence.TransitTasksSequence</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader</class>
 
         
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskDetail</class>
 
 		<class>eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTask</class>
 		<class>eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTaskConfiguration</class>
@@ -62,13 +62,13 @@
 		<class>eu.reply.lea.services.yms.task.dockaware.releasing.DockReleasingTaskConfiguration</class>
 		<class>eu.reply.lea.services.yms.task.dockaware.releasing.DockReleasingTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingInTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingInTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingInTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingInTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingInTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingInTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingInTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingInTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingInTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingInTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingInTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingInTaskDetail</class>
 
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitLoadingTask</class>
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitLoadingTaskConfiguration</class>
@@ -76,9 +76,9 @@
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitUnloadingTask</class>
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitUnloadingTaskConfiguration</class>
 
-        <class>eu.reply.lea.services.yms.task.mission.MissionTask</class>
-        <class>eu.reply.lea.services.yms.task.mission.MissionTaskDetail</class>
-        <class>eu.reply.lea.services.yms.task.mission.MissionTaskConfiguration</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskDetail</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskConfiguration</class>
         <class>eu.reply.lea.services.yms.task.queue.QueuedElement</class>
         <class>eu.reply.lea.services.yms.task.queue.Queue</class>
         <class>eu.reply.lea.services.yms.task.queue.ExecutionArea</class>
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/sms/SmsNotificationHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/sms/SmsNotificationHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/sms/SmsNotificationHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/sms/SmsNotificationHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/sms/SmsNotificationHandler.java	(date 1727348159362)
@@ -28,8 +28,8 @@
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitDeniedEvent;
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitForcedOutEvent;
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitLockedEvent;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.sce.backend.core.event.AsynchronousEvent;
 import eu.reply.sce.backend.core.event.ModuleEvent;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskDetailProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskDetailProcessor.java	(date 1727348392893)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
@@ -7,7 +7,8 @@
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.yms.task.event.SealingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetailStartAction;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskConfigurationProcessor.java	(date 1727348266818)
@@ -1,8 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskConfigurationProcessor;
 import eu.reply.lea.services.yms.task.exception.AlreadyExistingConfigurationForGivenParametersException;
 import eu.reply.lea.services.yms.task.exception.ConfigurationWithNoSiteException;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 
 import java.util.List;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/ChangedPriorityEvent.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/ChangedPriorityEvent.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/ChangedPriorityEvent.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/ChangedPriorityEvent.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/ChangedPriorityEvent.java	(date 1727348159564)
@@ -7,7 +7,7 @@
 import lombok.NoArgsConstructor;
 
 import eu.reply.lea.services.masterdata.reference.LocationReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityReferenceHandler;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/scanner/ScanningMessageProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/scanner/ScanningMessageProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/scanner/ScanningMessageProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/scanner/ScanningMessageProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/scanner/ScanningMessageProcessor.java	(date 1727348392906)
@@ -10,13 +10,13 @@
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.boundary.AbstractProcessor;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckInTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckOutTaskProcessor;
 import eu.reply.sce.backend.core.jaxrs.JsonMapperProducer;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/tracking/integration/yms/task/TasksSequenceNextTaskProvider.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/tracking/integration/yms/task/TasksSequenceNextTaskProvider.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/tracking/integration/yms/task/TasksSequenceNextTaskProvider.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/tracking/integration/yms/task/TasksSequenceNextTaskProvider.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/tracking/integration/yms/task/TasksSequenceNextTaskProvider.java	(date 1727348159352)
@@ -5,7 +5,7 @@
 import javax.inject.Inject;
 
 import eu.reply.lea.services.masterdata.reference.LocationReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.LocationAwareTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.repository.AbstractTasksSequenceRepository;
 import eu.reply.lea.services.yms.task.tracking.NextTaskProvider;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/rest/TaskPublisher.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/rest/TaskPublisher.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/rest/TaskPublisher.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/rest/TaskPublisher.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/rest/TaskPublisher.java	(date 1727348392918)
@@ -34,15 +34,15 @@
 import eu.reply.lea.services.yms.task.dockaware.unloading.*;
 import eu.reply.lea.services.yms.task.exception.AnprException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckInTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckOutTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.AddTaskAction;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/email/EmailNotificationHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/email/EmailNotificationHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/email/EmailNotificationHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/email/EmailNotificationHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/email/EmailNotificationHandler.java	(date 1727348159456)
@@ -35,8 +35,8 @@
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitDeniedEvent;
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitForcedOutEvent;
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitLockedEvent;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.sce.backend.core.email.EmailMessage;
 import eu.reply.sce.backend.core.email.event.EmailEvent;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequenceHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequenceHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequenceHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequenceHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequenceHandler.java	(date 1727348159515)
@@ -4,7 +4,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.repository.InternalTasksSequenceRepository;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.entity.TypedEntityReference;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskConfiguration.java	(date 1727348159640)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import java.util.HashSet;
 import java.util.List;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TasksSequence.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TasksSequence.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TasksSequence.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TasksSequence.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TasksSequence.java	(date 1727360095693)
@@ -2,6 +2,11 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import eu.reply.lea.services.masterdata.reference.LocationReference;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+
 /**
  * 
  * @author n.aresta
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTask.java	(date 1727348159431)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 
 import java.util.ArrayList;
@@ -35,7 +35,6 @@
 import eu.reply.lea.services.process.task.entities.GenericTask;
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
 import eu.reply.lea.services.yms.task.sequence.AbstractTasksSequence;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailStartAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailStartAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetailStartAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailStartAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetailStartAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailStartAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetailStartAction.java	(date 1727348144698)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
 import eu.reply.lea.services.yard.model.LoadingUnitResource;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/SequenceTaskCreationService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/SequenceTaskCreationService.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/SequenceTaskCreationService.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/SequenceTaskCreationService.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/SequenceTaskCreationService.java	(date 1727348159717)
@@ -12,7 +12,7 @@
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.AbstractService;
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
-import eu.reply.lea.services.yms.task.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
 import eu.reply.lea.services.yms.task.event.TransitSequenceCreatedEvent;
 import eu.reply.lea.services.yms.task.event.TransitTaskSequenceStatusUpdatedEvent;
 import eu.reply.sce.backend.core.entity.exception.EntityNotFoundException;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskProcessor.java	(date 1727348266805)
@@ -1,10 +1,10 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.dockaware.loading.ChangeLocationAction;
 import eu.reply.lea.services.yms.task.exception.ChangeLocationException;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.AddTaskAction;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTask.java	(date 1727348159530)
@@ -1,14 +1,10 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
+
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.util.YMSUtils;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.configuration.EntityMethods;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequence.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequence.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequence.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequence.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequence.java	(date 1727363665621)
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.persistence.AttributeOverride;
@@ -22,7 +23,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.masterdata.reference.LocationReference;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.entity.StringCustomizableEntity;
 
@@ -114,10 +116,65 @@
             .collect(Collectors.toList());
     }
 
+    @Override
     @JsonIgnore
     public List<LocationAwareTask<?, ?, ?>> getQueueableTasks() {
         List<LocationAwareTask<?, ?, ?>> sortedSequence = getSortedSequence();
         return getQueueableTasks(sortedSequence, 0, true);
     }
 
-}
+    @Override
+    public boolean areAllTasksToBeExecutedContiguouslyClosed(final LocationAwareTask<?, ?, ?> task) {
+        return getTasksToBeExecutedContiguously(task).stream().allMatch(t -> t.getStatus().isClosed());
+    }
+
+    @Override
+    @JsonIgnore
+    public List<LocationAwareTask<?, ?, ?>> getTasksToBeExecutedContiguously(final LocationAwareTask<?, ?, ?> task) {
+        LocationReference location = task.getLocation();
+        List<LocationAwareTask<?, ?, ?>> tasksSameLocation = sortTasks(getTasksInLocation(location));
+        List<LocationAwareTask<?, ?, ?>> result = new ArrayList<>();
+        if (tasksSameLocation.isEmpty()) {
+            throw new IllegalStateException(String.format("There are no tasks in the location %s", location));
+        }
+        if (tasksSameLocation.stream().noneMatch(t->t.equals(task))) {
+            throw new IllegalStateException(String.format("It was not possible to find the tasks among"
+                                                          + "the ones of the sequence for the specified"
+                                                          + "location %s", location));
+        }
+        Integer taskSequenceNumber = task.getSequenceNumber();
+        boolean foundTask = false;
+        int previousSequenceNumber = tasksSameLocation.get(0).getSequenceNumber();
+        for (LocationAwareTask<?, ?, ?> taskSameLocation : tasksSameLocation) {
+            if (taskSameLocation.getSequenceNumber().equals(taskSequenceNumber)) {
+                foundTask = true;
+            }
+            if (taskSameLocation.getSequenceNumber() > previousSequenceNumber+1) {
+                if (foundTask) {
+                    return result;
+                }else{
+                    result.clear();
+                }
+            }
+            previousSequenceNumber = taskSameLocation.getSequenceNumber();
+            result.add(taskSameLocation);
+        }
+        if (foundTask){
+            return result;
+        }
+        throw new IllegalStateException(String.format("No tasks were found for location %s and task %s", location, task));
+    }
+
+
+    @JsonIgnore
+    public List<LocationAwareTask<?, ?, ?>> getTasksInLocation(final LocationReference location) {
+        return this.getTasks().stream()
+            .filter(task -> location.equals(task.getLocation()))
+            .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<LocationAwareTask<?, ?, ?>> sortTasks(final List<LocationAwareTask<?, ?, ?>> tasks) {
+        return tasks.stream().sorted(Comparator.comparing(LocationAwareTask::getSequenceNumber)).collect(Collectors.toList());
+    }
+    }
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequenceHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequenceHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequenceHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequenceHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/AbstractTasksSequenceHandler.java	(date 1727348159349)
@@ -5,10 +5,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.yard.exceptions.LoadingUnitActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
 import eu.reply.lea.services.yms.task.template.sequence.AbstractTasksTemplateSequenceHandler;
 import eu.reply.sce.backend.core.entity.TypedEntityReference;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequence.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequence.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequence.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequence.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/LocationAwareTasksSequence.java	(date 1727362344027)
@@ -2,6 +2,9 @@
 
 import java.util.List;
 
+import eu.reply.lea.services.masterdata.reference.LocationReference;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+
 public interface LocationAwareTasksSequence<I extends SequencedLocationAwareTask> extends TasksSequence<I> {
 
     /**
@@ -39,4 +42,14 @@
      * Retrieves the list of tasks that should be enqueued next.
      */
     List<I> getTasksToBeEnqueuedNext();
+
+    List<I> getQueueableTasks();
+
+    boolean areAllTasksToBeExecutedContiguouslyClosed(final I task);
+
+    List<I> getTasksToBeExecutedContiguously(I task);
+
+    List<I> getTasksInLocation(final LocationReference location);
+
+    List<LocationAwareTask<?, ?, ?>> sortTasks(List<LocationAwareTask<?, ?, ?>> tasks);
 }
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingPreferredLocationFinder.java	(date 1727348144889)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.model.map.Site;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTask.java	(date 1727348159309)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.domain.pickup;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -16,14 +16,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.masterdata.reference.VehicleReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceHandler.java	(date 1727348159270)
@@ -12,8 +12,8 @@
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.lea.services.yms.task.sequence.repository.TransitTasksSequenceRepository;
 import eu.reply.sce.backend.core.entity.TypedEntityReference;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskConfigurationProcessor.java	(date 1727348266789)
@@ -1,10 +1,10 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskConfigurationProcessor;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskHeader.java	(date 1727348144913)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 
 @Embeddable
 public class SealingTaskHeader extends ZoneAwareTaskHeader {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTask.java	(date 1727348159201)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import java.util.Calendar;
 import java.util.Collections;
@@ -12,8 +12,7 @@
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
-import eu.reply.lea.services.yard.reference.TransitReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/task/locationaware/CheckInTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/task/locationaware/CheckInTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/task/locationaware/CheckInTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/task/locationaware/CheckInTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/task/locationaware/CheckInTaskConfigurationProcessor.java	(date 1727348266834)
@@ -5,8 +5,8 @@
 
 import eu.reply.lea.services.yms.task.ExpirationPolicy;
 import eu.reply.lea.services.yms.task.exception.task.locationaware.checkin.CheckInTaskConfigurationException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfigurationProcessor;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/CheckOutTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/CheckOutTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/CheckOutTaskProcessor.java	(date 1727348392897)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -16,7 +16,7 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.*;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 
 import org.apache.commons.collections4.CollectionUtils;
 
@@ -33,6 +33,9 @@
 import eu.reply.lea.services.yard.exceptions.TransitActionException;
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskExecuteAction;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
@@ -43,7 +46,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=CheckOutTask.class)
+@EntityProcessor(entityClass= CheckOutTask.class)
 public class CheckOutTaskProcessor extends AbstractLocationAwareTaskProcessor<CheckOutTask> {
 
     @Inject
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationAwareTaskEnterEvent.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationAwareTaskEnterEvent.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationAwareTaskEnterEvent.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationAwareTaskEnterEvent.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/LocationAwareTaskEnterEvent.java	(date 1727348159650)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.event;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.event.ConfigurableEvent;
 
 public class LocationAwareTaskEnterEvent extends ConfigurableEvent<LocationAwareTask<?,?,?>> {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskExecuteAction.java	(date 1727348144934)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import java.io.Serializable;
 import java.util.Objects;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskHeader.java	(date 1727348159460)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskConfiguration.java	(date 1727348159613)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskBuilder.java	(date 1727348159344)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -8,7 +8,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskExecuteAction.java	(date 1727348144705)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
 import java.io.Serializable;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkout/CheckOutTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkout/CheckOutTaskDetail.java	(date 1727348159422)
@@ -1,17 +1,15 @@
-package eu.reply.lea.services.yms.task.locationaware.checkout;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkout;
 
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
 import javax.persistence.*;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.poi.ss.formula.functions.T;
 
 @Entity
 @Getter
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskDetail.java	(date 1727348159314)
@@ -1,10 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.model.LoadingUnitResource;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import eu.reply.sce.backend.core.entity.configuration.EntityMethods;
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ShippingTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ShippingTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ShippingTaskConfigurationProcessor.java	(date 1727348474490)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
@@ -11,7 +11,7 @@
 @Default
 @Logged
 @EntityProcessor(entityClass = ShippingTaskConfiguration.class)
-public class ShippingTaskConfigurationProcessor extends ZoneAwareTaskConfigurationProcessor<ShippingTaskConfiguration>{
+public class ShippingTaskConfigurationProcessor extends ZoneAwareTaskConfigurationProcessor<ShippingTaskConfiguration> {
 
     @Override
     public void persisting(final ShippingTaskConfiguration configuration) throws Exception {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskHeader.java	(date 1727348144810)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 
 @Embeddable
 public class ShippingTaskHeader extends ZoneAwareTaskHeader {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedWeightChangedObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedWeightChangedObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedWeightChangedObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedWeightChangedObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedWeightChangedObserver.java	(date 1727348144941)
@@ -10,7 +10,7 @@
 
 import eu.reply.lea.services.yard.events.loadingUnit.LoadingUnitInboundExpectedWeightChangedInfo;
 import eu.reply.lea.services.yard.events.loadingUnit.LoadingUnitOutboundExpectedWeightChangedInfo;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail;
 import eu.reply.sce.backend.core.event.ModuleEvent;
 import eu.reply.sce.backend.core.event.Observer;
 import eu.reply.sce.backend.core.jee.configuration.ModuleConfiguration;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ShippingTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ShippingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ShippingTaskProcessor.java	(date 1727348392909)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import com.google.common.base.Objects;
 import com.neovisionaries.i18n.CountryCode;
@@ -9,8 +9,9 @@
 import eu.reply.lea.services.masterdata.pojo.vehicle.TruckPojo;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskExecuteAction;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -28,7 +29,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=ShippingTask.class)
+@EntityProcessor(entityClass= ShippingTask.class)
 public class ShippingTaskProcessor extends AbstractLocationAwareTaskProcessor<ShippingTask> {
 
     @Inject
Index: ../application/yms-application/lea-yms-application/src/main/resources/META-INF/persistence.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/resources/META-INF/persistence.xml b/../application/yms-application/lea-yms-application/src/main/resources/META-INF/persistence.xml
--- a/../application/yms-application/lea-yms-application/src/main/resources/META-INF/persistence.xml	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/resources/META-INF/persistence.xml	(date 1727348159393)
@@ -35,39 +35,39 @@
 		<class>eu.reply.lea.services.yms.task.sequence.TransitTasksSequence</class>
 		
 
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.dropoff.DropOffTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskDetail</class>
 		
-		<class>eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskDetail</class>
 
 		<class>eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTask</class>
 		<class>eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTaskDetail</class>
@@ -85,13 +85,13 @@
 		<class>eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTaskDetail</class>
 		<class>eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTaskConfiguration</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskConfiguration</class>
 
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTask</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskDetail</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskConfiguration</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTask</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetail</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskConfiguration</class>
 
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitLoadingTask</class>
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitLoadingTaskConfiguration</class>
@@ -99,11 +99,11 @@
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitUnloadingTask</class>
         <class>eu.reply.lea.services.yms.task.loadingunit.loading.LoadUnitUnloadingTaskConfiguration</class>
 
-        <class>eu.reply.lea.services.yms.task.mission.MissionTask</class>
-        <class>eu.reply.lea.services.yms.task.mission.MissionTaskConfiguration</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask</class>
+        <class>eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskConfiguration</class>
         
 		<class>eu.reply.lea.services.yms.task.dockaware.template.DockAwareTaskTemplate</class>
-		<class>eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplate</class>
+		<class>eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate</class>
 		<class>eu.reply.lea.services.yms.task.template.entities.TransitTaskTemplate</class>
 		<class>eu.reply.lea.services.yms.task.template.entities.GenericTransitTaskTemplate</class>
 		<class>eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate</class>
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingPreferredLocationFinder.java	(date 1727348144788)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.model.map.Site;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTask.java	(date 1727348159199)
@@ -1,15 +1,10 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
-import eu.reply.lea.services.masterdata.model.vehicle.Truck;
+
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.util.YMSUtils;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskConfiguration.java	(date 1727348159448)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/shipping/ShippingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/shipping/ShippingTaskBuilder.java	(date 1727348159576)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.shipping;
+package eu.reply.lea.services.yms.task.locationaware.domain.shipping;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -8,7 +8,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfigurationProcessor.java	(date 1727348266812)
@@ -1,8 +1,6 @@
 package eu.reply.lea.services.yms.task.dockaware;
 
-import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
-import eu.reply.lea.services.masterdata.reference.DockReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskConfigurationProcessor;
 
 public class DockAwareTaskConfigurationProcessor<C extends DockAwareTaskConfiguration<? extends DockAwareTaskHeader>> extends LocationAwareTaskConfigurationProcessor<C> {
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskConfiguration.java	(date 1727348159203)
@@ -15,7 +15,7 @@
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.process.task.entities.exceptions.TaskConfigurationNotFoundException;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/CreateMissionRequestEventObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/CreateMissionRequestEventObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/CreateMissionRequestEventObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/CreateMissionRequestEventObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/CreateMissionRequestEventObserver.java	(date 1727348144752)
@@ -20,7 +20,6 @@
 import eu.reply.lea.services.yard.model.LoadingUnitActivity;
 import eu.reply.lea.services.yard.pojo.CreateMissionRequestPojo;
 import eu.reply.lea.services.yard.pojo.LoadingUnitActivityPojo;
-import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.dockaware.loading.LoadingTask;
@@ -28,8 +27,8 @@
 import eu.reply.lea.services.yms.task.event.InternalTasksSequenceCreatedEvent;
 import eu.reply.lea.services.yms.task.factory.InternalTaskBuilderDirector;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.mission.MissionTask;
-import eu.reply.lea.services.yms.task.mission.MissionTaskRepository;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskRepository;
 import eu.reply.lea.services.yms.task.sequence.InternalTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.InternalTasksSequenceHandler;
 import eu.reply.lea.services.yms.task.sequence.repository.InternalTasksSequenceRepository;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/DockAwareTaskHeader.java	(date 1727348159463)
@@ -3,7 +3,7 @@
 import javax.persistence.Embeddable;
 import javax.persistence.MappedSuperclass;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/weighing/WeighingMessageProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/weighing/WeighingMessageProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/weighing/WeighingMessageProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/weighing/WeighingMessageProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/weighing/WeighingMessageProcessor.java	(date 1727362385243)
@@ -12,8 +12,12 @@
 import eu.reply.lea.services.yard.pojo.TransitPojo;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.boundary.AbstractProcessor;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.weighing.*;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetailExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.WeighingTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.WeighingTaskProcessor;
 import eu.reply.sce.backend.core.jaxrs.JsonMapperProducer;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedSealChangedObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedSealChangedObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedSealChangedObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedSealChangedObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/adapter/LoadingUnitExpectedSealChangedObserver.java	(date 1727348144873)
@@ -2,7 +2,6 @@
 
 
 import java.util.List;
-import java.util.stream.Collectors;
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
@@ -10,9 +9,8 @@
 
 import eu.reply.lea.services.yard.events.loadingUnit.LoadingUnitInboundExpectedSealChangedInfo;
 import eu.reply.lea.services.yard.events.loadingUnit.LoadingUnitOutboundExpectedSealChangedInfo;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetail;
 import eu.reply.sce.backend.core.event.ModuleEvent;
 import eu.reply.sce.backend.core.event.Observer;
 import eu.reply.sce.backend.core.jee.configuration.ModuleConfiguration;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequence.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequence.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequence.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequence.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequence.java	(date 1727348159534)
@@ -13,7 +13,7 @@
 
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.event.TransitTaskSequenceStatusUpdatedEvent;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.jee.event.Producer;
 
 @Entity
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskConfigurationProcessor.java	(date 1727348474499)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.pickup.PickupTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/WeighingTaskDetailExecutedInfo.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/WeighingTaskDetailExecutedInfo.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/WeighingTaskDetailExecutedInfo.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/WeighingTaskDetailExecutedInfo.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/event/WeighingTaskDetailExecutedInfo.java	(date 1727348144726)
@@ -4,7 +4,7 @@
 import java.math.BigDecimal;
 
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetail.java	(date 1727348159596)
@@ -1,8 +1,7 @@
 package eu.reply.lea.services.yms.task.dockaware.docking;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskBuilder.java	(date 1727348159631)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.domain.pickup;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -7,7 +7,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskProcessor.java	(date 1727348266798)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.dockaware.docking;
 
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.AbstractLocationAwareTaskProcessor;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequence.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequence.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequence.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequence.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/sequence/InternalTasksSequence.java	(date 1727348159190)
@@ -8,7 +8,7 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 
 @NamedQuery(name = InternalTasksSequence.Q_FIND_BY_LOGISTIC_UNIT_REF, query = "SELECT ats from InternalTasksSequence ats where "
                                                                               + "logisticUnitRef.entityId = :logisticUnitEntityId "
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskHeader.java	(date 1727348144794)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.domain.pickup;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 
 @Embeddable
 public class PickupTaskHeader extends ZoneAwareTaskHeader {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskProcessor.java	(date 1727348392904)
@@ -1,10 +1,10 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.pickup.PickupTask;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -14,7 +14,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=PickupTask.class)
+@EntityProcessor(entityClass= PickupTask.class)
 public class PickupTaskProcessor extends AbstractLocationAwareTaskProcessor<PickupTask> {
 
     @Override
Index: ../frontend/lea-yms-fe/src/yms/configuration/entityType/RegistrationTask.json
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../frontend/lea-yms-fe/src/yms/configuration/entityType/RegistrationTask.json b/../frontend/lea-yms-fe/src/yms/configuration/entityType/RegistrationTask.json
--- a/../frontend/lea-yms-fe/src/yms/configuration/entityType/RegistrationTask.json	(revision c3cc7e3999c430d8dc41a26978751590e9784773)
+++ b/../frontend/lea-yms-fe/src/yms/configuration/entityType/RegistrationTask.json	(date 1727362998838)
@@ -188,7 +188,7 @@
 					"hidden": false,
 					"managed": true,
 					"mandatory": true,
-					"dataType": "eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskDetailInfo"
+					"dataType": "eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetailInfo"
 				}
 			}
 		}
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTask.java	(date 1727348159220)
@@ -1,12 +1,10 @@
 package eu.reply.lea.services.yms.task.dockaware.docking;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
+
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskBuilder.java	(date 1727348159659)
@@ -6,7 +6,7 @@
 
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/docking/DockDockingTaskDetailProcessor.java	(date 1727348266785)
@@ -5,17 +5,10 @@
 import javax.inject.Inject;
 
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
-import eu.reply.lea.services.masterdata.model.map.Dock;
-import eu.reply.lea.services.masterdata.pojo.map.DockPojo;
 import eu.reply.lea.services.masterdata.reference.DockReference;
-import eu.reply.lea.services.yard.actions.loadingUnit.DockingAction;
-import eu.reply.lea.services.yard.client.DefaultYardService;
-import eu.reply.lea.services.yard.client.YardServiceException;
 import eu.reply.lea.services.yard.exceptions.LoadingUnitActionException;
 import eu.reply.lea.services.yms.boundary.YardService;
-import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
-import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskDetailProcessor;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetail.java	(date 1727348159186)
@@ -2,10 +2,9 @@
 
 
 import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskProcessor.java	(date 1727348266903)
@@ -1,7 +1,7 @@
 package eu.reply.lea.services.yms.task.dockaware.loading;
 
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailHookTruckAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailHookTruckAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskDetailHookTruckAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailHookTruckAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskDetailHookTruckAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailHookTruckAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskDetailHookTruckAction.java	(date 1727348144616)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.domain.pickup;
 
 
 import java.io.Serializable;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/sms/SMSTaskNotificationMessageProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/sms/SMSTaskNotificationMessageProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/sms/SMSTaskNotificationMessageProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/sms/SMSTaskNotificationMessageProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/sms/SMSTaskNotificationMessageProcessor.java	(date 1727348159603)
@@ -7,9 +7,7 @@
 import eu.reply.lea.services.yms.entities.notification.exceptions.sms.SMSTransitNotificationMessageAlreadyPresentException;
 import eu.reply.lea.services.yms.entities.notification.task.TaskNotificationCondition;
 import eu.reply.lea.services.yms.entities.notification.task.sms.SMSTaskNotificationMessage;
-import eu.reply.lea.services.yms.entities.notification.transit.TransitNotificationCondition;
-import eu.reply.lea.services.yms.entities.notification.transit.sms.SMSTransitNotificationMessage;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTask.java	(date 1727348159581)
@@ -2,13 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.yard.model.Transit;
-import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskDetailProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/PickupTaskDetailProcessor.java	(date 1727348392878)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.annotation.Nonnull;
 import javax.ejb.TransactionAttribute;
@@ -10,7 +10,8 @@
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.pickup.PickupTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.pickup.PickupTaskDetailHookTruckAction;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskConfiguration.java	(date 1727348159425)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.domain.pickup;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/pickup/PickupTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/pickup/PickupTaskDetail.java	(date 1727348159668)
@@ -1,12 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.pickup;
+package eu.reply.lea.services.yms.task.locationaware.domain.pickup;
 
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskBuilder.java	(date 1727348159214)
@@ -6,7 +6,7 @@
 
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskDetail.java	(date 1727348159518)
@@ -1,7 +1,7 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/loading/LoadingTaskDetailProcessor.java	(date 1727348266772)
@@ -6,7 +6,7 @@
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.yard.client.YardServiceException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskDetailProcessor;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/sms/SMSTaskNotificationMessage.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/sms/SMSTaskNotificationMessage.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/sms/SMSTaskNotificationMessage.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/sms/SMSTaskNotificationMessage.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/sms/SMSTaskNotificationMessage.java	(date 1727348159244)
@@ -4,17 +4,14 @@
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.entities.notification.task.TaskNotificationCondition;
 import eu.reply.lea.services.yms.entities.notification.task.TaskNotificationMessage;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.slf4j.Logger;
 
-import javax.inject.Inject;
 import javax.persistence.*;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.stream.Collectors;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInPreferredLocationFinder.java	(date 1727348082216)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckOutPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckOutPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckOutPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckOutPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckOutPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckOutPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckOutPreferredLocationFinder.java	(date 1727348082196)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskHeader.java	(date 1727348159633)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import javax.persistence.Embeddable;
 
 import eu.reply.lea.services.yms.task.ExpirationPolicy;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/email/EmailTaskNotificationMessage.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/email/EmailTaskNotificationMessage.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/email/EmailTaskNotificationMessage.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/email/EmailTaskNotificationMessage.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/entities/notification/task/email/EmailTaskNotificationMessage.java	(date 1727348159503)
@@ -5,7 +5,7 @@
 import eu.reply.lea.services.yms.entities.notification.NotificationMessage;
 import eu.reply.lea.services.yms.entities.notification.task.TaskNotificationCondition;
 import eu.reply.lea.services.yms.entities.notification.task.TaskNotificationMessage;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.persistence.*;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskExecuteAction.java	(date 1727348082179)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import java.io.Serializable;
 import java.util.Objects;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/CheckInTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/CheckInTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/CheckInTaskProcessor.java	(date 1727348266901)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.annotation.Nonnull;
 import javax.enterprise.context.ApplicationScoped;
@@ -30,12 +30,15 @@
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.entities.notification.task.TaskNotificationCondition;
 import eu.reply.lea.services.yms.entities.notification.task.sms.SMSTaskNotificationMessage;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.ExpirationPolicy;
-import eu.reply.lea.services.yms.task.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
 import eu.reply.lea.services.yms.task.event.CheckInCountdownEndedEvent;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskEventInfo;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskHandler;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
@@ -265,7 +268,7 @@
      * @param deltaWarning the delta of time to send the message
      * @return the message to send
      */
-    private String retrieveMessageForExpirationWarning(CheckInTask task,CheckInTaskDetail detail,Language driverLanguage, Integer deltaWarning){
+    private String retrieveMessageForExpirationWarning(CheckInTask task, CheckInTaskDetail detail, Language driverLanguage, Integer deltaWarning){
         String messageToSend = "";
         int remainingMinutes =
             task.getHeaders().getExpirationTime() - (deltaWarning * (detail.getNumberOfMessageAlreadySent() + 1));
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskBuilder.java	(date 1727348159222)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -8,7 +8,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskHandler.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHandler.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskHandler.java	(date 1727348082208)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.sce.backend.core.jee.configuration.ModuleConfiguration.Module;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskConfiguration.java	(date 1727348159323)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -6,7 +6,7 @@
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTask.java	(date 1727348159729)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import java.util.*;
 
@@ -11,8 +11,7 @@
 import eu.reply.lea.services.masterdata.reference.TruckReference;
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yard.reference.TransitReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTask.java	(date 1727348159387)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -16,14 +16,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.masterdata.reference.VehicleReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskConfiguration.java	(date 1727348159195)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/DropOffTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/DropOffTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/DropOffTaskProcessor.java	(date 1727348392913)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
@@ -7,10 +7,10 @@
 import eu.reply.lea.services.process.task.exceptions.ActionNotAllowedException;
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTask;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/DropOffTaskDetailProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/DropOffTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/DropOffTaskDetailProcessor.java	(date 1727348392934)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.annotation.Nonnull;
 import javax.enterprise.context.ApplicationScoped;
@@ -7,7 +7,8 @@
 
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.dropoff.DropOffTaskDetailExecuteAction;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/queue/QueueProcessTrackerTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/queue/QueueProcessTrackerTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/queue/QueueProcessTrackerTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/queue/QueueProcessTrackerTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/queue/QueueProcessTrackerTest.java	(date 1727362478125)
@@ -25,8 +25,8 @@
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.TaskReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskMock;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskMockBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskMock;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskMockBuilder;
 import eu.reply.lea.services.yms.task.queue.event.ElementQueueProcessCreatedEvent;
 import eu.reply.lea.services.yms.task.queue.exception.DequeueProcessPendingException;
 import eu.reply.lea.services.yms.task.queue.exception.EmptyQueueRequestException;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/sequence/TransitTasksSequenceTest.java	(date 1727362478133)
@@ -23,9 +23,9 @@
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.event.TransitTaskSequenceStatusUpdatedEvent;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskMock;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskMockBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskMock;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskMockBuilder;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.jee.event.Producer;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskApplicationService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskApplicationService.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskApplicationService.java
new file mode 100644
--- /dev/null	(date 1727360095692)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskApplicationService.java	(date 1727360095692)
@@ -0,0 +1,44 @@
+package eu.reply.lea.services.yms.task.locationaware.domain;
+
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.persistence.EntityManager;
+
+import eu.reply.lea.services.masterdata.reference.LocationReference;
+import eu.reply.lea.services.yms.ModuleConfiguration;
+import eu.reply.lea.services.yms.task.TaskReference;
+import eu.reply.lea.services.yms.task.locationaware.integration.yms.queue.TaskDequeueAdapter;
+import eu.reply.lea.services.yms.task.sequence.LocationAwareTasksSequence;
+import eu.reply.sce.backend.core.jee.configuration.entity.EntityReferenceHandler;
+import eu.reply.sce.backend.core.jee.log.Logged;
+
+@Logged
+@ApplicationScoped
+public class LocationAwareTaskApplicationService {
+
+    @Inject
+    private TaskDequeueAdapter taskDequeueAdapter;
+
+    @Inject
+    @ModuleConfiguration.Module(ModuleConfiguration.Module.CURRENT)
+    private EntityManager em;
+
+    @Inject
+    private EntityReferenceHandler entityReferenceHandler;
+
+    @TransactionAttribute(TransactionAttributeType.REQUIRED)
+    public void handleTaskClosure(final TaskReference taskReference) {
+        final LocationAwareTask<?,?,?>
+            task =  entityReferenceHandler.getEntity(taskReference.toEntityReference(), em);
+        LocationReference location = task.getLocation();
+        LocationAwareTasksSequence<LocationAwareTask<?, ?, ?>> sequence =
+            task.getSequence();
+
+        if (sequence != null && sequence.areAllTasksToBeExecutedContiguouslyClosed(task)) {
+            // Delegate external service call to adapter
+            taskDequeueAdapter.notifyDequeueForTask(sequence.getTasksInLocation(location));
+        }
+    }
+}
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplate.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplate.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/template/LocationAwareTaskTemplate.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplate.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/template/LocationAwareTaskTemplate.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplate.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/template/LocationAwareTaskTemplate.java	(date 1727348144927)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.template;
+package eu.reply.lea.services.yms.task.locationaware.domain.template;
 
 import javax.persistence.Entity;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateFactory.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateFactory.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/template/LocationAwareTaskTemplateFactory.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateFactory.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/template/LocationAwareTaskTemplateFactory.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateFactory.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/template/LocationAwareTaskTemplateFactory.java	(date 1727348144895)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.template;
+package eu.reply.lea.services.yms.task.locationaware.domain.template;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Produces;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskTemplateProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskTemplateProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/template/LocationAwareTaskTemplateProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/LocationAwareTaskTemplateProcessor.java	(date 1727348474485)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.template;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
@@ -6,6 +6,7 @@
 
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.yms.boundary.AbstractProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.lea.services.yms.task.template.TransitTaskTemplateProcessor;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMock.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMock.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskMock.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMock.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskMock.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMock.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskMock.java	(date 1727362478129)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import java.util.Set;
 
 import eu.reply.lea.services.process.task.entities.TaskConfiguration;
 import eu.reply.lea.services.process.task.entities.TaskDetail;
 
-public class LocationAwareTaskMock extends LocationAwareTask{
+public class LocationAwareTaskMock extends LocationAwareTask {
 
     private Long id;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMockBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMockBuilder.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskMockBuilder.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMockBuilder.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskMockBuilder.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/LocationAwareTaskMockBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskMockBuilder.java	(date 1727362478137)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.yms.task.TaskType;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskConfigurationProcessor.java	(date 1727348474480)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.ZoneAwareTaskConfigurationProcessor;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskBuilder.java	(date 1727348159390)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -7,7 +7,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskDetailExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskDetailExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetailExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskDetailExecuteAction.java	(date 1727348144796)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 
 import java.io.Serializable;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/GenericTransitTaskPlaceHolderBinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/GenericTransitTaskPlaceHolderBinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/GenericTransitTaskPlaceHolderBinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/GenericTransitTaskPlaceHolderBinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/GenericTransitTaskPlaceHolderBinder.java	(date 1727348159257)
@@ -2,7 +2,7 @@
 
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.HierarchyMapper;
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task.*;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.sce.backend.core.jee.log.Logged;
 import org.slf4j.Logger;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskHeader.java	(date 1727348144780)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 
 @Embeddable
 public class DropOffTaskHeader extends ZoneAwareTaskHeader {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/TransitTaskPlaceHolderBinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/TransitTaskPlaceHolderBinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/TransitTaskPlaceHolderBinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/TransitTaskPlaceHolderBinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/binder/task/TransitTaskPlaceHolderBinder.java	(date 1727348159383)
@@ -3,7 +3,7 @@
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.binder.PlaceHolderBinder;
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.PlaceHolderToken;
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task.TransitTaskPlaceHolder;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/dropoff/DropOffTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/dropoff/DropOffTaskDetail.java	(date 1727348159319)
@@ -1,12 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.dropoff;
+package eu.reply.lea.services.yms.task.locationaware.domain.dropoff;
 
 import javax.persistence.Entity;
 import javax.persistence.ManyToOne;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskConfiguration.java	(date 1727348181811)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskProcessor.java	(date 1727348266816)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.dockaware.releasing;
 
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.AbstractLocationAwareTaskProcessor;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInPreferredLocationFinderTest.java	(date 1727348082231)
@@ -19,7 +19,7 @@
 import eu.reply.lea.services.yard.model.HandlingRequest;
 import eu.reply.lea.services.yard.model.HandlingRequestActivity;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTaskTemplate;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetailProcessor.java	(date 1727348266911)
@@ -8,7 +8,7 @@
 import eu.reply.lea.services.masterdata.reference.DockReference;
 import eu.reply.lea.services.yard.exceptions.LoadingUnitActionException;
 import eu.reply.lea.services.yms.boundary.YardService;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskDetailProcessor;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskHeader.java	(date 1727348144932)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutPreferredLocationFinderTest.java	(date 1727348082200)
@@ -20,7 +20,7 @@
 import eu.reply.lea.services.yard.model.HandlingRequest;
 import eu.reply.lea.services.yard.model.HandlingRequestActivity;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckOutPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckOutPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTaskTemplate;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTask.java	(date 1727348159527)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import java.math.BigDecimal;
 import java.util.Collections;
@@ -14,13 +14,10 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.yard.model.LoadingUnitResource;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 
 import lombok.AccessLevel;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskDetail.java	(date 1727348159559)
@@ -1,9 +1,8 @@
 package eu.reply.lea.services.yms.task.dockaware.releasing;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskBuilder.java	(date 1727348159332)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import java.math.BigDecimal;
 
@@ -9,7 +9,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/TransitTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/TransitTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/TransitTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/TransitTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/TransitTaskTest.java	(date 1727348474504)
@@ -66,36 +66,36 @@
 import eu.reply.lea.services.yms.task.event.TaskCompletedEvent;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskStatusChangedEventInfo;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTask;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplate;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskProcessor;
-import eu.reply.lea.services.yms.task.observer.QueueObserver;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckOutTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.ReceivingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.ShippingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.WeighingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.observer.TaskClosureObserver;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.sequence.TasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
@@ -120,7 +120,7 @@
     @Spy @InjectMocks private TransitTasksSequenceHandler transitTasksSequenceHandler;
 
 
-    @InjectMocks private QueueObserver queueObserver;
+    @InjectMocks private TaskClosureObserver taskClosureObserver;
 
     @InjectMocks private WeighingTaskProcessor weighingTaskProcessor;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueAdapter.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueAdapter.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueAdapter.java
new file mode 100644
--- /dev/null	(date 1727360846731)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueAdapter.java	(date 1727360846731)
@@ -0,0 +1,35 @@
+package eu.reply.lea.services.yms.task.locationaware.integration.yms.queue;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.inject.Inject;
+
+import eu.reply.lea.services.masterdata.reference.LocationReference;
+import eu.reply.lea.services.yms.task.TaskReference;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommand;
+import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommandInfo;
+import eu.reply.sce.backend.core.entity.EntityReference;
+import eu.reply.sce.backend.core.event.ConfigurableEventProducer;
+
+public class TaskDequeueAdapter {
+
+    @Inject
+    private ConfigurableEventProducer<TaskDequeueCommand> taskDequeueCommandProducer;
+
+    public void notifyDequeueForTask(List<LocationAwareTask<?, ?, ?>> tasks) {
+        if (tasks.isEmpty()){
+            throw new IllegalStateException("No tasks to dequeue");
+        }
+        EntityReference logisticUnitRef = tasks.get(0).getLogisticUnitReference();
+        List<TaskReference> tasksToDequeue = tasks.stream().map(TaskReference::new).collect(Collectors.toList());
+        List<LocationReference> locationReferences = tasks.stream().map(LocationAwareTask::getLocation).collect(Collectors.toList());
+        taskDequeueCommandProducer.fire(new TaskDequeueCommand(
+            new TaskDequeueCommandInfo(
+                tasksToDequeue,
+                locationReferences,
+                logisticUnitRef)
+            )
+        );
+    }
+}
\ No newline at end of file
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingPreferredLocationFinderTest.java	(date 1727348144584)
@@ -16,7 +16,7 @@
 import eu.reply.lea.services.masterdata.reference.GateReference;
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
 import eu.reply.lea.services.yms.task.template.handler.TransitTaskTemplateHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetailExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetailExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetailExecuteAction.java	(date 1727348144702)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 
 import eu.reply.lea.services.common.Utils;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetail.java	(date 1727348159321)
@@ -1,10 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import eu.reply.lea.services.yms.task.event.WeighingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.event.WeighingTaskDetailExecutedInfo;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingPreferredLocationFinderTest.java	(date 1727348144700)
@@ -16,7 +16,7 @@
 import eu.reply.lea.services.masterdata.reference.GateReference;
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
 import eu.reply.lea.services.yms.task.template.handler.TransitTaskTemplateHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingType.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingType.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingType.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingType.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingType.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingType.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingType.java	(date 1727348144877)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 public enum WeighingType {
     INBOUND,
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingPreferredLocationFinderTest.java	(date 1727348144599)
@@ -16,7 +16,7 @@
 import eu.reply.lea.services.masterdata.reference.GateReference;
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
 import eu.reply.lea.services.yms.task.template.handler.TransitTaskTemplateHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskProcessor.java	(date 1727348474473)
@@ -1,7 +1,7 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -14,7 +14,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=WeighingTask.class)
+@EntityProcessor(entityClass= WeighingTask.class)
 public class WeighingTaskProcessor extends AbstractLocationAwareTaskProcessor<WeighingTask> {
     
     @Override
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingPreferredLocationFinder.java	(date 1727348144833)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/checkin/CheckInTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/checkin/CheckInTaskTest.java	(date 1727362478138)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.checkin;
+package eu.reply.lea.services.yms.task.locationaware.domain.checkin;
 
 import java.util.Calendar;
 
@@ -26,7 +26,8 @@
             .expirationTime(10)
             .build();
         CheckInTaskConfiguration checkInTaskConfiguration = new CheckInTaskConfiguration("config1", null, "", checkInTaskHeader);
-        CheckInTask checkInTask = new CheckInTask("name", new SiteReference( new SitePojoTest(1L, "1", null)), checkInTaskConfiguration, null
+        CheckInTask
+            checkInTask = new CheckInTask("name", new SiteReference( new SitePojoTest(1L, "1", null)), checkInTaskConfiguration, null
         ,null);
         checkInTask.blockTask();
         checkInTask.makeExecutable();
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskDetailProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskDetailProcessor.java	(date 1727348474497)
@@ -1,21 +1,14 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
-import java.util.Calendar;
-
-import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
-import eu.reply.lea.services.process.task.exceptions.TaskActionExecutionException;
-import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.boundary.YardService;
-import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
 import eu.reply.lea.services.yms.task.event.WeighingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetailExecuteAction;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckOutTaskTest.java	(date 1727348392898)
@@ -13,11 +13,11 @@
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckOutTaskProcessor;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.sce.backend.core.jee.Context;
 import org.junit.jupiter.api.Assertions;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/WeighingTaskConfigurationProcessor.java	(date 1727348474460)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
@@ -11,7 +11,7 @@
 @Default
 @Logged
 @EntityProcessor(entityClass = WeighingTaskConfiguration.class)
-public class WeighingTaskConfigurationProcessor extends ZoneAwareTaskConfigurationProcessor<WeighingTaskConfiguration>{
+public class WeighingTaskConfigurationProcessor extends ZoneAwareTaskConfigurationProcessor<WeighingTaskConfiguration> {
 
     @Override
     public void persisting(final WeighingTaskConfiguration configuration) throws Exception {
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskBuilderTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilderTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskBuilderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskBuilderTest.java	(date 1727362478122)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -23,7 +23,7 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeyGenerator;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetailTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetailTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskDetailTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskDetailTest.java	(date 1727362478108)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/CheckInTaskTest.java	(date 1727348144851)
@@ -16,9 +16,9 @@
 import eu.reply.lea.services.yard.pojo.TransitPojo;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.jee.Context;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskTest.java	(date 1727362478120)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import static org.junit.jupiter.api.Assertions.*;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskBuilderTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilderTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskBuilderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskBuilderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskBuilderTest.java	(date 1727362478131)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/MockitoJPATest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/MockitoJPATest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/MockitoJPATest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/MockitoJPATest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/MockitoJPATest.java	(date 1727348159607)
@@ -6,7 +6,7 @@
 import java.util.Map;
 
 import eu.reply.lea.services.yms.boundary.AbstractProcessor;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.entity.IdentifiableEntity;
 import eu.reply.sce.backend.core.jee.Context;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTaskBuilder.java	(date 1727348159225)
@@ -6,7 +6,7 @@
 
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/AbstractLocationAwareTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/AbstractLocationAwareTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/AbstractLocationAwareTaskProcessor.java	(date 1727362344034)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -17,7 +17,6 @@
 import eu.reply.lea.services.masterdata.model.carrier.Driver;
 import eu.reply.lea.services.masterdata.model.language.Language;
 import eu.reply.lea.services.masterdata.pojo.carrier.DriverPojo;
-import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.process.task.boundary.GenericTaskProcessor;
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.process.task.exceptions.ActionNotAllowedException;
@@ -26,24 +25,28 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.boundary.YardService;
+import eu.reply.lea.services.yms.task.AddTaskToSequenceService;
+import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
+import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.dockaware.loading.ChangeLocationAction;
 import eu.reply.lea.services.yms.task.event.ChangedPriorityEvent;
-import eu.reply.lea.services.yms.task.event.TaskClosedEvent;
-import eu.reply.lea.services.yms.task.event.TaskCompletedEvent;
-import eu.reply.lea.services.yms.task.event.TaskRemovedFromSequenceEvent;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskEnterEvent;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskEventInfo;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskStatusChangedEventInfo;
+import eu.reply.lea.services.yms.task.event.TaskClosedEvent;
+import eu.reply.lea.services.yms.task.event.TaskCompletedEvent;
+import eu.reply.lea.services.yms.task.event.TaskRemovedFromSequenceEvent;
 import eu.reply.lea.services.yms.task.exception.ChangeLocationException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.TaskDequeueService;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.AddTaskAction;
 import eu.reply.lea.services.yms.task.sequence.TasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
-import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommand;
-import eu.reply.lea.services.yms.task.queue.event.TaskDequeueCommandInfo;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.event.ConfigurableEventProducer;
 import eu.reply.sce.backend.core.jee.Context;
@@ -75,9 +78,6 @@
     @Inject
     private Context context;
 
-    @Inject
-    private ConfigurableEventProducer<TaskDequeueCommand> taskDequeueCommandProducer;
-
     @Getter
     @Inject
     private YardService yardService;
@@ -102,6 +102,9 @@
     @Inject
     private ConfigurableEventProducer<LocationAwareTaskEnterEvent> transitTaskEnterProducer;
 
+    @Inject
+    private TaskDequeueService taskDequeueService;
+
     /**
      * Trace message
      *
@@ -182,8 +185,7 @@
      */
     public T action(final T task, final ChangeLocationAction action)
         throws ChangeLocationException {
-        List<TaskReference> taskToDequeue = new ArrayList<>();
-        List<LocationReference> locationToDequeue = new ArrayList<>();
+        List<LocationAwareTask<?,?,?>> tasksToChangeLocation = new ArrayList<>();
         //Condition you can't have tasks that are dockpreparation or docking and the status is in progress and that are before the task
         //check child tasks not in status in progess.
         Boolean isThereAChildTaskStarted = task.getSequence().getTasks().stream().anyMatch(item -> item.getParentTaskId() != null && item.getParentTaskId().equals(task.getId())
@@ -195,16 +197,14 @@
         //for all the child task and the current task I dequeue them and then I change their location
         for (LocationAwareTask<?,?,?> transitTask : task.getSequence().getTasks()) {
             if ((transitTask.getParentTaskId() != null && transitTask.getParentTaskId().equals(task.getId())) || transitTask.getId().equals(task.getId())) {
-                taskToDequeue.add(new TaskReference(transitTask));
-                locationToDequeue.add(transitTask.getLocation());
-                transitTask.setLocation(action.getLocation());
-                locationAwareTaskHandler.blockTask(transitTask);
+                tasksToChangeLocation.add(transitTask);
             }
         }
-        taskDequeueCommandProducer.fire(new TaskDequeueCommand(
-            new TaskDequeueCommandInfo(taskToDequeue,
-                                       locationToDequeue,
-                                       new TransitReference(task.getLogisticUnitReference()))));
+        taskDequeueService.dequeueTasks(tasksToChangeLocation);
+        for (LocationAwareTask<?,?,?> taskToChangeLocation : tasksToChangeLocation){
+            taskToChangeLocation.setLocation(action.getLocation());
+            locationAwareTaskHandler.blockTask(taskToChangeLocation);
+        }
         return task;
     }
 
@@ -241,7 +241,7 @@
         removedTasks.addAll(removeChildrenTasks(task, sequence));
         removedTasks.add(task);
         sequenceHandler.removeTask(sequence, task);
-        fireDequeueCommand(removedTasks);
+        taskDequeueService.dequeueTasks(removedTasks);
         transitTaskRemovedFromSequenceEventProducer.fire(new TaskRemovedFromSequenceEvent(new LocationAwareTaskEventInfo(entityRefHandler.getEntityReference(getEm(), task),
                                                                                                                          task.getTaskType(), task.getStatus(),
                                                                                                                          task.getLogisticUnitReference(),
@@ -249,16 +249,6 @@
         return task;
     }
 
-    private void fireDequeueCommand(List<LocationAwareTask<?,?,?>> tasks) {
-        List<TaskReference> removedTasks = new ArrayList<>();
-        List<LocationReference> locationOfRemovedTask = new ArrayList<>();
-        for (LocationAwareTask<?,?,?> transitTask : tasks) {
-            removedTasks.add(new TaskReference(transitTask));
-            locationOfRemovedTask.add(transitTask.getLocation());
-        }
-        taskDequeueCommandProducer.fire(new TaskDequeueCommand(
-            new TaskDequeueCommandInfo(removedTasks, locationOfRemovedTask, new TransitReference(tasks.get(0).getLogisticUnitReference()))));
-    }
 
 
     private List<LocationAwareTask<?,?,?>> removeChildrenTasks(final T task, final TasksSequence<LocationAwareTask<?,?,?>>  sequence) throws TransitTaskSequenceException {
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/DockAwareTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/DockAwareTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/DockAwareTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/DockAwareTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/DockAwareTaskTest.java	(date 1727348266810)
@@ -65,7 +65,7 @@
 import eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTaskProcessor;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.test.entities.HandlingRequestActivityPojoTest;
 import eu.reply.lea.services.yms.test.entities.HandlingRequestPojoTest;
 import eu.reply.lea.services.yms.test.entities.TrailerResourcePojoTest;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/releasing/DockReleasingTask.java	(date 1727348159250)
@@ -1,13 +1,10 @@
 package eu.reply.lea.services.yms.task.dockaware.releasing;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
+
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/SealingTaskTest.java	(date 1727348392922)
@@ -19,13 +19,13 @@
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTask;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskDetailProcessor;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskDetailStartAction;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.boundary.SealingTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskDetailStartAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.SealingTaskProcessor;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.entity.exception.EntityNotFoundException;
 import eu.reply.sce.backend.core.jee.Context;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueServiceImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueServiceImpl.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueServiceImpl.java
new file mode 100644
--- /dev/null	(date 1727362344019)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/integration/yms/queue/TaskDequeueServiceImpl.java	(date 1727362344019)
@@ -0,0 +1,40 @@
+package eu.reply.lea.services.yms.task.locationaware.integration.yms.queue;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.slf4j.Logger;
+
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.TaskDequeueService;
+import eu.reply.sce.backend.core.jee.log.Logged;
+
+@Logged
+@ApplicationScoped
+public class TaskDequeueServiceImpl implements TaskDequeueService {
+
+    @Inject
+    private TaskDequeueAdapter taskDequeueAdapter;
+
+    @Inject
+    private Logger logger;
+
+    @Override
+    public void dequeueTasks(List<LocationAwareTask<?, ?, ?>> tasks) {
+        List<LocationAwareTask<?,?,?>> tasksToDequeue = tasks.stream().filter(t->t.getLocation()!=null).collect(Collectors.toList());
+        if (tasksToDequeue.isEmpty()){
+            return;
+        }
+        try {
+            taskDequeueAdapter.notifyDequeueForTask(tasksToDequeue);
+            logger.info("Successfully dequeued tasks.");
+        } catch (Exception e) {
+            logger.error("Error during task dequeuing: {}", e.getMessage());
+            throw new RuntimeException("Failed to dequeue tasks.", e);
+        }
+    }
+
+}
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetailTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetailTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/weighing/WeighingTaskDetailTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/WeighingTaskDetailTest.java	(date 1727362478117)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Matchers.any;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplateProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplateProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplateProcessor.java	(date 1727348144646)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing.template;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing.template;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AddTaskToSequenceService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AddTaskToSequenceService.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AddTaskToSequenceService.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AddTaskToSequenceService.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AddTaskToSequenceService.java	(date 1727348159593)
@@ -12,8 +12,9 @@
 import eu.reply.lea.services.yms.AbstractService;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.lea.services.yms.task.factory.TransitTaskBuilderDirector;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
 import eu.reply.lea.services.yms.task.sequence.AddTaskAction;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskHandler.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskHandler.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskHandler.java	(date 1727348159721)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import static eu.reply.lea.services.yms.ModuleConfiguration.MODULE_NAME;
 import static java.util.Collections.singletonList;
@@ -45,6 +45,11 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.boundary.YardService;
+import eu.reply.lea.services.yms.task.PreferredLocationFinder;
+import eu.reply.lea.services.yms.task.PreferredLocationFinderFactory;
+import eu.reply.lea.services.yms.task.TaskReference;
+import eu.reply.lea.services.yms.task.TaskType;
+import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
 import eu.reply.lea.services.yms.task.dockaware.template.DockAwareTaskTemplate;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskEventInfo;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskUnlockedEvent;
@@ -54,10 +59,9 @@
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskStatusChangedEventInfo;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.lea.services.yms.task.factory.TransitTaskBuilderDirector;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
-import eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplate;
-import eu.reply.lea.services.yms.task.locationaware.weighing.template.WeighingTaskTemplate;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.template.WeighingTaskTemplate;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateFactory.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateFactory.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplateFactory.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateFactory.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplateFactory.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplateFactory.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplateFactory.java	(date 1727348144741)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing.template;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing.template;
 
 import javax.enterprise.context.ApplicationScoped;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ReceivingTaskTest.java	(date 1727348392930)
@@ -5,11 +5,11 @@
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.yard.model.Transit;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.ReceivingTaskProcessor;
 import eu.reply.sce.backend.core.jee.Context;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/sealing/SealingTaskBuilder.java	(date 1727348159541)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.sealing;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -7,7 +7,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/AbstractLocationAwareTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/AbstractLocationAwareTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/AbstractLocationAwareTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/AbstractLocationAwareTaskConfigurationProcessor.java	(date 1727348266795)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -14,7 +14,7 @@
 import eu.reply.lea.services.yms.boundary.AbstractProcessor;
 import eu.reply.lea.services.yms.entities.notification.exceptions.sms.SMSTaskNotificationMessageAlreadyPresentException;
 import eu.reply.lea.services.yms.entities.notification.task.sms.SMSTaskNotificationMessage;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 
 public abstract class AbstractLocationAwareTaskConfigurationProcessor<C extends LocationAwareTaskConfiguration<?>> extends AbstractProcessor {
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/RegistrationTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/RegistrationTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/RegistrationTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/RegistrationTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/RegistrationTaskPlaceHolder.java	(date 1727348144718)
@@ -1,7 +1,6 @@
 package eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task;
 
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetailProcessor.java	(date 1727348266896)
@@ -3,7 +3,7 @@
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.yard.client.YardServiceException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskDetailProcessor;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckOutTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckOutTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckOutTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckOutTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckOutTaskPlaceHolder.java	(date 1727348144855)
@@ -1,7 +1,6 @@
 package eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task;
 
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingTaskTest.java	(date 1727348474489)
@@ -20,14 +20,14 @@
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetailExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetailProcessor;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetailExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.WeighingTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.WeighingTaskProcessor;
 import eu.reply.sce.backend.core.entity.exception.EntityNotFoundException;
 import eu.reply.sce.backend.core.jee.Context;
 import org.junit.jupiter.api.Assertions;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/RegistrationTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/RegistrationTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/RegistrationTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/RegistrationTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/RegistrationTaskTest.java	(date 1727348144826)
@@ -24,9 +24,9 @@
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskDetailInfo;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskExecuteAction;
 import eu.reply.lea.services.yms.test.entities.HandlingRequestPojoTest;
 import eu.reply.sce.backend.core.jee.Context;
 import org.junit.jupiter.api.Assertions;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckInTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckInTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckInTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckInTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/CheckInTaskPlaceHolder.java	(date 1727348082225)
@@ -1,14 +1,11 @@
 package eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task;
 
-import eu.reply.lea.services.yard.model.Transit;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
-import eu.reply.sce.backend.core.jee.log.Logged;
+
 import org.slf4j.Logger;
 
-import javax.enterprise.context.ApplicationScoped;
 import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 
 /**
  * PlaceHolder used to translate CheckIn Properties.
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskProcessor.java	(date 1727348266803)
@@ -1,7 +1,7 @@
 package eu.reply.lea.services.yms.task.dockaware.unloading;
 
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/UnloadingTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/UnloadingTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/UnloadingTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/UnloadingTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/UnloadingTaskPlaceHolder.java	(date 1727348082189)
@@ -1,7 +1,6 @@
 package eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task;
 
 import eu.reply.lea.services.yms.task.dockaware.unloading.UnloadingTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/LoadingTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/LoadingTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/LoadingTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/LoadingTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/LoadingTaskPlaceHolder.java	(date 1727348082194)
@@ -1,7 +1,6 @@
 package eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.task;
 
 import eu.reply.lea.services.yms.task.dockaware.loading.LoadingTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/TransitTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/TransitTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/TransitTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/TransitTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/TransitTaskPlaceHolder.java	(date 1727348159653)
@@ -3,7 +3,7 @@
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.HierarchyMapper;
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.MethodParameterMapper;
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.placeholder.GenericPlaceHolder;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTask.java	(date 1727348159276)
@@ -2,13 +2,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.yard.model.Transit;
-import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTest.java	(date 1727348474477)
@@ -32,9 +32,9 @@
 import eu.reply.lea.services.yms.task.dockaware.template.DockAwareTaskTemplate;
 import eu.reply.lea.services.yms.task.dockaware.template.DockAwareTaskTemplateFactory;
 import eu.reply.lea.services.yms.task.dockaware.template.DockAwareTaskTemplateProcessor;
-import eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplate;
-import eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplateFactory;
-import eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplateProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate;
+import eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplateFactory;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskTemplateProcessor;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceStateMachineProvider;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskBuilder.java	(date 1727348159497)
@@ -6,7 +6,7 @@
 
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/GenericTransitTaskPlaceHolder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/GenericTransitTaskPlaceHolder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/GenericTransitTaskPlaceHolder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/GenericTransitTaskPlaceHolder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/boundary/notification/messagetranslation/placeholder/task/GenericTransitTaskPlaceHolder.java	(date 1727348159334)
@@ -3,7 +3,7 @@
 
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.HierarchyMapper;
 import eu.reply.lea.services.yms.boundary.notification.messagetranslation.MethodParameterMapper;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import org.slf4j.Logger;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/event/TaskDequeueCommandInfo.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/event/TaskDequeueCommandInfo.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/event/TaskDequeueCommandInfo.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/event/TaskDequeueCommandInfo.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/event/TaskDequeueCommandInfo.java	(date 1727345683014)
@@ -10,6 +10,7 @@
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.TaskReference;
+import eu.reply.sce.backend.core.entity.EntityReference;
 
 @NoArgsConstructor
 @Getter
@@ -20,14 +21,14 @@
 
     private List<TaskReference> tasks;
     private List<LocationReference> locationReferences;
-    private TransitReference transitReference;
+    private EntityReference logisticUnitRef;
 
     public TaskDequeueCommandInfo(final List<TaskReference> tasks,
                                   final List<LocationReference> locationReferences,
-                                  final TransitReference transitReference) {
+                                  final EntityReference logisticUnitRef) {
         this.tasks = tasks;
         this.locationReferences = locationReferences;
-        this.transitReference = transitReference;
+        this.logisticUnitRef = logisticUnitRef;
     }
 
 }
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/LocationAwareTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/LocationAwareTaskDetail.java	(date 1727348159416)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task;
+package eu.reply.lea.services.yms.task.locationaware.domain;
 
 import java.util.Calendar;
 import javax.persistence.AttributeOverride;
@@ -14,12 +14,13 @@
 import eu.reply.lea.services.process.task.entities.TaskDetail;
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
 
 @MappedSuperclass
 @Getter
 @Setter
-public abstract class LocationAwareTaskDetail<T extends LocationAwareTask<?,?,?>> extends TaskDetail<T> implements HaveLoadingUnitReference {
+public abstract class LocationAwareTaskDetail<T extends LocationAwareTask<?,?,?>> extends TaskDetail<T> implements
+    HaveLoadingUnitReference {
 
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/dockaware/unloading/UnloadingTaskDetail.java	(date 1727348159724)
@@ -2,10 +2,9 @@
 
 
 import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/PreferredLocationFinderFactory.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/PreferredLocationFinderFactory.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/PreferredLocationFinderFactory.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/PreferredLocationFinderFactory.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/PreferredLocationFinderFactory.java	(date 1727348144881)
@@ -4,13 +4,13 @@
 import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.yard.model.HandlingRequestActivity;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInPreferredLocationFinder;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckOutPreferredLocationFinder;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingPreferredLocationFinder;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingPreferredLocationFinder;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingPreferredLocationFinder;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingPreferredLocationFinder;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckOutPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTaskTemplate;
 import eu.reply.lea.services.yms.task.template.handler.TransitTaskTemplateHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/TaskReference.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/TaskReference.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/TaskReference.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/TaskReference.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/TaskReference.java	(date 1727346644507)
@@ -22,6 +22,10 @@
     public TaskReference(final String module, final String entityName, final String entityId, final String businessKey) {
         super(module, entityName, entityId, businessKey);
     }
+    public TaskReference(final EntityReference entityReference) {
+        super(entityReference.getModule(), entityReference.getEntityName(), entityReference.getEntityId(), entityReference.getBusinessKey());
+    }
+
 
     @Override
     public TypedEntityReference<Task> clone() {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplate.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplate.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplate.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplate.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplate.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/weighing/template/WeighingTaskTemplate.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/weighing/template/WeighingTaskTemplate.java	(date 1727348144592)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.weighing.template;
+package eu.reply.lea.services.yms.task.locationaware.domain.weighing.template;
 
 import javax.persistence.Entity;
 
@@ -6,8 +6,8 @@
 import lombok.Setter;
 
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.template.LocationAwareTaskTemplate;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.template.LocationAwareTaskTemplate;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 
 @Entity
 @Getter
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskBuilder.java	(date 1727348159572)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -8,7 +8,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ReceivingTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ReceivingTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ReceivingTaskConfigurationProcessor.java	(date 1727348474496)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskExecuteAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskExecuteAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskExecuteAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskExecuteAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskExecuteAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskExecuteAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskExecuteAction.java	(date 1727348144791)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
 import java.io.Serializable;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetailTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetailTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetailTest.java	(date 1727362478135)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Matchers.any;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskHeader.java	(date 1727348144867)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 
 @Embeddable
 public class ReceivingTaskHeader extends ZoneAwareTaskHeader {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskDetail.java	(date 1727348159446)
@@ -1,10 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
-import eu.reply.lea.services.process.task.entities.Task;
 import eu.reply.lea.services.yard.model.LoadingUnitResource;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import eu.reply.sce.backend.core.entity.configuration.EntityMethods;
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskBuilderTest.java
rename from ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilderTest.java
rename to ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskBuilderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskBuilderTest.java	(date 1727362478127)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -23,7 +23,7 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeyGenerator;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingPreferredLocationFinder.java	(date 1727348144828)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.model.map.Site;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTask.java	(date 1727348159264)
@@ -1,14 +1,10 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import eu.reply.lea.services.common.model.EntityConstants;
-import eu.reply.lea.services.masterdata.model.map.Site;
+
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.util.YMSUtils;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
 import lombok.Setter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/receiving/ReceivingTaskConfiguration.java	(date 1727348159439)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.domain.receiving;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/WeighingPreferredLocationFinderTest.java	(date 1727348144729)
@@ -14,7 +14,7 @@
 import eu.reply.lea.services.masterdata.reference.GateReference;
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
 import eu.reply.lea.services.yms.task.template.handler.TransitTaskTemplateHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ReceivingTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ReceivingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/receiving/ReceivingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ReceivingTaskProcessor.java	(date 1727348392891)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.receiving;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import com.google.common.base.Objects;
 import com.neovisionaries.i18n.CountryCode;
@@ -9,8 +9,9 @@
 import eu.reply.lea.services.masterdata.pojo.vehicle.TruckPojo;
 import eu.reply.lea.services.masterdata.reference.TruckReference;
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskExecuteAction;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -28,7 +29,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=ReceivingTask.class)
+@EntityProcessor(entityClass= ReceivingTask.class)
 public class ReceivingTaskProcessor extends AbstractLocationAwareTaskProcessor<ReceivingTask> {
     
     @Inject
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/TaskInQueueRequestAdapter.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/TaskInQueueRequestAdapter.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/TaskInQueueRequestAdapter.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/TaskInQueueRequestAdapter.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/TaskInQueueRequestAdapter.java	(date 1727348159413)
@@ -3,7 +3,7 @@
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.LocationAwareTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.repository.AbstractTasksSequenceRepository;
 import eu.reply.lea.services.yms.task.queue.QueueRequest;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/QueueRequestTranslator.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/QueueRequestTranslator.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/QueueRequestTranslator.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/QueueRequestTranslator.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/integration/yms/task/QueueRequestTranslator.java	(date 1727348159197)
@@ -5,7 +5,7 @@
 import java.util.List;
 
 import eu.reply.lea.services.yms.task.TaskReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.lea.services.yms.task.sequence.LocationAwareTasksSequence;
 import eu.reply.lea.services.yms.task.queue.QueueRequest;
 import eu.reply.lea.services.yms.task.queue.QueueRequestInfo;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskHeader.java	(date 1727348144902)
@@ -1,8 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
+
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/AbstractYmsTaskTest.java	(date 1727348392888)
@@ -15,7 +15,7 @@
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yard.model.Transit;
 import eu.reply.lea.services.yard.reference.TransitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.dockaware.docking.DockDockingTaskBuilder;
@@ -30,36 +30,36 @@
 import eu.reply.lea.services.yms.task.factory.TaskBuilder;
 import eu.reply.lea.services.yms.task.factory.TaskBuilderFactory;
 import eu.reply.lea.services.yms.task.factory.TransitTaskBuilderDirector;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTask;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.receiving.ReceivingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.sealing.SealingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTask;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.CheckInTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.receiving.ReceivingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.RegistrationTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskHeader;
 import eu.reply.lea.services.yms.task.observer.TasksObserver;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
 import eu.reply.sce.backend.core.jee.event.Producer;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskBuilder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskBuilder.java	(date 1727348159267)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -7,7 +7,7 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.TaskTypeQualifier;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskBuilder;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TransitTaskBuilderDirector.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TransitTaskBuilderDirector.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TransitTaskBuilderDirector.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TransitTaskBuilderDirector.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TransitTaskBuilderDirector.java	(date 1727348159727)
@@ -14,12 +14,12 @@
 import eu.reply.lea.services.yard.reference.TransitReference;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.dockaware.DockAwareTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskBuilder;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskBuilder;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetail.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetail.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetail.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetail.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetail.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetail.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetail.java	(date 1727348159370)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
 import eu.reply.lea.services.yard.model.LoadingUnitResource;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.LocationAwareTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskDetail;
 import eu.reply.lea.services.yms.task.event.UnsealingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.event.UnsealingTaskDetailExecutedInfo;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingPreferredLocationFinderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingPreferredLocationFinderTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingPreferredLocationFinderTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingPreferredLocationFinderTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingPreferredLocationFinderTest.java	(date 1727348144843)
@@ -16,7 +16,7 @@
 import eu.reply.lea.services.masterdata.reference.GateReference;
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingPreferredLocationFinder;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingPreferredLocationFinder;
 import eu.reply.lea.services.yms.task.queue.QueueHandler;
 import eu.reply.lea.services.yms.task.template.entities.TransitTasksSequenceTemplate;
 import eu.reply.lea.services.yms.task.template.handler.TransitTaskTemplateHandler;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfiguration.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfiguration.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskConfiguration.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfiguration.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskConfiguration.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfiguration.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskConfiguration.java	(date 1727348159341)
@@ -1,11 +1,11 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.yms.task.TaskType;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
 
 @Entity
 public class UnsealingTaskConfiguration extends LocationAwareTaskConfiguration<UnsealingTaskHeader> {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailStartAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailStartAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetailStartAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailStartAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetailStartAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailStartAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTaskDetailStartAction.java	(date 1727348144573)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
 import eu.reply.lea.services.yard.model.LoadingUnitResource;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/DockAwareTaskActionException.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/DockAwareTaskActionException.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/DockAwareTaskActionException.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/DockAwareTaskActionException.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/DockAwareTaskActionException.java	(date 1727348159545)
@@ -3,7 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.exception.SerializableCheckedException;
 
 public class DockAwareTaskActionException extends SerializableCheckedException {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskDetailProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskDetailProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskDetailProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskDetailProcessor.java	(date 1727348474469)
@@ -1,21 +1,14 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 import javax.inject.Inject;
 
-import java.util.Calendar;
-
-import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
-import eu.reply.lea.services.process.task.exceptions.TaskActionExecutionException;
-import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.boundary.YardService;
-import eu.reply.lea.services.yms.task.HaveLoadingUnitReference;
 import eu.reply.lea.services.yms.task.event.UnsealingTaskDetailExecutedEvent;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskDetailProcessor;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetailStartAction;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LoadUnitTaskActionException.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LoadUnitTaskActionException.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LoadUnitTaskActionException.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LoadUnitTaskActionException.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LoadUnitTaskActionException.java	(date 1727348159289)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.exception;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.exception.SerializableCheckedException;
 
 public class LoadUnitTaskActionException extends SerializableCheckedException{
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/UnsealingTaskTest.java	(date 1727348474487)
@@ -30,13 +30,13 @@
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
 import eu.reply.lea.services.yms.task.factory.TaskDetailInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskProcessor;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTask;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskDetailProcessor;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskDetailStartAction;
-import eu.reply.lea.services.yms.task.locationaware.unsealing.UnsealingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.boundary.LocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.boundary.UnsealingTaskDetailProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskDetailStartAction;
+import eu.reply.lea.services.yms.task.locationaware.boundary.UnsealingTaskProcessor;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.entity.exception.EntityNotFoundException;
 import eu.reply.sce.backend.core.jee.Context;
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingTaskTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingTaskTest.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingTaskTest.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingTaskTest.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/unitTests/ShippingTaskTest.java	(date 1727348392902)
@@ -7,11 +7,11 @@
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
 import eu.reply.lea.services.yard.model.Transit;
 import eu.reply.lea.services.yms.task.exception.LocationAwareTaskActionException;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTask;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskExecuteAction;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.shipping.ShippingTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskExecuteAction;
+import eu.reply.lea.services.yms.task.locationaware.domain.shipping.ShippingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.boundary.ShippingTaskProcessor;
 import eu.reply.sce.backend.core.jee.Context;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Disabled;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/ChangeLocationException.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/ChangeLocationException.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/ChangeLocationException.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/ChangeLocationException.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/ChangeLocationException.java	(date 1727348159638)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.exception;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.StringifyUtils;
 import eu.reply.sce.backend.core.exception.SerializableCheckedException;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/TransitEventObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/TransitEventObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/TransitEventObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/TransitEventObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/TransitEventObserver.java	(date 1727360846737)
@@ -51,7 +51,7 @@
 import eu.reply.lea.services.yms.boundary.YardService;
 import eu.reply.lea.services.yms.task.TaskReference;
 import eu.reply.lea.services.yms.task.TransitTaskFactoryException;
-import eu.reply.lea.services.yms.task.LocationAwareTaskHandler;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHandler;
 import eu.reply.lea.services.yms.task.TaskType;
 import eu.reply.lea.services.yms.task.event.CheckInCountdownEndedEvent;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskEventInfo;
@@ -62,8 +62,9 @@
 import eu.reply.lea.services.yms.task.event.task.AdviseForTransitLockedEvent;
 import eu.reply.lea.services.yms.task.event.task.ResetTaskInfoForAdviseMessageEvent;
 import eu.reply.lea.services.yms.task.factory.TransitTaskBuilderDirector;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.registration.RegistrationTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.TaskDequeueService;
+import eu.reply.lea.services.yms.task.locationaware.domain.registration.RegistrationTask;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequenceHandler;
 import eu.reply.lea.services.yms.task.sequence.repository.TransitTasksSequenceRepository;
@@ -118,6 +119,9 @@
     @Inject
     private DefaultYardService defaultYardService;
 
+    @Inject
+    private TaskDequeueService taskDequeueService;
+
     @Inject
     private YardService yardService;
 
@@ -525,8 +529,7 @@
             return;
         }
         List<LocationAwareTask<?,?,?>> tasksToCancel = tasksSequence != null ? tasksSequence.getTasks() : new ArrayList<>();
-        List<TaskReference> locationAwareTasksCancelled = new ArrayList<>();
-        List<LocationReference> taskLocationCancelled = new ArrayList<>();
+        List<LocationAwareTask<?,?,?>> locationAwareTasksCancelled = new ArrayList<>();
         for (LocationAwareTask<?,?,?> task : tasksToCancel) {
             if (task.getTaskType() == TaskType.REGISTRATION && !cancelRegistrationTask) {
                 continue;
@@ -537,16 +540,13 @@
                 }
             }
             locationAwareTaskHandler.cancelTask(task, "");
-            if (task.getLocation()!=null) {
-                taskLocationCancelled.add( task.getLocation());
-                locationAwareTasksCancelled.add(new TaskReference(task));
-            }
+            locationAwareTasksCancelled.add(task);
+
         }
         tasksSequence.cancelSequence(transitTaskSequenceStatusUpdateProducer);
 
-        taskDequeueCommandProducer.fire(new TaskDequeueCommand(
-                new TaskDequeueCommandInfo(locationAwareTasksCancelled,
-                                           taskLocationCancelled, transitReference)));
+        taskDequeueService.dequeueTasks(locationAwareTasksCancelled);
+
     }
 
     private void updateTransit(final TransitReference transitReference) {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskConfigurationProcessor.java	(date 1727348474475)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TaskBuilder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TaskBuilder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TaskBuilder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TaskBuilder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/factory/TaskBuilder.java	(date 1727348159261)
@@ -4,9 +4,9 @@
 import eu.reply.lea.services.masterdata.reference.LocationReference;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
 import eu.reply.lea.services.process.task.entities.exceptions.TaskConfigurationNotFoundException;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 import eu.reply.sce.backend.core.entity.EntityReference;
 
 public interface TaskBuilder<B extends TaskBuilder<B, H, C, ?>, H extends LocationAwareTaskHeader, C extends LocationAwareTaskConfiguration<H>, T extends LocationAwareTask<C, H, ?>> {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingTask.java	(date 1727348159192)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -11,18 +11,11 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 
-import org.apache.commons.collections4.CollectionUtils;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import eu.reply.lea.services.masterdata.model.map.Site;
 import eu.reply.lea.services.masterdata.reference.SiteReference;
-import eu.reply.lea.services.process.task.entities.TaskStatus;
-import eu.reply.lea.services.yard.model.LoadingUnitResource;
-import eu.reply.lea.services.yard.model.Transit;
-import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yms.task.LoadingUnitsTask;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.configuration.EntityMethods;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 import lombok.Getter;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/UnsealingTaskProcessor.java	(date 1727348474492)
@@ -1,7 +1,7 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.unsealing.UnsealingTask;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -14,7 +14,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=UnsealingTask.class)
+@EntityProcessor(entityClass= UnsealingTask.class)
 public class UnsealingTaskProcessor extends AbstractLocationAwareTaskProcessor<UnsealingTask> {
     
     @Override
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LocationAwareTaskActionException.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LocationAwareTaskActionException.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LocationAwareTaskActionException.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LocationAwareTaskActionException.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/LocationAwareTaskActionException.java	(date 1727348159442)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.exception;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.exception.SerializableException;
 
 public class LocationAwareTaskActionException extends SerializableException {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/RemoveFromSequenceException.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/RemoveFromSequenceException.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/RemoveFromSequenceException.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/RemoveFromSequenceException.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/exception/RemoveFromSequenceException.java	(date 1727348159548)
@@ -1,6 +1,6 @@
 package eu.reply.lea.services.yms.task.exception;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.exception.SerializableException;
 
 public class RemoveFromSequenceException extends SerializableException {
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/NotificationHandler.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/NotificationHandler.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/NotificationHandler.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/NotificationHandler.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/observer/notification/NotificationHandler.java	(date 1727348159556)
@@ -5,7 +5,7 @@
 import eu.reply.lea.services.yms.task.event.LocationTaskChangedEvent;
 import eu.reply.lea.services.yms.task.event.TaskChangedEvent;
 import eu.reply.lea.services.yms.task.event.LocationAwareTaskEventInfo;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.event.Observer;
 import eu.reply.sce.backend.core.jee.configuration.ModuleConfiguration;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingPreferredLocationFinder.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingPreferredLocationFinder.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingPreferredLocationFinder.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingPreferredLocationFinder.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingPreferredLocationFinder.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/unsealing/UnsealingPreferredLocationFinder.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/unsealing/UnsealingPreferredLocationFinder.java	(date 1727348144657)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.unsealing;
+package eu.reply.lea.services.yms.task.locationaware.domain.unsealing;
 
 import eu.reply.lea.services.masterdata.client.DefaultMasterdataService;
 import eu.reply.lea.services.masterdata.model.map.Site;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ZoneAwareTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ZoneAwareTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/ZoneAwareTaskConfigurationProcessor.java	(date 1727348474471)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.zoneaware;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import eu.reply.lea.services.masterdata.client.MasterdataServiceException;
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.zoneaware.ZoneAwareTaskHeader;
 
 public class ZoneAwareTaskConfigurationProcessor<C extends LocationAwareTaskConfiguration<? extends ZoneAwareTaskHeader>> extends LocationAwareTaskConfigurationProcessor<C> {
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/TaskDequeueService.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/TaskDequeueService.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/TaskDequeueService.java
new file mode 100644
--- /dev/null	(date 1727360409306)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/TaskDequeueService.java	(date 1727360409306)
@@ -0,0 +1,9 @@
+package eu.reply.lea.services.yms.task.locationaware.domain;
+
+import java.util.List;
+
+public interface TaskDequeueService {
+
+    void dequeueTasks(List<LocationAwareTask<?, ?, ?>> tasks);
+
+}
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/zoneaware/ZoneAwareTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/zoneaware/ZoneAwareTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/zoneaware/ZoneAwareTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/zoneaware/ZoneAwareTaskHeader.java	(date 1727348159468)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.zoneaware;
+package eu.reply.lea.services.yms.task.locationaware.domain.zoneaware;
 
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
@@ -8,7 +8,7 @@
 import javax.persistence.MappedSuperclass;
 
 import eu.reply.lea.services.masterdata.reference.ZoneReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 import lombok.Getter;
 import lombok.Setter;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/MissionTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/MissionTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/MissionTaskProcessor.java	(date 1727348392915)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -17,10 +17,11 @@
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.SwitcherReference;
 import eu.reply.lea.services.yms.boundary.YardService;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
 import eu.reply.lea.services.yms.task.exception.LoadUnitTaskActionException;
 import eu.reply.lea.services.yms.task.exception.LoadUnitTaskActionException.Codes;
-import eu.reply.lea.services.yms.task.mission.MissionTask.ActionStatus;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTask.ActionStatus;
+import eu.reply.lea.services.yms.task.locationaware.domain.mission.MissionTaskAssociateVehicleAction;
 import eu.reply.lea.services.yms.util.YMSUtils;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -30,7 +31,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=MissionTask.class)
+@EntityProcessor(entityClass= MissionTask.class)
 public class MissionTaskProcessor extends AbstractLocationAwareTaskProcessor<MissionTask> {
 
 	@Inject
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskRepository.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskRepository.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskRepository.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskRepository.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskRepository.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskRepository.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskRepository.java	(date 1727348144936)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 
 import java.util.List;
Index: ../configuration/reply-configuration/reply-configuration/reply-configuration-common/src/main/resources/scheduler.json
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../configuration/reply-configuration/reply-configuration/reply-configuration-common/src/main/resources/scheduler.json b/../configuration/reply-configuration/reply-configuration/reply-configuration-common/src/main/resources/scheduler.json
--- a/../configuration/reply-configuration/reply-configuration/reply-configuration-common/src/main/resources/scheduler.json	(revision 2347ffb2a02461fa690ede6d09fd92f3651c002b)
+++ b/../configuration/reply-configuration/reply-configuration/reply-configuration-common/src/main/resources/scheduler.json	(date 1727362998842)
@@ -189,7 +189,7 @@
             ]
         },
         "Transit.checkExpiredTransit": {
-            "className":"eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskProcessor",
+            "className":"eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskProcessor",
             "method":"checkExpiredCheckInTask",
             "module": "yms",
             "triggers":[{
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetailInfo.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetailInfo.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskDetailInfo.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetailInfo.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskDetailInfo.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/registration/RegistrationTaskDetailInfo.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/registration/RegistrationTaskDetailInfo.java	(date 1727348144668)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.locationaware.registration;
+package eu.reply.lea.services.yms.task.locationaware.domain.registration;
 
 import java.io.Serializable;
 
Index: ../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/integration/TransitSequenceIT.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/integration/TransitSequenceIT.java b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/integration/TransitSequenceIT.java
--- a/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/integration/TransitSequenceIT.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/test/java/eu/reply/lea/services/yms/test/integration/TransitSequenceIT.java	(date 1727348144745)
@@ -22,17 +22,17 @@
 import eu.reply.lea.services.yard.model.Transit.Status;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
 import eu.reply.lea.services.yard.reference.TransitReference;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTask;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkin.CheckInTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTask;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.checkout.CheckOutTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTask;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskConfiguration;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskDetail;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingTaskHeader;
-import eu.reply.lea.services.yms.task.locationaware.weighing.WeighingType;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkin.CheckInTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.checkout.CheckOutTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskConfiguration;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskDetail;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.weighing.WeighingType;
 import eu.reply.lea.services.yms.task.sequence.TransitTasksSequence;
 import eu.reply.lea.services.yms.test.AbstractYmsIT;
 import eu.reply.lea.services.yms.test.entities.CarrierPojoTest;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/observer/RemoveFromQueuedTasksObserver.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/observer/RemoveFromQueuedTasksObserver.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/observer/RemoveFromQueuedTasksObserver.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/observer/RemoveFromQueuedTasksObserver.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/queue/observer/RemoveFromQueuedTasksObserver.java	(date 1727362426406)
@@ -22,6 +22,6 @@
     public void handleTransitSequenceCreatedEvent(
         @Observes @ModuleEvent("taskDequeueCommand") final TaskDequeueCommandInfo event) {
         queueProcessTrackerService.startNewDequeueProcess(event.getTasks(), event
-            .getLocationReferences(), event.getTransitReference().toEntityReference());
+            .getLocationReferences(), event.getLogisticUnitRef());
     }
 }
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskProcessor.java	(date 1727348392908)
@@ -1,7 +1,7 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import eu.reply.lea.services.process.task.exceptions.TaskStatusChangeException;
-import eu.reply.lea.services.yms.task.AbstractLocationAwareTaskProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTask;
 import eu.reply.lea.services.yms.task.sequence.exception.TransitTaskSequenceException;
 import eu.reply.sce.backend.core.entity.configuration.Condition;
 import eu.reply.sce.backend.core.entity.configuration.Condition.Attribute;
@@ -14,7 +14,7 @@
 @ApplicationScoped
 @Logged
 @Default
-@EntityProcessor(entityClass=SealingTask.class)
+@EntityProcessor(entityClass= SealingTask.class)
 public class SealingTaskProcessor extends AbstractLocationAwareTaskProcessor<SealingTask> {
     
     @Override
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfigurationProcessor.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfigurationProcessor.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskConfigurationProcessor.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfigurationProcessor.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskConfigurationProcessor.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/sealing/SealingTaskConfigurationProcessor.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/boundary/SealingTaskConfigurationProcessor.java	(date 1727348474507)
@@ -1,9 +1,9 @@
-package eu.reply.lea.services.yms.task.locationaware.sealing;
+package eu.reply.lea.services.yms.task.locationaware.boundary;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.inject.Default;
 
-import eu.reply.lea.services.yms.task.locationaware.zoneaware.ZoneAwareTaskConfigurationProcessor;
+import eu.reply.lea.services.yms.task.locationaware.domain.sealing.SealingTaskConfiguration;
 import eu.reply.sce.backend.core.jee.configuration.entity.EntityProcessor;
 import eu.reply.sce.backend.core.jee.log.Logged;
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskAssociateVehicleAction.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskAssociateVehicleAction.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskAssociateVehicleAction.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskAssociateVehicleAction.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskAssociateVehicleAction.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskAssociateVehicleAction.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskAssociateVehicleAction.java	(date 1727348144589)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 
 import java.io.Serializable;
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskHeader.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskHeader.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskHeader.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskHeader.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskHeader.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTaskHeader.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTaskHeader.java	(date 1727348159346)
@@ -1,8 +1,8 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 import javax.persistence.Embeddable;
 
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTaskHeader;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTaskHeader;
 
 @Embeddable
 
Index: ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTask.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTask.java b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTask.java
rename from ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTask.java
rename to ../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTask.java
--- a/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/mission/MissionTask.java	(revision 6d616ecc549ecc1a07c4add01980d3b523d60bf2)
+++ b/../application/yms-application/lea-yms-application/src/main/java/eu/reply/lea/services/yms/task/locationaware/domain/mission/MissionTask.java	(date 1727363256430)
@@ -1,4 +1,4 @@
-package eu.reply.lea.services.yms.task.mission;
+package eu.reply.lea.services.yms.task.locationaware.domain.mission;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -31,7 +31,7 @@
 import eu.reply.lea.services.process.task.entities.TaskStatus;
 import eu.reply.lea.services.yard.reference.LoadingUnitMovementReference;
 import eu.reply.lea.services.yard.reference.LoadingUnitReference;
-import eu.reply.lea.services.yms.task.locationaware.LocationAwareTask;
+import eu.reply.lea.services.yms.task.locationaware.domain.LocationAwareTask;
 import eu.reply.sce.backend.core.entity.EntityReference;
 import eu.reply.sce.backend.core.sequence.businesskey.BusinessKeySequence;
 
@@ -166,8 +166,9 @@
            return false;
        }
     }
-    
-    protected List<LoadingUnitReference> getLoadingUnitReferences() {
+
+    @JsonIgnore
+    public List<LoadingUnitReference> getLoadingUnitReferences() {
         return this.getDetails().stream().map(MissionTaskDetail::getLoadingUnitReference).collect(Collectors.toList());
     }
 Consider the changes above, can you spot any problems?
What about imporvements?
Consider DDD principles
I would usggest you provide javadoc and unittest for the most important functions